From 2414a1de3cc17f438219f8f2a58b530d33e99a5e Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 6 Sep 2013 12:06:57 +0200 Subject: mesa pixman xserver xkeyboard-config xserver commit 6f89ae3e64c4dfeea508813e546c10ba1da3ea8e xkeyboard-config commit c2309b50e7ef7b9263278fd8ff73dda1484d72db pixman commit 8ad63f90cd8392a40f115c56b16c54d45012070e mesa commit 505fad04f10eee1efdfcd8986b4d484b49d39986 --- xorg-server/xkeyboard-config/symbols/keypad | 113 +++++++++++++--------------- 1 file changed, 53 insertions(+), 60 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/keypad') 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 { [ KP_Home ], overlay1= }; key { [ KP_Up ], overlay1= }; key { [ KP_Prior ], overlay1= }; @@ -21,7 +19,7 @@ xkb_symbols "overlay1" { key { [ KP_Next ], overlay1= }; key { [ KP_Insert ], overlay1= }; - key { [ KP_Delete ], overlay1= }; + key { [ KP_Delete ], overlay1= }; key { [ KP_7 ] }; key { [ KP_8 ] }; @@ -36,16 +34,12 @@ xkb_symbols "overlay1" { key { [ KP_3 ] }; key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - - // End "Keypad" section + key { [ KP_Decimal ] }; }; partial hidden keypad_keys xkb_symbols "overlay2" { - // Begin "Keypad" section - key { [ KP_Home ], overlay2= }; key { [ KP_Up ], overlay2= }; key { [ KP_Prior ], overlay2= }; @@ -59,7 +53,7 @@ xkb_symbols "overlay2" { key { [ KP_Next ], overlay2= }; key { [ KP_Insert ], overlay2= }; - key { [ KP_Delete ], overlay2= }; + key { [ KP_Delete ], overlay2= }; key { [ KP_7 ] }; key { [ KP_8 ] }; @@ -74,41 +68,40 @@ xkb_symbols "overlay2" { key { [ KP_3 ] }; key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - - // End "Keypad" section + key { [ 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 { - 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 { - 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 { - 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 { + 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 { [ KP_Home, KP_7 ] }; key { [ KP_Up, KP_8 ] }; key { [ KP_Prior, KP_9 ] }; -// +VMode switches to the next video mode - key { - type="CTRL+ALT", - symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] - }; - key { [ KP_Left, KP_4 ] }; key { [ KP_Begin, KP_5 ] }; key { [ KP_Right, KP_6 ] }; @@ -116,12 +109,12 @@ xkb_symbols "x11" { key { [ KP_End, KP_1 ] }; key { [ KP_Down, KP_2 ] }; key { [ KP_Next, KP_3 ] }; - key { [ KP_Enter ] }; - key { [ KP_Equal ] }; + key { [ KP_Enter ] }; + key { [ KP_Equal ] }; key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - key { [ KP_Decimal, KP_Decimal ] }; + key { [ KP_Delete, KP_Decimal ] }; + key { [ KP_Decimal, KP_Decimal ] }; }; @@ -247,7 +240,6 @@ xkb_symbols "legacymath" { key { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - key { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + - }; @@ -272,8 +264,8 @@ xkb_symbols "ossmath" { key { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ key { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × key { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − - key { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + + key { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + }; @@ -333,19 +325,19 @@ xkb_symbols "ossmath_latin9" { // Legacy keypad number area // Copyright © 2006 Nicolas Mailhot // -// ┏━━━━━┱ ⇱ 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 // -// ┏━━━━━┱ ⇱ 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 // -// ┏━━━━━┱ ⇱ 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 { [ NoSymbol, NoSymbol, parenleft ] }; key { [ NoSymbol, NoSymbol, parenright ] }; @@ -579,9 +571,10 @@ xkb_symbols "atm" { partial modifier_keys xkb_symbols "pointerkeys" { - key { [ Num_Lock, Pointer_EnableKeys ] }; + key { [ Num_Lock, Pointer_EnableKeys ] }; }; + // Only numbers, operators and decimal separator, // as seen on keypad overlay on Japanese keyboard. // ┌─┬─┬─┬─┐ -- cgit v1.2.3