remove special thinkpad handling, unify the two setups

[etc/xsession.git] / .xkb / symbols / madduck

diff --git a/.xkb/symbols/madduck b/.xkb/symbols/madduck
index b18628f185280e9a3ce97ddf720a2e314dab81eb..e6facf3101a05421979c50060ac834a1a261c437 100644 (file)
--- a/.xkb/symbols/madduck
+++ b/.xkb/symbols/madduck
@@ -1,30 +1,25 @@
-// default_switch: set up windows keys for mode switching and the menu keys
-// to generate mod3
+// mode_switch: set up windows keys for mode switching and the menu keys
+// to generate mod3. since I have some machines without those fancy keys, I
+// also configure the right CTRL and ALT keys to do the same.
 partial modifier_keys
-xkb_symbols "default_switch" {
+xkb_symbols "mode_switch" {
   include "group(win_switch)"
+  include "group(switch)"
   replace key <MENU> {
-    [ Super_L, Super_R ]
+    [ VoidSymbol, VoidSymbol ]
   };
-  modifier_map Mod3 { <MENU> };
-};
-
-// thinkpad_switch: on thinkpads, use the right control and alt keys as
-// substitute for the missing menu and windows keys
-partial modifier_keys
-xkb_symbols "thinkpad_switch" {
-  include "group(switch)"
   replace key <RCTL> {
-    [ Super_L, Super_R ]
+    [ VoidSymbol, VoidSymbol ]
   };
   modifier_map Mod3 { <RCTL> };
+  modifier_map Mod3 { <MENU> };
 };
 
 // caps_mod4: make capslock generate the mod4 modifier
 partial modifier_keys
 xkb_symbols "caps_mod4" {
   replace key <CAPS> {
-    [ Hyper_L, Hyper_R ]
+    [ VoidSymbol, VoidSymbol ]
   };
   modifier_map Mod4 { <CAPS> };
 };