From 04803b336d6a5124ba0af3a4ba59ec5edac1ce6d Mon Sep 17 00:00:00 2001 From: svu Date: Sun, 15 Jul 2007 22:12:12 +0000 Subject: [PATCH] introducing symbols/kpdl and stuff, b.fd.o#11611 --- ChangeLog | 6 +++ rules/base.o_s.part | 10 ++++- rules/base.xml.in | 57 ++++++++++++++++++++++- symbols/Makefile.am | 2 +- symbols/br | 2 +- symbols/ch | 2 +- symbols/cs | 2 +- symbols/de | 2 +- symbols/dk | 4 +- symbols/ee | 2 +- symbols/fi | 4 +- symbols/gr | 2 +- symbols/hu | 16 +++---- symbols/it | 2 +- symbols/keypad | 95 ++++++++++++++++++++++++--------------- symbols/macintosh_vndr/ch | 2 +- symbols/macintosh_vndr/de | 2 +- symbols/macintosh_vndr/it | 2 +- symbols/macintosh_vndr/se | 2 +- symbols/mk | 2 +- symbols/no | 2 +- symbols/pl | 8 ++-- symbols/ro | 2 +- symbols/ru | 2 +- symbols/se | 4 +- 25 files changed, 164 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25ae067..8abd1ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-15 Sergey Udaltsov + + * symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part: + introducing separate KPDL handling, + https://bugs.freedesktop.org/show_bug.cgi?id=11611 + 2007-07-12 Sergey Udaltsov * NEWS: preparing release 1.0 diff --git a/rules/base.o_s.part b/rules/base.o_s.part index 6a2b822..82e3aae 100644 --- a/rules/base.o_s.part +++ b/rules/base.o_s.part @@ -68,4 +68,12 @@ nbsp:level3n = +nbsp(level3n) nbsp:level4 = +nbsp(level4) nbsp:level4n = +nbsp(level4n) - japan:nicola_f_bs = +jp(nicola_f_bs) + japan:nicola_f_bs = +jp(nicola_f_bs) + kpdl:dot = +kpdl(dot) + kpdl:comma = +kpdl(comma) + kpdl:dotoss = +kpdl(dotoss) + kpdl:dotoss_latin9 = +kpdl(dotoss_latin9) + kpdl:commaoss = +kpdl(commaoss) + kpdl:momayyezoss = +kpdl(momayyezoss) + kpdl:kposs = +kpdl(kposs) + diff --git a/rules/base.xml.in b/rules/base.xml.in index ab2cab7..1c69165 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -3556,13 +3556,66 @@ + + + + + + kpdl + <_description>Numeric keypad delete key behaviour + + + + + + + diff --git a/symbols/Makefile.am b/symbols/Makefile.am index b8b12f8..6925701 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -27,7 +27,7 @@ sk sy th \ tj tr ua \ us uz vn \ za \ -altwin capslock compose ctrl group inet keypad level3 level5 nbsp srvr_ctrl \ +altwin capslock compose ctrl group inet keypad kpdl level3 level5 nbsp srvr_ctrl \ eurosign include $(top_srcdir)/xkbrules.am diff --git a/symbols/br b/symbols/br index c4933fe..bc1b572 100644 --- a/symbols/br +++ b/symbols/br @@ -46,7 +46,7 @@ xkb_symbols "abnt2" { key { [ KP_Decimal ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/ch b/symbols/ch index a545d5e..3a7646f 100644 --- a/symbols/ch +++ b/symbols/ch @@ -184,7 +184,7 @@ xkb_symbols "de_mac" { key { [ less, greater, lessthanequal, greaterthanequal ] }; key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/cs b/symbols/cs index ea000c9..e6c4bcc 100644 --- a/symbols/cs +++ b/symbols/cs @@ -75,7 +75,7 @@ xkb_symbols "common" { key { [ period, colon, any,any ] }; // key { [ minus, underscore, any,any ] }; // - include "keypad(comma)" + include "kpdl(comma)" }; partial hidden alphanumeric_keys diff --git a/symbols/de b/symbols/de index 98b3904..21aff13 100644 --- a/symbols/de +++ b/symbols/de @@ -29,7 +29,7 @@ xkb_symbols "basic" { key { [numbersign, apostrophe, dead_grave, dead_breve ] }; key { [ y, Y, guillemotleft, less ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/dk b/symbols/dk index 8bc8687..aada5b2 100644 --- a/symbols/dk +++ b/symbols/dk @@ -23,7 +23,7 @@ xkb_symbols "basic" { key { [ less, greater, backslash, notsign ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -55,7 +55,7 @@ xkb_symbols "mac" { key { [ space, space, nobreakspace, nobreakspace ] }; key { [ minus, underscore, hyphen, macron ] }; - include "keypad(dot)" + include "kpdl(dot)" }; diff --git a/symbols/ee b/symbols/ee index 1a97df3..c9824b2 100644 --- a/symbols/ee +++ b/symbols/ee @@ -75,5 +75,5 @@ xkb_symbols "dvorak" { key { [ z, Z, zcaron, Zcaron ] }; include "level3(ralt_switch)" - include "keypad(comma)" + include "kpdl(comma)" }; diff --git a/symbols/fi b/symbols/fi index cc3abfc..65f06b2 100644 --- a/symbols/fi +++ b/symbols/fi @@ -56,7 +56,7 @@ xkb_symbols "fi" { key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] }; // End alphanumeric section, begin "Keypad" - include "keypad(comma)" + include "kpdl(comma)" // End "Keypad" section include "level3(ralt_switch)" @@ -179,7 +179,7 @@ xkb_symbols "kotoistus" { key { [ period, colon, dead_belowdot, dead_abovedot ] }; key { [ minus, underscore, endash, dead_abovedot ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" diff --git a/symbols/gr b/symbols/gr index 7e62041..075adc3 100644 --- a/symbols/gr +++ b/symbols/gr @@ -41,7 +41,7 @@ xkb_symbols "basic" { key { [ slash, question ] }; key { [ backslash, bar ] }; - include "keypad(comma)" + include "kpdl(comma)" }; hidden partial alphanumeric_keys alternate_group diff --git a/symbols/hu b/symbols/hu index a745641..dc1bc13 100644 --- a/symbols/hu +++ b/symbols/hu @@ -60,7 +60,7 @@ xkb_symbols "101_qwertz_comma_dead" { include "latin" include "hu(def_101)" include "hu(def_qwertz)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_dead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -76,7 +76,7 @@ xkb_symbols "101_qwertz_comma_nodead" { include "latin" include "hu(def_101)" include "hu(def_qwertz)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_nodead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -124,7 +124,7 @@ xkb_symbols "101_qwerty_comma_dead" { include "latin" include "hu(def_101)" include "hu(def_qwerty)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_dead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -140,7 +140,7 @@ xkb_symbols "101_qwerty_comma_nodead" { include "latin" include "hu(def_101)" include "hu(def_qwerty)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_nodead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -188,7 +188,7 @@ xkb_symbols "102_qwertz_comma_dead" { include "latin" include "hu(def_102)" include "hu(def_qwertz)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_dead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -204,7 +204,7 @@ xkb_symbols "102_qwertz_comma_nodead" { include "latin" include "hu(def_102)" include "hu(def_qwertz)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_nodead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -252,7 +252,7 @@ xkb_symbols "102_qwerty_comma_dead" { include "latin" include "hu(def_102)" include "hu(def_qwerty)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_dead)" include "hu(def_common)" include "level3(ralt_switch)" @@ -268,7 +268,7 @@ xkb_symbols "102_qwerty_comma_nodead" { include "latin" include "hu(def_102)" include "hu(def_qwerty)" - include "keypad(comma)" + include "kpdl(comma)" include "hu(def_nodead)" include "hu(def_common)" include "level3(ralt_switch)" diff --git a/symbols/it b/symbols/it index a5c7d82..07364ef 100644 --- a/symbols/it +++ b/symbols/it @@ -126,7 +126,7 @@ xkb_symbols "mac" { // End alphanumeric section - include "keypad(dot)" + include "kpdl(dot)" include "level3(ralt_switch)" }; diff --git a/symbols/keypad b/symbols/keypad index cd8f0ce..cb4e67b 100644 --- a/symbols/keypad +++ b/symbols/keypad @@ -126,54 +126,56 @@ xkb_symbols "x11" { key { [ KP_Delete, KP_Decimal ] }; }; -// Some national standards use comma on the keypad instead of decimal dot -partial keypad_keys -xkb_symbols "comma" { - key { [ KP_Delete, KP_Separator ] }; -}; - -// Default is decimal dot -partial keypad_keys -xkb_symbols "dot" { - key { [ KP_Delete, KP_Decimal ] }; -}; - // Legacy PC keypad definition -// Copyright © 2006 Nicolas Mailhot +// Copyright © 2006-2007 Nicolas Mailhot keypad_keys xkb_symbols "legacy" { include "keypad(core)" include "keypad(legacymath)" include "keypad(legacynumber)" + include "kpdl(dot)" }; // Complete new keypad definition -// Copyright © 2006 Nicolas Mailhot +// Copyright © 2006-2007 Nicolas Mailhot keypad_keys xkb_symbols "oss" { include "keypad(core)" include "keypad(ossmath)" include "keypad(ossnumber)" + include "kpdl(dotoss)" }; // Latin9 restriction of new keypad definition -// Copyright © 2006 Nicolas Mailhot +// Copyright © 2006-2007 Nicolas Mailhot keypad_keys xkb_symbols "oss_latin9" { include "keypad(core)" include "keypad(ossmath_latin9)" include "keypad(legacynumber)" + include "kpdl(dotoss_latin9)" +}; + + +// Forward-looking keypad definition +// Won't work with applications that make ASCII assumptions +// Copyright © 2007 Nicolas Mailhot +keypad_keys +xkb_symbols "future" { - key { type="FOUR_LEVEL_MIXED_KEYPAD", - [ KP_Delete, period, comma, nobreakspace ] }; // . , ⍽ (no-break space) + include "keypad(core)" + include "keypad(futuremath)" + include "keypad(ossnumber)" + include "kpdl(commaoss)" }; + // Keypad keys nobody changes // Copyright © 2006 Nicolas Mailhot partial keypad_keys @@ -241,6 +243,33 @@ xkb_symbols "ossmath" { }; +// Keypad math area with non-CS operators in first levels +// As demanded by users not interested in legacy pre-unicode junk +// Copyright © 2007 Nicolas Mailhot +// +// ┏━━━━━┱─────┬─────┬─────┐ +// ┃Num ┃ / ₁ │ * ₂ │ - ₃ │ ₁ +// ┃Lock⇭┃ ∕ ÷ │ . × │ − − │ ₂ +// ┡━━━━━╃─────┼─────┼─────┤ ₃ +// │ + ₄ │ ₄ +// │ │ +// ┤ │ 1 None +// │ │ 2 Level3 ⇮ +// │ + + │ 3 Shift+Level3 ⇧⇮ +// ╆━━━━━┪ 4 Ctrl+Alt +partial keypad_keys +xkb_symbols "futuremath" { + + key.type[Group1]="FOUR_LEVEL_X" ; + + key { [ 0x1002215, KP_Divide, 0x10000F7, XF86_Ungrab ] }; // ∕ / ÷ + key { [ 0x10022C5, KP_Multiply, 0x10000D7, XF86_ClearGrab ] }; // ⋅ * × + key { [ 0x1002212, KP_Subtract, 0x1002212, XF86_Prev_VMode ] }; // − - − + + key { [ 0x100002B, KP_Add, 0x100002B, XF86_Next_VMode ] }; // + + + +}; + + // Keypad math area with non-CS operators, restricted to latin9 // Copyright © 2006 Nicolas Mailhot // @@ -279,13 +308,13 @@ xkb_symbols "ossmath_latin9" { // ├─────┼─────┼─────┤ ␥ Delete // │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions // │ ⇦ │ │ ⇨ │ -// ├─────┼─────┼─────╆━━━━━┪ -// │ 1 │ 2 │ 3 ┃Enter┃ -// │ ⇲ │ ⇩ │ ⇟ ┃ ⎆ ┃ 1 None -// ├─────┴─────┼─────┨ ┃ 2 Num Lock ⇭ -// │ 0 │ . ┃ ┃ -// │ ⎀ │ ␥ ┃ ┃ -// └───────────┴─────┺━━━━━┛ +// ├─────┼─────┼─────╆ +// │ 1 │ 2 │ 3 ┃ +// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None +// ├─────┴─────┼─────┨ 2 Num Lock ⇭ +// │ 0 │ +// │ ⎀ │ +// └───────────┴ partial keypad_keys xkb_symbols "legacynumber" { @@ -304,7 +333,6 @@ xkb_symbols "legacynumber" { key { [ KP_Next, KP_3 ] }; // 3 key { [ KP_Insert, KP_0 ] }; // 0 - key { [ KP_Delete, KP_Decimal ] }; // . }; @@ -320,13 +348,13 @@ xkb_symbols "legacynumber" { // ├─────┼─────┼─────┤ ␥ Delete // │ 4 ⇐ │ 5 ⇔ │ 6 ⇗ │ ⇦⇧⇨⇩ Directions // │ ⇦ ← │ ↔ │ ⇨ ↗ │ ⍽ narrow no-break space -// ├─────┼─────┼─────╆━━━━━┪ -// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃Enter┃ -// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ ⎆ ┃ 1 None -// ├─────┴─────┼─────┨ ┃ 2 Num Lock ⇭ -// │ 0 ⇕ │ . ⍽ ┃ ┃ 3 Level3 ⇮ -// │ ⎀ ↕ │ ␥ , ┃ ┃ 4 Shift+Level3 ⇧⇮ -// └───────────┴─────┺━━━━━┛ +// ├─────┼─────┼─────╆ +// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃ +// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ 1 None +// ├─────┴─────┼─────┨ 2 Num Lock ⇭ +// │ 0 ⇕ │ 3 Level3 ⇮ +// │ ⎀ ↕ │ 4 Shift+Level3 ⇧⇮ +// └───────────┴ partial keypad_keys xkb_symbols "ossnumber" { @@ -345,7 +373,4 @@ xkb_symbols "ossnumber" { key { [ KP_Next, KP_3, 0x1002198, 0x10021D8 ] }; // 3 ↘ ⇘ key { [ KP_Insert, KP_0, 0x1002195, 0x10021D5 ] }; // 0 ↕ ⇕ - // We could use KP_Decimal and KP_Separator but we do not want the locale - // decimal and separator symbol but locale-insensitive dot and comma - key { [ KP_Delete, period, comma, 0x100202F ] }; // . , ⍽ (narrow no-break space) }; diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch index b717b12..4932eb8 100644 --- a/symbols/macintosh_vndr/ch +++ b/symbols/macintosh_vndr/ch @@ -67,7 +67,7 @@ xkb_symbols "extended" { key { [ less, greater, lessthanequal, greaterthanequal ] }; key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de index c9060b0..92c5491 100644 --- a/symbols/macintosh_vndr/de +++ b/symbols/macintosh_vndr/de @@ -54,7 +54,7 @@ xkb_symbols "basic" { key { [ minus, underscore ] }; key { [ numbersign, apostrophe, dead_grave ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it index feadeb1..4443520 100644 --- a/symbols/macintosh_vndr/it +++ b/symbols/macintosh_vndr/it @@ -58,7 +58,7 @@ xkb_symbols "extended" { // End alphanumeric section - include "keypad(dot)" + include "kpdl(dot)" include "level3(ralt_switch)" }; diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se index f46674a..d5d8c1c 100644 --- a/symbols/macintosh_vndr/se +++ b/symbols/macintosh_vndr/se @@ -33,7 +33,7 @@ xkb_symbols "basic" { key { [ apostrophe, asterisk, at ] }; key { [ less, greater, bar, brokenbar ] }; - include "keypad(comma)" + include "kpdl(comma)" include "eurosign(e)" include "level3(ralt_switch)" }; diff --git a/symbols/mk b/symbols/mk index 2c7eb59..c69439c 100644 --- a/symbols/mk +++ b/symbols/mk @@ -56,7 +56,7 @@ xkb_symbols "basic" { key { [ period, colon ] }; key { [ slash, question ] }; - include "keypad(comma)" + include "kpdl(comma)" }; partial alphanumeric_keys diff --git a/symbols/no b/symbols/no index 06a053e..21662a2 100644 --- a/symbols/no +++ b/symbols/no @@ -26,7 +26,7 @@ xkb_symbols "basic" { key { [apostrophe, asterisk, dead_doubleacute, multiply ] }; key { [ less, greater, onehalf, threequarters] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/pl b/symbols/pl index 8b4b09f..7538c37 100644 --- a/symbols/pl +++ b/symbols/pl @@ -22,7 +22,7 @@ xkb_symbols "basic" { key { [ c, C, cacute, Cacute ] }; key { [ n, N, nacute, Nacute ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -66,7 +66,7 @@ xkb_symbols "qwertz" { key { [ c, C, cent, copyright ] }; key { [ minus, underscore, dead_belowdot, dead_abovedot ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -97,7 +97,7 @@ xkb_symbols "dvorak" { key { [ v, V, zacute, Zacute ] }; key { [ z, Z, zabovedot, Zabovedot ] }; - include "keypad(comma)" + include "kpdl(comma)" // this to allow writing ALL CAPS with a Shift key include "level3(ralt_switch)" @@ -151,7 +151,7 @@ xkb_symbols "csb" { key { [ z, Z, zabovedot, Zabovedot ] }; key { [ n, N, nacute, Nacute ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; diff --git a/symbols/ro b/symbols/ro index d4654c2..98417fe 100644 --- a/symbols/ro +++ b/symbols/ro @@ -186,7 +186,7 @@ xkb_symbols "winkeys" { key { [ acircumflex, Acircumflex ] }; // End alphanumeric section, begin "Keypad" - include "keypad(comma)" + include "kpdl(comma)" // End "Keypad" section include "level3(ralt_switch)" diff --git a/symbols/ru b/symbols/ru index 8a6cce6..e9ce03c 100644 --- a/symbols/ru +++ b/symbols/ru @@ -65,7 +65,7 @@ xkb_symbols "basic" { key.type[group1]="TWO_LEVEL"; - include "keypad(comma)" + include "kpdl(comma)" }; partial alphanumeric_keys diff --git a/symbols/se b/symbols/se index d25ab66..427b899 100644 --- a/symbols/se +++ b/symbols/se @@ -28,7 +28,7 @@ xkb_symbols "se" { key { [ space, space, space, nobreakspace ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; @@ -203,7 +203,7 @@ xkb_symbols "mac" { key { [ diaeresis, asciicircum, asciitilde ] }; key { [ apostrophe, asterisk, at ] }; - include "keypad(comma)" + include "kpdl(comma)" include "level3(ralt_switch)" }; -- 2.32.0.93.g670b81a890