added grp:rctrl_rshift_toggle option

http://bugs.freedesktop.org/show_bug.cgi?id=24234

diff --git a/ChangeLog b/ChangeLog
index 5fe3041..6d3d98c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-30 Sergey Udaltsov
+
+       * rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+       grp:rctrl_rshift_toggle option,
+       http://bugs.freedesktop.org/show_bug.cgi?id=24234
+
 2009-09-29 Sergey Udaltsov
 
        * configure.in, NEWS, po/*.po: preparing 1.7

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index f9290da..b7a2de4 100644 (file)
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -18,6 +18,7 @@
   grp:alts_toggle      =       +group(alts_toggle)
   grp:ctrl_shift_toggle        =       +group(ctrl_shift_toggle)
   grp:lctrl_lshift_toggle      =       +group(lctrl_lshift_toggle)
+  grp:rctrl_rshift_toggle      =       +group(rctrl_rshift_toggle)
   grp:caps_toggle      =       +capslock(grouplock)
   grp:caps_switch       =       +capslock(groupshift)
   grp:shift_caps_toggle        =       +group(shift_caps_toggle)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index f43e651..98130bb 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4444,6 +4444,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:rctrl_rshift_toggle</name>
+          <_description>Right Ctrl+Right Shift</_description>
+        </configItem>
+      </option>      
+      <option>
+        <configItem>
           <name>grp:ctrl_alt_toggle</name>
           <_description>Alt+Ctrl</_description>
         </configItem>

diff --git a/symbols/group b/symbols/group
index 1b23e31..08b31a1 100644 (file)
--- a/symbols/group
+++ b/symbols/group
@@ -120,6 +120,19 @@ xkb_symbols "lctrl_lshift_toggle" {
     key <LCTL> {       [       Control_L,      ISO_Next_Group ]        };
 };
 
+// using the group(rctrl_rshift_toggle) map, pressing:
+//     Control_R+Shift_R locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys
+xkb_symbols "rctrl_rshift_toggle" {
+    key <RTSH> {
+    type[Group1]="PC_CONTROL_LEVEL2",
+    symbols[Group1]= [ Shift_R, ISO_Next_Group ]
+    };
+    key <RCTL>  {   [   Control_R,  ISO_Next_Group ]    };
+};
+
 // using the group(shift_caps_toggle) map, pressing:
 //     Shift+Caps Lock toggles group
 partial modifier_keys