X-Git-Url: https://git.madduck.net/etc/xsession.git/blobdiff_plain/085bf505447f79db478e369229bceacdbd317a85..refs/heads/master:/.xkb/symbols/madduck?ds=inline

diff --git a/.xkb/symbols/madduck b/.xkb/symbols/madduck
index 174a1c3..ef781b3 100644
--- a/.xkb/symbols/madduck
+++ b/.xkb/symbols/madduck
@@ -1,30 +1,25 @@
-// mode_switch: set up windows keys for mode switching and the menu keys
-// to generate mod3
+// default_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 "mode_switch" {
+xkb_symbols "default_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> };
 };
@@ -35,8 +30,11 @@ xkb_symbols "group2_intl" {
   key <TLDE> {
     symbols[Group2] = [ degree, infinity ]
   };
+  key <AE00> {
+    symbols[Group2] = [ degree, infinity ]
+  };
   key <AE01> {
-    symbols[Group2] = [ onequarter, oneeighth ]
+    symbols[Group2] = [ onesuperior, onequarter ]
   };
   key <AE02> {
     symbols[Group2] = [ twosuperior, onehalf ]
@@ -74,6 +72,9 @@ xkb_symbols "group2_intl" {
   key <BKSP> {
     symbols[Group2] = [ BackSpace, BackSpace ]
   };
+  key <SPCE> {
+    symbols[Group2] = [ nobreakspace, nobreakspace ]
+  };
   key <TAB> {
     symbols[Group2] = [ Tab, Tab ]
   };
@@ -174,7 +175,7 @@ xkb_symbols "group2_intl" {
     symbols[Group2] = [ mu, heart ]
   };
   key <AB08> {
-    symbols[Group2] = [ notsign, guillemotleft ]
+    symbols[Group2] = [ periodcentered, guillemotleft ]
   };
   key <AB09> {
     symbols[Group2] = [ ellipsis, guillemotright ]