From 085bf505447f79db478e369229bceacdbd317a85 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Sat, 18 Apr 2009 14:47:41 +0200
Subject: [PATCH] make thinkpad_switch an option and always set mode_switch

---
 .xkb/rules/evdev     | 3 ++-
 .xkb/symbols/madduck | 4 ++--
 .xsession.d/01-xkb   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.xkb/rules/evdev b/.xkb/rules/evdev
index c920bda..24fefc5 100644
--- a/.xkb/rules/evdev
+++ b/.xkb/rules/evdev
@@ -763,7 +763,7 @@
 
 ! model		=	symbols
   thinkpad	=       +inet(evdev)+madduck(thinkpad_switch)
-  *     	=       +inet(evdev)+madduck(default_switch)
+  *     	=       +inet(evdev)
 
 ! 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)
+  madduck:mode_switch	=	+madduck(mode_switch)
   madduck:caps_mod4	=	+madduck(caps_mod4)
   madduck:group2_intl	=	+madduck(group2_intl)
 
diff --git a/.xkb/symbols/madduck b/.xkb/symbols/madduck
index b18628f..174a1c3 100644
--- 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
-xkb_symbols "default_switch" {
+xkb_symbols "mode_switch" {
   include "group(win_switch)"
   replace key <MENU> {
     [ Super_L, Super_R ]
diff --git a/.xsession.d/01-xkb b/.xsession.d/01-xkb
index 1569982..0e50c36 100644
--- a/.xsession.d/01-xkb
+++ b/.xsession.d/01-xkb
@@ -1,7 +1,7 @@
 # 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
-- 
2.39.5