madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

remove special thinkpad handling, unify the two setups
authormartin f. krafft <madduck@madduck.net>
Wed, 6 Jan 2010 03:49:27 +0000 (16:49 +1300)
committermartin f. krafft <madduck@madduck.net>
Wed, 6 Jan 2010 03:49:27 +0000 (16:49 +1300)
.xkb/keymap/lapse.rw.madduck.net [deleted file]
.xkb/symbols/madduck

diff --git a/.xkb/keymap/lapse.rw.madduck.net b/.xkb/keymap/lapse.rw.madduck.net
deleted file mode 100644 (file)
index 0dd9aab..0000000
+++ /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)"        };
-};
index ddfef83..e6facf3 100644 (file)
@@ -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