From: martin f. krafft Date: Wed, 6 Jan 2010 03:49:27 +0000 (+1300) Subject: remove special thinkpad handling, unify the two setups X-Git-Url: https://git.madduck.net/etc/xsession.git/commitdiff_plain/e577e48fa79805f2637aabe250bd8bf4548b9308?hp=f433a87905bb289b15f19244722cbb0e104c6fdf 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 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 ddfef83..e6facf3 100644 --- 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 -// 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)" + include "group(switch)" replace key { [ VoidSymbol, VoidSymbol ] }; - modifier_map Mod3 { }; -}; - -// 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 { [ VoidSymbol, VoidSymbol ] }; modifier_map Mod3 { }; + modifier_map Mod3 { }; }; // caps_mod4: make capslock generate the mod4 modifier