From df82ed7d78316202b7ca66a8df9a7a6111cfedc7 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Sat, 1 Oct 2011 20:46:57 +0100 Subject: [PATCH] Fixing keys using CTRL+ALT type https://bugs.freedesktop.org/show_bug.cgi?id=41297 A number of keys used 2nd level for CTRL+ALT action, now they are using level 5 --- symbols/keypad | 24 ++++++++++++------------ symbols/srvr_ctrl | 8 ++++---- symbols/terminate | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/symbols/keypad b/symbols/keypad index 40afe4f..e85aaac 100644 --- a/symbols/keypad +++ b/symbols/keypad @@ -84,19 +84,19 @@ xkb_symbols "x11" { // Ungrab cancels server/keyboard/pointer grabs key { type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, XF86_Ungrab ] + symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // ClsGrb kills whichever client has a grab in effect key { type="CTRL+ALT", - symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // -VMode switches to the previous video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, 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, XF86_Next_VMode ] + symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; key { [ KP_Left, KP_4 ] }; @@ -242,11 +242,11 @@ xkb_symbols "legacymath" { key.type[Group1]="CTRL+ALT" ; - key { [ KP_Divide, XF86_Ungrab ] }; // / - key { [ KP_Multiply, XF86_ClearGrab ] }; // * - key { [ KP_Subtract, XF86_Prev_VMode ] }; // - + 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_Add, XF86_Next_VMode ] }; // + + key { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, 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, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, 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, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, 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, XF86_Next_VMode ] + symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, 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, XF86_Ungrab ] + symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; }; diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl index 8bdf503..7d47d66 100644 --- a/symbols/srvr_ctrl +++ b/symbols/srvr_ctrl @@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" { // Ungrab cancels server/keyboard/pointer grabs key { type="CTRL+ALT", - symbols[Group1]= [ KP_Divide, XF86_Ungrab ] + symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // ClsGrb kills whichever client has a grab in effect key { type="CTRL+ALT", - symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ] + symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // -VMode switches to the previous video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ] + symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // +VMode switches to the next video mode key { type="CTRL+ALT", - symbols[Group1]= [ KP_Add, XF86_Next_VMode] + symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode] }; }; diff --git a/symbols/terminate b/symbols/terminate index 343d24f..96dd6e8 100644 --- a/symbols/terminate +++ b/symbols/terminate @@ -2,6 +2,6 @@ partial default modifier_keys xkb_symbols "ctrl_alt_bksp" { key { type="CTRL+ALT", - symbols[Group1] = [ NoSymbol, Terminate_Server ] + symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ] }; }; -- 2.32.0.93.g670b81a890