diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-06 12:06:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-06 12:06:57 +0200 |
| commit | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (patch) | |
| tree | a7d7ca359bf84115689b071d30dfae0887efc057 /xorg-server/xkeyboard-config/symbols | |
| parent | b828531d8b6da75a258d12f97df0f4e49f75ab98 (diff) | |
| download | vcxsrv-2414a1de3cc17f438219f8f2a58b530d33e99a5e.tar.gz vcxsrv-2414a1de3cc17f438219f8f2a58b530d33e99a5e.tar.bz2 vcxsrv-2414a1de3cc17f438219f8f2a58b530d33e99a5e.zip | |
mesa pixman xserver xkeyboard-config
xserver commit 6f89ae3e64c4dfeea508813e546c10ba1da3ea8e
xkeyboard-config commit c2309b50e7ef7b9263278fd8ff73dda1484d72db
pixman commit 8ad63f90cd8392a40f115c56b16c54d45012070e
mesa commit 505fad04f10eee1efdfcd8986b4d484b49d39986
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
31 files changed, 105 insertions, 145 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd index 34879eb72..d4be36871 100644 --- a/xorg-server/xkeyboard-config/symbols/bd +++ b/xorg-server/xkeyboard-config/symbols/bd @@ -20,7 +20,7 @@ xkb_symbols "basic" { key <ESC> { [ Escape ] }; // numbers - key <TLDE> { [ quoteleft, asciitilde, voidsymbol, voidsymbol ] }; + key <TLDE> { [ grave, asciitilde, voidsymbol, voidsymbol ] }; key <AE01> { [ 0x10009E7, exclam, 0x10009F4, voidsymbol ] }; key <AE02> { [ 0x10009E8, at, 0x10009F5, voidsymbol ] }; key <AE03> { [ 0x10009E9, numbersign, 0x10009F6, voidsymbol ] }; @@ -63,7 +63,7 @@ xkb_symbols "basic" { key <AC08> { [ 0x10009A4, 0x10009A5, 0x10009CE, voidsymbol ] }; key <AC09> { [ 0x10009A6, 0x10009A7, 0x100098C, 0x10009E1 ] }; key <AC10> { [ semicolon, colon, voidsymbol, voidsymbol ] }; - key <AC11> { [ quoteright, quotedbl, voidsymbol, voidsymbol ] }; + key <AC11> { [ apostrophe, quotedbl, voidsymbol, voidsymbol ] }; // shift, z to / // key <LFSH> { [ Shift_L ] }; diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be index c89a9338c..c82cb7d6f 100644 --- a/xorg-server/xkeyboard-config/symbols/be +++ b/xorg-server/xkeyboard-config/symbols/be @@ -212,8 +212,8 @@ xkb_symbols "nodeadkeys" { key <AD11> { [asciicircum, diaeresis, bracketleft, bracketleft] }; key <AD12> { [ dollar, asterisk, bracketright, macron ] }; key <AC10> { [ m, M, acute, doubleacute ] }; - key <AC11> { [ ugrave, percent, quoteright, quoteright ] }; - key <BKSL> { [ mu, sterling, quoteleft, quoteleft ] }; + key <AC11> { [ ugrave, percent, apostrophe, apostrophe ] }; + key <BKSL> { [ mu, sterling, grave, grave ] }; key <AB07> { [ comma, question, cedilla, masculine ] }; key <AB10> { [ equal, plus, asciitilde, asciitilde ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee index 67c484447..eb26d50bc 100644 --- a/xorg-server/xkeyboard-config/symbols/ee +++ b/xorg-server/xkeyboard-config/symbols/ee @@ -90,7 +90,7 @@ xkb_symbols "us" { // š, Š key <AC02> { [ s, S, scaron, Scaron ] }; key <AC10> { [ semicolon, colon, odiaeresis, Odiaeresis ] }; - key <AC11> { [ quoteright, quotedbl, adiaeresis, Adiaeresis ] }; + key <AC11> { [ apostrophe, quotedbl, adiaeresis, Adiaeresis ] }; key <AD11> { [ bracketleft, braceleft, udiaeresis, Udiaeresis ] }; key <AD12> { [ bracketright, braceright, otilde, Otilde ] }; // £ diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index 418ff5200..1bf007e77 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -372,8 +372,8 @@ xkb_symbols "latin9" { key <AD07> { [ u, U, ucircumflex, udiaeresis ] }; key <AD08> { [ i, I, icircumflex, idiaeresis ] }; key <AD09> { [ o, O, ocircumflex, odiaeresis ] }; - key <AD10> { [ p, P, paragraph, quoteleft ] }; - key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, quoteright ] }; + key <AD10> { [ p, P, paragraph, grave ] }; + key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, apostrophe ] }; key <AD12> { [ dollar, sterling, ecircumflex, ediaeresis ] }; key <AC01> { [ q, Q, Acircumflex, Adiaeresis ] }; @@ -417,7 +417,7 @@ xkb_symbols "latin9_Sundeadkeys" { key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] }; key <AE07> { [ egrave, 7, dead_grave, Egrave ] }; - key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, quoteright ] }; + key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, apostrophe ] }; }; @@ -441,7 +441,7 @@ xkb_symbols "latin9_nodeadkeys" { key <AE01> { [ ampersand, 1, apostrophe, periodcentered ] }; key <AE07> { [ egrave, 7, grave, Egrave ] }; key <AE12> { [ equal, plus, braceright ] }; - key <AD11> { [ asciicircum, diaeresis, asciitilde, quoteright ] }; + key <AD11> { [ asciicircum, diaeresis, asciitilde, apostrophe ] }; }; // Bépo : Improved ergonomic french keymap using Dvorak method. diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge index d188d4822..57c02a0d6 100644 --- a/xorg-server/xkeyboard-config/symbols/ge +++ b/xorg-server/xkeyboard-config/symbols/ge @@ -149,7 +149,7 @@ xkb_symbols "mess" { name[Group1]= "Georgian (MESS)"; - key <TLDE> { [ 0x010010ed, backslash, quoteleft ] }; + key <TLDE> { [ 0x010010ed, backslash, grave ] }; key <AE01> { [ 1, exclam, apostrophe ] }; key <AE02> { [ 2, at, asciitilde ] }; key <AE03> { [ 3, 0x01002116, numbersign ] }; diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 64c3ea1dd..5336232d1 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -292,7 +292,7 @@ xkb_symbols "ben_probhat" { key <AC08> { [ U0995, U0996 ] }; key <AC09> { [ U09B2, U0982 ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; // shift, z to / // key <LFSH> { [ Shift_L ] }; @@ -369,7 +369,7 @@ xkb_symbols "ben_baishakhi" { key <AC08> { [ 0x1000995, 0x1000996 ] }; key <AC09> { [ 0x10009B2, 0x1000964, 0x100098C ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; // shift, z to / // key <LFSH> { [ Shift_L ] }; @@ -471,7 +471,7 @@ xkb_symbols "ben_gitanjali" { // numbers key <TLDE> { [ colon, question ] }; key <AE01> { [ 0x10009E7, 0x10009CE ] }; - key <AE02> { [ 0x10009E8, quoteright ] }; + key <AE02> { [ 0x10009E8, apostrophe ] }; key <AE03> { [ 0x10009E9, numbersign ] }; key <AE04> { [ 0x10009EA, 0x10009F3 ] }; key <AE05> { [ 0x10009EB, slash ] }; @@ -590,7 +590,7 @@ xkb_symbols "ben_bornona" { key <AC08> { [ 0x1000995, 0x1000996 ] }; key <AC09> { [ 0x10009B2, 0x1000964 ] }; key <AC10> { [ semicolon, 0x100003A ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; // shift, z to / // key <LFSH> { [ Shift_L ] }; @@ -1643,7 +1643,7 @@ xkb_symbols "hin-wx" { key <AC08> { [ 0x1000915, 0x1000916 ] }; key <AC09> { [ 0x1000932, 0x1000962, 0x1000933, 0x100090C] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <AB01> { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] }; key <AB02> { [ 0x1000926, 0x1000927 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir index 0414d02d7..519708d75 100644 --- a/xorg-server/xkeyboard-config/symbols/ir +++ b/xorg-server/xkeyboard-config/symbols/ir @@ -39,7 +39,7 @@ partial hidden alphanumeric_keys xkb_symbols "pes_part_basic" { // Persian digits - key <AE01> { [ Farsi_1, exclam, quoteleft ] }; + key <AE01> { [ Farsi_1, exclam, grave ] }; key <AE02> { [ Farsi_2, 0x100066c, at ] }; key <AE03> { [ Farsi_3, 0x100066b, numbersign ] }; key <AE04> { [ Farsi_4, 0x100fdfc, dollar ] }; @@ -99,7 +99,7 @@ partial hidden alphanumeric_keys xkb_symbols "pes_part_ext" { // Persian and ASCII digits - key <AE01> { [ 0x10006f1, exclam, quoteleft, 1 ] }; + key <AE01> { [ 0x10006f1, exclam, grave, 1 ] }; key <AE02> { [ 0x10006f2, 0x100066c, at, 2 ] }; key <AE03> { [ 0x10006f3, 0x100066b, numbersign, 3 ] }; key <AE04> { [ 0x10006f4, 0x100fdfc, dollar, 4 ] }; @@ -186,7 +186,7 @@ xkb_symbols "ku_ara" { key <BKSL> { [ backslash, bar, ccedilla, Ccedilla ] }; // Digits - key <AE01> { [ 1, exclam, 0x10006f1, quoteleft ] }; + key <AE01> { [ 1, exclam, 0x10006f1, grave ] }; key <AE02> { [ 2, at, 0x10006f2, at ] }; key <AE03> { [ 3, numbersign, 0x10006f3, 0x100066b ] }; key <AE04> { [ 4, dollar, 0x10006f4, 0x100fdfc ] }; diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index 85d4d6e20..6c41f134f 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -6,8 +6,6 @@ xkb_symbols "overlay" { partial hidden keypad_keys xkb_symbols "overlay1" { - // Begin "Keypad" section - key <KP7> { [ KP_Home ], overlay1=<KO7> }; key <KP8> { [ KP_Up ], overlay1=<KO8> }; key <KP9> { [ KP_Prior ], overlay1=<KO9> }; @@ -21,7 +19,7 @@ xkb_symbols "overlay1" { key <KP3> { [ KP_Next ], overlay1=<KO3> }; key <KP0> { [ KP_Insert ], overlay1=<KO0> }; - key <KPDL> { [ KP_Delete ], overlay1=<KODL> }; + key <KPDL> { [ KP_Delete ], overlay1=<KODL> }; key <KO7> { [ KP_7 ] }; key <KO8> { [ KP_8 ] }; @@ -36,16 +34,12 @@ xkb_symbols "overlay1" { key <KO3> { [ KP_3 ] }; key <KO0> { [ KP_0 ] }; - key <KODL> { [ KP_Decimal ] }; - - // End "Keypad" section + key <KODL> { [ KP_Decimal ] }; }; partial hidden keypad_keys xkb_symbols "overlay2" { - // Begin "Keypad" section - key <KP7> { [ KP_Home ], overlay2=<KO7> }; key <KP8> { [ KP_Up ], overlay2=<KO8> }; key <KP9> { [ KP_Prior ], overlay2=<KO9> }; @@ -59,7 +53,7 @@ xkb_symbols "overlay2" { key <KP3> { [ KP_Next ], overlay2=<KO3> }; key <KP0> { [ KP_Insert ], overlay2=<KO0> }; - key <KPDL> { [ KP_Delete ], overlay2=<KODL> }; + key <KPDL> { [ KP_Delete ], overlay2=<KODL> }; key <KO7> { [ KP_7 ] }; key <KO8> { [ KP_8 ] }; @@ -74,41 +68,40 @@ xkb_symbols "overlay2" { key <KO3> { [ KP_3 ] }; key <KO0> { [ KP_0 ] }; - key <KODL> { [ KP_Decimal ] }; - - // End "Keypad" section + key <KODL> { [ KP_Decimal ] }; }; -partial hidden default keypad_keys -xkb_symbols "x11" { -// Ungrab cancels server/keyboard/pointer grabs +partial hidden keypad_keys +xkb_symbols "operators" { + // Puts some commands to control the X server on + // the fifth level of the keypad's operator keys. key <KPDV> { - type="CTRL+ALT", + type="CTRL+ALT", // Ungrab cancels server/keyboard/pointer grabs symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; - -// ClsGrb kills whichever client has a grab in effect key <KPMU> { - type="CTRL+ALT", + type="CTRL+ALT", // ClsGrb kills whichever client has a grab in effect symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; - -// -VMode switches to the previous video mode key <KPSU> { - type="CTRL+ALT", + type="CTRL+ALT", // -VMode switches to the previous video mode symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; + key <KPAD> { + type="CTRL+ALT", // +VMode switches to the next video mode + symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] + }; +}; + +partial hidden default keypad_keys +xkb_symbols "x11" { + + include "keypad(operators)" key <KP7> { [ KP_Home, KP_7 ] }; key <KP8> { [ KP_Up, KP_8 ] }; key <KP9> { [ KP_Prior, KP_9 ] }; -// +VMode switches to the next video mode - key <KPAD> { - type="CTRL+ALT", - symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] - }; - key <KP4> { [ KP_Left, KP_4 ] }; key <KP5> { [ KP_Begin, KP_5 ] }; key <KP6> { [ KP_Right, KP_6 ] }; @@ -116,12 +109,12 @@ xkb_symbols "x11" { key <KP1> { [ KP_End, KP_1 ] }; key <KP2> { [ KP_Down, KP_2 ] }; key <KP3> { [ KP_Next, KP_3 ] }; - key <KPEN> { [ KP_Enter ] }; - key <KPEQ> { [ KP_Equal ] }; + key <KPEN> { [ KP_Enter ] }; + key <KPEQ> { [ KP_Equal ] }; key <KP0> { [ KP_Insert, KP_0 ] }; - key <KPDL> { [ KP_Delete, KP_Decimal ] }; - key <KPPT> { [ KP_Decimal, KP_Decimal ] }; + key <KPDL> { [ KP_Delete, KP_Decimal ] }; + key <KPPT> { [ KP_Decimal, KP_Decimal ] }; }; @@ -247,7 +240,6 @@ xkb_symbols "legacymath" { key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode> key <KPAD> { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode> - }; @@ -272,8 +264,8 @@ xkb_symbols "ossmath" { key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab> key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab> key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode> - key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode> + key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode> }; @@ -333,19 +325,19 @@ xkb_symbols "ossmath_latin9" { // Legacy keypad number area // Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net> // -// ┏━━━━━┱ ⇱ Home -// ┃Num ┃ ⇲ End -// ┃Lock⇭┃ ⇞ Page up -// ┡━━━━━╃─────┼─────┼ ⇟ Page down -// │ 7 │ 8 │ 9 │ ⇞ Page up +// ┏━━━━━┱ +// ┃Num ┃ ⇱ Home +// ┃Lock⇭┃ ⇲ End +// ┡━━━━━╃─────┼─────┼ ⇞ Page up +// │ 7 │ 8 │ 9 │ ⇟ Page down // │ ⇱ │ ⇧ │ ⇞ │ ⎀ Insert // ├─────┼─────┼─────┤ ␥ Delete // │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions // │ ⇦ │ │ ⇨ │ // ├─────┼─────┼─────╆ // │ 1 │ 2 │ 3 ┃ -// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None -// ├─────┴─────┼─────┨ 2 Num Lock ⇭ +// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None +// ├─────┴─────┼─────┨ 2 Num Lock ⇭ // │ 0 │ // │ ⎀ │ // └───────────┴ @@ -375,11 +367,11 @@ xkb_symbols "legacynumber" { // This is actually a three-level keypad, declared as four-level // to avoid defining a new type // -// ┏━━━━━┱ ⇱ Home -// ┃Num ┃ ⇲ End -// ┃Lock⇭┃ ⇞ Page up -// ┡━━━━━╃─────┼─────┼ ⇟ Page down -// │ 7 │ 8 │ 9 │ ⇞ Page up +// ┏━━━━━┱ +// ┃Num ┃ ⇱ Home +// ┃Lock⇭┃ ⇲ End +// ┡━━━━━╃─────┼─────┼ ⇞ Page up +// │ 7 │ 8 │ 9 │ ⇟ Page down // │ ⇱ < │ ⇧ > │ ⇞ ^ │ ⎀ Insert // ├─────┼─────┼─────┤ ␥ Delete // │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions @@ -415,15 +407,15 @@ xkb_symbols "legacynumber_wang" { // Keypad number area with arrow symbols // Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net> // -// ┏━━━━━┱ ⇱ Home -// ┃Num ┃ ⇲ End -// ┃Lock⇭┃ ⇞ Page up -// ┡━━━━━╃─────┼─────┼ ⇟ Page down -// │ 7 ⇖ │ 8 ⇑ │ 9 ⇗ │ ⇞ Page up +// ┏━━━━━┱ +// ┃Num ┃ ⇱ Home +// ┃Lock⇭┃ ⇲ End +// ┡━━━━━╃─────┼─────┼ ⇞ Page up +// │ 7 ⇖ │ 8 ⇑ │ 9 ⇗ │ ⇟ Page down // │ ⇱ ↖ │ ⇧ ↑ │ ⇞ ↗ │ ⎀ Insert // ├─────┼─────┼─────┤ ␥ Delete -// │ 4 ⇐ │ 5 ⇔ │ 6 ⇗ │ ⇦⇧⇨⇩ Directions -// │ ⇦ ← │ ↔ │ ⇨ ↗ │ ⍽ narrow no-break space +// │ 4 ⇐ │ 5 ⇔ │ 6 ⇒ │ ⇦⇧⇨⇩ Directions +// │ ⇦ ← │ ↔ │ ⇨ → │ ⍽ narrow no-break space // ├─────┼─────┼─────╆ // │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃ // │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ 1 None @@ -455,11 +447,11 @@ xkb_symbols "ossnumber" { // Wang 725-3771-ae and 725-3771-uk keypad number area with additional arrow symbols // Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net> // -// ┏━━━━━┱ ⇱ Home -// ┃Num ┃ ⇲ End -// ┃Lock⇭┃ ⇞ Page up -// ┡━━━━━╃─────┼─────┼ ⇟ Page down -// │ 7 ↖ │ 8 ↑ │ 9 ↗ │ ⇞ Page up +// ┏━━━━━┱ +// ┃Num ┃ ⇱ Home +// ┃Lock⇭┃ ⇲ End +// ┡━━━━━╃─────┼─────┼ ⇞ Page up +// │ 7 ↖ │ 8 ↑ │ 9 ↗ │ ⇟ Page down // │ ⇱ < │ ⇧ > │ ⇞ ^ │ ⎀ Insert // ├─────┼─────┼─────┤ ␥ Delete // │ 4 ← │ 5 ↔ │ 6 → │ ⇦⇧⇨⇩ Directions @@ -530,7 +522,7 @@ partial keypad_keys xkb_symbols "hex" { key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - // None NumLock AltGr + // None NumLock AltGr // symbol row key <KPDV> { [ NoSymbol, NoSymbol, parenleft ] }; key <KPMU> { [ NoSymbol, NoSymbol, parenright ] }; @@ -579,9 +571,10 @@ xkb_symbols "atm" { partial modifier_keys xkb_symbols "pointerkeys" { - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; }; + // Only numbers, operators and decimal separator, // as seen on keypad overlay on Japanese keyboard. // ┌─┬─┬─┬─┐ diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la index 269cb2618..dc101bc22 100644 --- a/xorg-server/xkeyboard-config/symbols/la +++ b/xorg-server/xkeyboard-config/symbols/la @@ -58,7 +58,7 @@ xkb_symbols "basic" { key <AB05> { [ 0x1000eb6 ]}; key <AB06> { [ 0x1000eb7 ]}; key <AB07> { [ 0x1000e97, 0x1000ec6 ]}; - key <AB08> { [ 0x1000ea1, quoteleft ]}; + key <AB08> { [ 0x1000ea1, grave ]}; key <AB09> { [ 0x1000ec3, dollar ]}; key <AB10> { [ 0x1000e9d, parenright ]}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us index 36f4429cc..d0cf5600b 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us @@ -6,7 +6,7 @@ xkb_symbols "extended" { key <ESC> { [ Escape ] }; // Alphanumeric section - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; key <AE03> { [ 3, numbersign ] }; @@ -44,7 +44,7 @@ xkb_symbols "extended" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <AB01> { [ z, Z ] }; key <AB02> { [ x, X ] }; diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv index ee9a7986b..e82b1e873 100644 --- a/xorg-server/xkeyboard-config/symbols/mv +++ b/xorg-server/xkeyboard-config/symbols/mv @@ -8,9 +8,7 @@ xkb_symbols "basic" { name[Group1]="Dhivehi"; -// The key <TLDE> should have the same values as US_en keyboard - - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; key <AE03> { [ 3, numbersign ] }; @@ -50,9 +48,7 @@ xkb_symbols "basic" { key <AC08> { [ 0x1000786, 0x100079A ] }; key <AC09> { [ 0x100078D, 0x1000785 ] }; key <AC10> { [ semicolon, colon ] }; -//I used singleloquotemark- if this is the wrong name, please replace with the name for the -//standard US_en keyboard format- its the same in the Thaana phonetic keyboard - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <BKSL> { [ backslash, bar ] }; key <LSGT> { [ bar, brokenbar ] }; diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp index 29b279c9f..6a9c32832 100644 --- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp @@ -40,7 +40,7 @@ default xkb_symbols "pc98" { key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, quoteleft ], [ kana_HE ] }; + key <AE12> { [ asciicircum, grave ], [ kana_HE ] }; key <BKSL> { [ backslash, bar ], [ prolongedsound ] }; key <BKSP> { [ BackSpace ] }; diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np index eb8e54ad7..ed7c2077a 100644 --- a/xorg-server/xkeyboard-config/symbols/np +++ b/xorg-server/xkeyboard-config/symbols/np @@ -47,7 +47,7 @@ xkb_symbols "basic" { key <AC08> { [ 0x1000915, 0x1000916 ] }; key <AC09> { [ 0x1000932, 0x1000933 ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <BKSL> { [ 0x1000950, 0x1000903 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index baa7a345a..0a08c6211 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -5,7 +5,7 @@ // // Original authors: // Danilo Segan (Данило Шеган) <danilo@kvota.net> -// Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu> +// Chusslove Illich (Часлав Илић) <caslav.ilic@gmx.net> // // Danilo Segan <danilo@kvota.net>: // - Modified for inclusion in XFree86 @@ -56,7 +56,7 @@ xkb_symbols "common" { key.type[Group1] = "FOUR_LEVEL"; - key <TLDE> { [ quoteleft, asciitilde, any,any ] }; // + key <TLDE> { [ grave, asciitilde, any,any ] }; // key <AE01> { [ 1, exclam, any,any ] }; // key <AE02> { [ 2, quotedbl, any,any ] }; // key <AE03> { [ 3, numbersign, any,any ] }; // diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 index d1dca0cb9..d72f9f9f9 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 @@ -12,7 +12,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, dollar ] }; key <AE05> { [ 5, percent ] }; key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, quoteright ] }; + key <AE07> { [ 7, apostrophe ] }; key <AE08> { [ 8, parenleft ] }; key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, asciitilde ] }; @@ -34,7 +34,7 @@ xkb_symbols "basic" { key <AC01> { [ a, A ] }; key <AC02> { [ s, S ] }; - key <AC03> { [ d, D, quoteleft ] }; + key <AC03> { [ d, D, grave ] }; key <AC04> { [ f, F, backslash ] }; key <AC05> { [ g, G, semicolon ] }; key <AC06> { [ h, H, colon ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh index 7c3d98fdf..575058ea7 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh @@ -11,7 +11,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, dollar ] }; key <AE05> { [ 5, percent ] }; key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, quoteright, quoteleft ] }; + key <AE07> { [ 7, apostrophe, grave ] }; key <AE08> { [ 8, parenleft, braceleft ] }; key <AE09> { [ 9, parenright, braceright ] }; key <AE10> { [ 0 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh index d287eb528..57a075171 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh @@ -11,7 +11,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, dollar ] }; key <AE05> { [ 5, percent ] }; key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, quoteright, quoteleft ] }; + key <AE07> { [ 7, apostrophe, grave ] }; key <AE08> { [ 8, parenleft, braceleft ] }; key <AE09> { [ 9, parenright, braceright ] }; key <AE10> { [ 0 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/srvr_ctrl b/xorg-server/xkeyboard-config/symbols/srvr_ctrl index 73b5af2de..52b4eb9a0 100644 --- a/xorg-server/xkeyboard-config/symbols/srvr_ctrl +++ b/xorg-server/xkeyboard-config/symbols/srvr_ctrl @@ -2,39 +2,10 @@ partial keypad_keys function_keys xkb_symbols "xfree86" { - include "srvr_ctrl(stdkeypad)" + include "keypad(operators)" include "srvr_ctrl(fkey2vt)" }; -partial keypad_keys -xkb_symbols "stdkeypad" { - -// Ungrab cancels server/keyboard/pointer grabs - key <KPDV> { - type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] - }; - -// ClsGrb kills whichever client has a grab in effect - key <KPMU> { - type="CTRL+ALT", - symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] - }; - -// -VMode switches to the previous video mode - key <KPSU> { - type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] - }; - -// +VMode switches to the next video mode - key <KPAD> { - type="CTRL+ALT", - symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode] - }; - -}; - partial function_keys xkb_symbols "fkey2vt" { diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca index 114ef3a7a..7e5a666da 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca @@ -63,9 +63,9 @@ xkb_symbols "sun_type6" { key <AB01> { [ z, Z, guillemotleft ]}; key <AB02> { [ x, X, guillemotright ]}; key <AB07> { [ m, M, mu ]}; - key <AB08> { [ comma, quoteright, less ]}; + key <AB08> { [ comma, apostrophe, less ]}; key <AB09> { [ period, quotedbl, greater ]}; - key <AB10> { [ eacute, Eacute, quoteleft ]}; + key <AB10> { [ eacute, Eacute, grave ]}; include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch index 213b4f08e..b75c14885 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch @@ -44,8 +44,8 @@ xkb_symbols "sun_type6_de" { key <AE07> { [ 7, slash, brokenbar ] }; key <AE08> { [ 8, parenleft, cent ] }; key <AE09> { [ 9, parenright ] }; - key <AE10> { [ 0, equal, quoteleft ] }; - key <AE11> { [ quoteright, question, dead_acute ] }; + key <AE10> { [ 0, equal, grave ] }; + key <AE11> { [ apostrophe, question, dead_acute ] }; key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] }; key <AD03> { [ e, E, EuroSign ] }; @@ -84,8 +84,8 @@ xkb_symbols "sun_type6_fr" { key <AE07> { [ 7, slash, brokenbar ] }; key <AE08> { [ 8, parenleft, cent ] }; key <AE09> { [ 9, parenright ] }; - key <AE10> { [ 0, equal, quoteleft ] }; - key <AE11> { [ quoteright, question, dead_acute ] }; + key <AE10> { [ 0, equal, grave ] }; + key <AE11> { [ apostrophe, question, dead_acute ] }; key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] }; key <AD03> { [ e, E, EuroSign ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz index 0818c9ab0..41fa9a972 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz @@ -35,7 +35,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" - key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key <TLDE> { [ semicolon, dead_abovering, grave, asciitilde ] }; key <AE01> { [ plus, 1, exclam, asciitilde ] }; key <AE02> { [ ecaron, 2, at, dead_caron ] }; key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi index 13e822c8f..c1ac1176a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi @@ -52,7 +52,7 @@ xkb_symbols "sun_type6" { key <AD12> { [ dead_diaeresis, asciicircum, asciitilde ] }; key <AC10> { [ odiaeresis, Odiaeresis ] }; key <AC11> { [ adiaeresis, Adiaeresis ] }; - key <BKSL> { [ apostrophe, asterisk, quoteleft ] }; + key <BKSL> { [ apostrophe, asterisk, grave ] }; key <LSGT> { [ less, greater, bar ] }; key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb index f329c5fd5..20d50eb98 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb @@ -34,7 +34,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" - key <TLDE> { [ quoteleft, notsign, brokenbar ] }; + key <TLDE> { [ grave, notsign, brokenbar ] }; key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, sterling ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp index c30d31e38..e72d84386 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp @@ -57,7 +57,7 @@ xkb_symbols "sun_type6_suncompat" { key <AD08> { [ i, I ], [ kana_NI ] }; key <AD09> { [ o, O ], [ kana_RA ] }; key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; + key <AD11> { [ at, grave ], [ voicedsound ] }; key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; key <AC01> { [ a, A ], [ kana_CHI ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt index b333622d9..78800499e 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt @@ -34,7 +34,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" - key <TLDE> { [ quoteleft, asciitilde, notsign, brokenbar ] }; + key <TLDE> { [ grave, asciitilde, notsign, brokenbar ] }; key <AE01> { [ aogonek, Aogonek, 1, exclam ] }; key <AE02> { [ ccaron, Ccaron, 2, at ] }; key <AE03> { [ eogonek, Eogonek, 3, numbersign ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl index 8f7a69de0..6d59bc2f4 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl @@ -44,7 +44,7 @@ xkb_symbols "sun_type6" { key <AE07> { [ 7, underscore, sterling ] }; key <AE08> { [ 8, parenleft, braceleft ] }; key <AE09> { [ 9, parenright, braceright ] }; - key <AE10> { [ 0, quoteright, quoteleft ] }; + key <AE10> { [ 0, apostrophe, grave ] }; key <AE11> { [ slash, question, backslash ] }; key <AE12> { [ degree, dead_tilde, dead_cedilla ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt index b6797bb94..4e00113cd 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt @@ -45,7 +45,7 @@ xkb_symbols "sun_type6" { key <AE08> { [ 8, parenleft, bracketleft ] }; key <AE09> { [ 9, parenright, bracketright ] }; key <AE10> { [ 0, equal, braceright ] }; - key <AE11> { [ quoteright, question, quoteleft ] }; + key <AE11> { [ apostrophe, question, grave ] }; key <AE12> { [ guillemotleft, guillemotright ] }; key <AD03> { [ e, E, EuroSign ] }; key <AD11> { [ plus, asterisk, dead_diaeresis ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk index e3507f0c4..18696bb3f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk @@ -34,7 +34,7 @@ xkb_symbols "sun_type6" { include "sun_vndr/us(sun_type6)" - key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key <TLDE> { [ semicolon, dead_abovering, grave asciitilde ] }; key <AE01> { [ plus, 1, exclam, asciitilde ] }; key <AE02> { [ lcaron, 2, at, dead_caron ] }; key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] }; diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn index 397a28126..c5e4c118b 100644 --- a/xorg-server/xkeyboard-config/symbols/vn +++ b/xorg-server/xkeyboard-config/symbols/vn @@ -16,7 +16,7 @@ xkb_symbols "basic" { name[Group1]= "Vietnamese"; // Alphanumeric section - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ abreve, Abreve ] }; key <AE02> { [ acircumflex, Acircumflex ] }; key <AE03> { [ ecircumflex, Ecircumflex ] }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga index e9d43ff60..46d48a27e 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga @@ -17,7 +17,7 @@ default xkb_symbols "usa1" { // End "Function" section // Alphanumeric section - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; key <AE03> { [ 3, numbersign ] }; @@ -60,7 +60,7 @@ default xkb_symbols "usa1" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <LFSH> { [ Shift_L ] }; key <AB01> { [ z, Z ] }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt index 813311dcf..65048bde4 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt @@ -16,7 +16,7 @@ default xkb_symbols "us" { key <AE10> { [ 0, parenright ] }; key <AE11> { [ minus, underscore ] }; key <AE12> { [ equal, plus ] }; - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <BKSP> { [ BackSpace ] }; key <TAB> { [ Tab, ISO_Left_Tab ] }; @@ -46,7 +46,7 @@ default xkb_symbols "us" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <BKSL> { [ backslash, bar ] }; key <LFSH> { [ Shift_L ] }; @@ -133,7 +133,7 @@ xkb_symbols "de" { key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, equal ] }; key <AE11> { [ ssharp, question ] }; - key <AE12> { [ quoteright, quoteleft ] }; + key <AE12> { [ apostrophe, grave ] }; key <TLDE> { [ numbersign, asciicircum ] }; key <AD06> { [ z, Z ] }; |