Defining in one place the default behaviour of the keypad's operator keys.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/symbols/keypad b/symbols/keypad
index 5555298..6c41f13 100644 (file)
--- a/symbols/keypad
+++ b/symbols/keypad
@@ -71,36 +71,37 @@ xkb_symbols "overlay2" {
     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    ]       };

diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 73b5af2..52b4eb9 100644 (file)
--- a/symbols/srvr_ctrl
+++ b/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" {