added caps:numlock

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

diff --git a/ChangeLog b/ChangeLog
index 303a0e8..8a94e4a 100644 (file)
--- 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 0a7d8f0..f9290da 100644 (file)
--- 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 fd158f2..823e98b 100644 (file)
--- 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 febc708..415e4db 100644 (file)
--- 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  ]       };
+};
+