add xkb option caps:swapescape, b.fd.o#13824

diff --git a/ChangeLog b/ChangeLog
index 3a23cd1..5bef3a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-27  Sergey Udaltsov
+
+       * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb
+       option caps:swapescape,
+       https://bugs.freedesktop.org/show_bug.cgi?id=13824
+
 2007-12-26  Sergey Udaltsov
 
        * symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 49de74a..67b984c 100644 (file)
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -44,6 +44,7 @@
   caps:capslock                =       +capslock(capslock)
   caps:shiftlock       =       +capslock(shiftlock)
   caps:grouplock       =       +capslock(grouplock)
+  caps:swapescape      =       +capslock(swapescape)
   ctrl:nocaps          =       +ctrl(nocaps)
   ctrl:swapcaps                =       +ctrl(swapcaps)
   ctrl:ctrl_ac         =       +ctrl(ctrl_ac)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 85de03a..6edd8a9 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3946,6 +3946,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:shiftlock</name>
           <_description>CapsLock toggles Shift so all keys are affected.</_description>
         </configItem>

diff --git a/symbols/capslock b/symbols/capslock
index e6618d0..959e265 100644 (file)
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -17,3 +17,8 @@ xkb_symbols "grouplock" {
     key <CAPS> {       [       ISO_Next_Group, Caps_Lock       ]       };
 };
 
+partial hidden modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [     Caps_Lock    ]       };
+};