From b520df571e0a319eae5231d09f36b98f28b8914a Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 6 Oct 2011 08:46:34 +0200 Subject: upgraded to inputproto-2.1.99.1 xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011 --- xorg-server/xkeyboard-config/symbols/keypad | 24 +++++++++---------- xorg-server/xkeyboard-config/symbols/srvr_ctrl | 32 +++++++++++++------------- xorg-server/xkeyboard-config/symbols/terminate | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index e85aaacbd..1bab39181 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -84,19 +84,19 @@ xkb_symbols "x11" { // Ungrab cancels server/keyboard/pointer grabs key { type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + 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", - symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // -VMode switches to the previous video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; key { [ KP_Home, KP_7 ] }; @@ -106,7 +106,7 @@ xkb_symbols "x11" { // +VMode switches to the next video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] + symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; key { [ KP_Left, KP_4 ] }; @@ -242,11 +242,11 @@ xkb_symbols "legacymath" { key.type[Group1]="CTRL+ALT" ; - key { [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / - key { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * - key { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - + key { [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / + key { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * + key { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - - key { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + + key { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + }; @@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" { // ClsGrb kills whichever client has a grab in effect key { type="CTRL+ALT", - symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; key { [ KP_4 ] }; @@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" { // -VMode switches to the previous video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; key { [ KP_1 ] }; @@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" { // +VMode switches to the next video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] + symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; key { [ KP_0 ] }; @@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" { // Ungrab cancels server/keyboard/pointer grabs key { type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/srvr_ctrl b/xorg-server/xkeyboard-config/symbols/srvr_ctrl index 7d47d66a3..73b5af2de 100644 --- a/xorg-server/xkeyboard-config/symbols/srvr_ctrl +++ b/xorg-server/xkeyboard-config/symbols/srvr_ctrl @@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" { // Ungrab cancels server/keyboard/pointer grabs key { type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + 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", - symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // -VMode switches to the previous video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // +VMode switches to the next video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode] + symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode] }; }; @@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" { key { type="CTRL+ALT", - symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ] + symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ] + symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ] + symbols[Group1]= [ F3, F3, F3, F3, XF86_Switch_VT_3 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ] + symbols[Group1]= [ F4, F4, F4, F4, XF86_Switch_VT_4 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ] + symbols[Group1]= [ F5, F5, F5, F5, XF86_Switch_VT_5 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ] + symbols[Group1]= [ F6, F6, F6, F6, XF86_Switch_VT_6 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ] + symbols[Group1]= [ F7, F7, F7, F7, XF86_Switch_VT_7 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ] + symbols[Group1]= [ F8, F8, F8, F8, XF86_Switch_VT_8 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ] + symbols[Group1]= [ F9, F9, F9, F9, XF86_Switch_VT_9 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ] + symbols[Group1]= [ F10, F10, F10, F10, XF86_Switch_VT_10 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ] + symbols[Group1]= [ F11, F11, F11, F11, XF86_Switch_VT_11 ] }; key { type="CTRL+ALT", - symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ] + symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/terminate b/xorg-server/xkeyboard-config/symbols/terminate index 96dd6e8f2..c74220bc7 100644 --- a/xorg-server/xkeyboard-config/symbols/terminate +++ b/xorg-server/xkeyboard-config/symbols/terminate @@ -2,6 +2,6 @@ partial default modifier_keys xkb_symbols "ctrl_alt_bksp" { key { type="CTRL+ALT", - symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ] + symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ] }; }; -- cgit v1.2.3