summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2009-08-20 22:22:58 +0100
committerSergey V. Udaltsov <svu@gnome.org>2009-08-20 22:22:58 +0100
commit3e6a7a495a4f7ceb8c2dd505003f02c893c18975 (patch)
treeb351662b0ca10cad122716fe9736db2e3ddd9abd
parent8ef2278202f4262f78163ecd8913b1280daa7bd8 (diff)
added caps:numlock
http://bugs.freedesktop.org/show_bug.cgi?id=23323
-rw-r--r--ChangeLog6
-rw-r--r--rules/base.o_s.part1
-rw-r--r--rules/base.xml.in6
-rw-r--r--symbols/capslock5
4 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 303a0e85..8a94e4ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+2009-08-20 Sergey Udaltsov
+
+ * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+ caps:numlock, http://bugs.freedesktop.org/show_bug.cgi?id=23323
+
2009-08-18 Peter Hutterer
+
* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
caps:hyper, http://bugs.freedesktop.org/show_bug.cgi?id=23356
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 0a7d8f0e..f9290dae 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -49,6 +49,7 @@
lv3:rwin_switch = +level3(rwin_switch)
lv3:enter_switch = +level3(enter_switch)
caps:capslock = +capslock(capslock)
+ caps:numlock = +capslock(numlock)
caps:shiftlock = +capslock(shiftlock)
caps:swapescape = +capslock(swapescape)
caps:escape = +capslock(escape)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index fd158f2a..823e98b6 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4805,6 +4805,12 @@
</option>
<option>
<configItem>
+ <name>caps:numlock</name>
+ <_description>Make CapsLock an additional NumLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>caps:swapescape</name>
<_description>Swap ESC and CapsLock</_description>
</configItem>
diff --git a/symbols/capslock b/symbols/capslock
index febc7088..415e4db1 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -58,3 +58,8 @@ xkb_symbols "none" {
key <CAPS> { [ VoidSymbol ] };
};
+partial hidden modifier_keys
+xkb_symbols "numlock" {
+ key <CAPS> { [ Num_Lock ] };
+};
+