From 2414a1de3cc17f438219f8f2a58b530d33e99a5e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
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/srvr_ctrl | 31 +-------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols/srvr_ctrl')

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" {
 
-- 
cgit v1.2.3