added group(shift_caps_switch), b.fd.o#15383

diff --git a/ChangeLog b/ChangeLog
index 0550fef..c6be12a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-07  Sergey Udaltsov
+
+       * symbols/group, rules/base.xml.in, rules/base.o_s.part: added
+       group(shift_caps_switch)
+       http://bugs.freedesktop.org/show_bug.cgi?id=15383
+
 2008-04-01  Sergey Udaltsov
 
        * rules/base.xml.in, symbols/gb: added gb(colemak),

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 423f494..a670ed3 100644 (file)
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -20,6 +20,7 @@
   grp:lctrl_lshift_toggle      =       +group(lctrl_lshift_toggle)
   grp:caps_toggle      =       +group(caps_toggle)
   grp:shift_caps_toggle        =       +group(shift_caps_toggle)
+  grp:shift_caps_switch        =       +group(shift_caps_switch)
   grp:alt_caps_toggle   =       +group(alt_caps_toggle)
   grp:ctrl_alt_toggle  =       +group(ctrl_alt_toggle)
   grp:alt_shift_toggle =       +group(alt_shift_toggle)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 8653a87..33d2420 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3763,6 +3763,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:alt_caps_toggle</name>
           <_description>Alt+CapsLock changes layout.</_description>
         </configItem>

diff --git a/symbols/group b/symbols/group
index a52473e..53c046e 100644 (file)
--- a/symbols/group
+++ b/symbols/group
@@ -141,6 +141,14 @@ xkb_symbols "shift_caps_toggle" {
     key        <CAPS> {        [  Caps_Lock,           ISO_Next_Group  ]       };
 };
 
+// using the group(shift_caps_switch) map, pressing:
+// Caps Lock selects the first group
+// Shift+Caps Lock selects the last group
+partial modifier_keys
+xkb_symbols "shift_caps_switch" {
+    key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
+};
+
 // using the group(ctrl_alt_toggle) map, pressing:
 //     Control_L+Alt_L locks the previous group
 //     Control_R+Alt_R locks the next group