added numpad:shift3 option, b.fd.o#17110

4 files changed, 42 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 782c272..672c81d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	http://bugs.freedesktop.org/show_bug.cgi?id=17855
 	* rules/base.xml.in, symbols/tj: added 2 new variants, std and legacy,
 	http://bugs.freedesktop.org/show_bug.cgi?id=17975
+	* rules/base.o_t.part, rules/base.xml.in, types/numpad: added
+	numpad(shift3) option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17110
 
 2008-10-03  Sergey Udaltsov
 
diff --git a/rules/base.o_t.part b/rules/base.o_t.part
index 440f9ef..e0d4b15 100644
--- a/rules/base.o_t.part
+++ b/rules/base.o_t.part
@@ -5,3 +5,4 @@
   numpad:pc			=	+numpad(pc)
   numpad:mac			=	+numpad(mac)
   numpad:microsoft		=	+numpad(microsoft)
+  numpad:shift3       		=	+numpad(shift3)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5b12f9f..99cae06 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4607,6 +4607,12 @@ i       </variant>
       </option>
       <option>
         <configItem>
+          <name>numpad:shift3</name>
+          <_description>Shift does not cancel NumLock, gives third level instead</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>srvrkeys:none</name>
           <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
         </configItem>
diff --git a/types/numpad b/types/numpad
index 335e20b..cb863b3 100644
--- a/types/numpad
+++ b/types/numpad
@@ -38,3 +38,35 @@ partial xkb_types "microsoft" {
     include "extra(keypad)"
 };
 
+// Swiss-German style numeric keypad: Shift and NumLock operates as
+// two independent modifiers; however, since we want shift state for
+// the cursor keys, only three levels are used from the key mappings.
+// Closest type is actually FOUR_LEVEL_X, but most numpad layouts uses
+// FOUR_LEVEL_MIXED_KEYPAD so that's the one we are going to override.
+partial xkb_types "shift3" {
+    type "FOUR_LEVEL_MIXED_KEYPAD" {
+        modifiers = Shift+NumLock+Control+Alt;
+
+        // NumLock Off => navigate using cursor keys
+        map[None] = Level1;
+
+        // NumLock Off + Shift pressed => select using cursor keys
+        preserve[Shift] = Shift;
+
+        // NumLock On => decimal digits
+        map[NumLock] = Level2;
+
+        // NumLock On + Shift pressed => auxiliary symbols,
+        // e.g. hexadecimal digits
+        map[Shift+NumLock] = Level3;
+
+	// Ctrl + Alt, regardless of NumLock and Shift => command keys
+	map[Control+Alt] = Level4;
+
+	// reverse map from levels to modifiers
+       level_name[Level1] = "Base";
+       level_name[Level2] = "NumLock";
+       level_name[Level3] = "Shift+NumLock";
+	level_name[Level4] = "Ctrl+Alt";
+    };
+};