make thinkpad_switch an option and always set mode_switch

diff --git a/.xkb/rules/evdev b/.xkb/rules/evdev
index c920bdae34ad064838dfccade57d1cd7931e17c0..24fefc5a4205ed0402bb1caa6e5c95b27462cf22 100644 (file)
--- a/.xkb/rules/evdev
+++ b/.xkb/rules/evdev
@@ -763,7 +763,7 @@
 
 ! model                =       symbols
   thinkpad     =       +inet(evdev)+madduck(thinkpad_switch)
 
 ! model                =       symbols
   thinkpad     =       +inet(evdev)+madduck(thinkpad_switch)

-  *            =       +inet(evdev)+madduck(default_switch)
+  *            =       +inet(evdev)

 
 ! model                layout          =       compat
   pc98         nec_vndr/jp     =       pc98(basic)
 
 ! model                layout          =       compat
   pc98         nec_vndr/jp     =       pc98(basic)


@@ -901,6 +901,7 @@
   shift:breaks_caps     =      +shift(breaks_caps)
   esperanto:qwerty      =      +epo(qwerty)
   esperanto:dvorak      =      +epo(dvorak)
   shift:breaks_caps     =      +shift(breaks_caps)
   esperanto:qwerty      =      +epo(qwerty)
   esperanto:dvorak      =      +epo(dvorak)

+  madduck:mode_switch  =       +madduck(mode_switch)

   madduck:caps_mod4    =       +madduck(caps_mod4)
   madduck:group2_intl  =       +madduck(group2_intl)
 
   madduck:caps_mod4    =       +madduck(caps_mod4)
   madduck:group2_intl  =       +madduck(group2_intl)
 

diff --git a/.xkb/symbols/madduck b/.xkb/symbols/madduck
index b18628f185280e9a3ce97ddf720a2e314dab81eb..174a1c3b4bb6ad1aad4d3f0f73b8c9e09d53e932 100644 (file)
--- a/.xkb/symbols/madduck
+++ b/.xkb/symbols/madduck
@@ -1,7 +1,7 @@
-// default_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
 partial modifier_keys
 // to generate mod3
 partial modifier_keys

-xkb_symbols "default_switch" {
+xkb_symbols "mode_switch" {

   include "group(win_switch)"
   replace key <MENU> {
     [ Super_L, Super_R ]
   include "group(win_switch)"
   replace key <MENU> {
     [ Super_L, Super_R ]

diff --git a/.xsession.d/01-xkb b/.xsession.d/01-xkb
index 1569982fd7e2892f47f5f5146518c38dac288d85..0e50c36826887ae5980c95d2befeb5391ae51c79 100644 (file)
--- a/.xsession.d/01-xkb
+++ b/.xsession.d/01-xkb
@@ -1,7 +1,7 @@
 # load the keyboard definitions
 
 LAYOUT=us
 # load the keyboard definitions
 
 LAYOUT=us

-OPTS=(madduck:group2_intl madduck:caps_mod4)
+OPTS=(madduck:mode_switch madduck:group2_intl madduck:caps_mod4)

 
 is_thinkpad() {
   case "${(%):-%m}" in
 
 is_thinkpad() {
   case "${(%):-%m}" in