summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--rules/base.o_s.part1
-rw-r--r--rules/base.xml.in6
-rw-r--r--symbols/capslock5
4 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a9d020f..8d8ad35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-14 Sergey Udaltsov
+
+ * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+ caps:none option, http://bugs.freedesktop.org/show_bug.cgi?id=23243
+
2009-08-04 Sergey Udaltsov
* geometry/Makefile.am, rules/base.lists.part, rules/base.m_g.part,
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 175a214..82c9962 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -54,6 +54,7 @@
caps:escape = +capslock(escape)
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
+ caps:none = +capslock(none)
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 f0c9d50..e5e498b 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4827,6 +4827,12 @@
<_description>CapsLock toggles Shift so all keys are affected</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>caps:none</name>
+ <_description>CapsLock is disabled</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
diff --git a/symbols/capslock b/symbols/capslock
index 9a2307e..00b16c3 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -47,3 +47,8 @@ xkb_symbols "super" {
modifier_map Mod4 { <CAPS> };
};
+partial hidden modifier_keys
+xkb_symbols "none" {
+ key <CAPS> { [ VoidSymbol ] };
+};
+