remove special thinkpad handling, unify the two setups

diff --git a/.xkb/keymap/lapse.rw.madduck.net b/.xkb/keymap/lapse.rw.madduck.net
deleted file mode 100644 (file)
index 0dd9aab..0000000
--- a/.xkb/keymap/lapse.rw.madduck.net
+++ /dev/null
@@ -1,7 +0,0 @@
-default xkb_keymap "thinkpad" {
-  xkb_keycodes  { include "evdev+aliases(qwerty)"       };
-  xkb_types     { include "complete"    };
-  xkb_compat    { include "complete"    };
-  xkb_symbols   { include "pc+us+inet(evdev)+madduck(thinkpad_switch)+madduck(caps_mod4)+madduck(group2_intl)"  };
-  xkb_geometry  { include "thinkpad(us)"        };
-};

diff --git a/.xkb/symbols/madduck b/.xkb/symbols/madduck
index ddfef83c810930e13f8f4bf0f707cec27c7bd2ee..e6facf3101a05421979c50060ac834a1a261c437 100644 (file)
--- a/.xkb/symbols/madduck
+++ b/.xkb/symbols/madduck
@@ -1,23 +1,18 @@
 // mode_switch: set up windows keys for mode switching and the menu keys
 // mode_switch: set up windows keys for mode switching and the menu keys

-// to generate mod3
+// 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 "mode_switch" {
   include "group(win_switch)"
 partial modifier_keys
 xkb_symbols "mode_switch" {
   include "group(win_switch)"

+  include "group(switch)"

   replace key <MENU> {
     [ VoidSymbol, VoidSymbol ]
   };
   replace key <MENU> {
     [ 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> {
     [ VoidSymbol, VoidSymbol ]
   };
   modifier_map Mod3 { <RCTL> };
   replace key <RCTL> {
     [ VoidSymbol, VoidSymbol ]
   };
   modifier_map Mod3 { <RCTL> };

+  modifier_map Mod3 { <MENU> };

 };
 
 // caps_mod4: make capslock generate the mod4 modifier
 };
 
 // caps_mod4: make capslock generate the mod4 modifier