From 2ad76598e60c3faed42a605ea12eb49021c9abc2 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Thu, 27 Dec 2007 22:47:03 +0000
Subject: [PATCH] add xkb option caps:swapescape, b.fd.o#13824

---
 ChangeLog           | 6 ++++++
 rules/base.o_s.part | 1 +
 rules/base.xml.in   | 6 ++++++
 symbols/capslock    | 5 +++++
 4 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3a23cd1..5bef3a7 100644
--- 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
--- 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
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3944,6 +3944,12 @@
           <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>caps:shiftlock</name>
diff --git a/symbols/capslock b/symbols/capslock
index e6618d0..959e265 100644
--- 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    ]       };
+};
-- 
2.32.0.93.g670b81a890