xkbdesc/types basic, 1.2, 1.3 complete, 1.3, 1.4 default, 1.4, 1.5 extra, 1.3, 1.4 numpad, 1.2, 1.3

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/types
In directory kemper:/tmp/cvs-serv14660/types

Modified Files:
	basic complete default extra numpad 
Log Message:
b.fd.o#8280,b.fd.o#8312

Index: basic
===================================================================
RCS file: /cvs/xlibs/xkbdesc/types/basic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- basic	13 Sep 2004 18:49:30 -0000	1.2
+++ basic	17 Sep 2006 20:26:16 -0000	1.3
@@ -28,13 +28,4 @@
         level_name[Level2] = "Caps";
     };
 
-    type "KEYPAD" {
-	modifiers = Shift+NumLock;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-    };
 };

Index: complete
===================================================================
RCS file: /cvs/xlibs/xkbdesc/types/complete,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- complete	17 Oct 2005 00:42:11 -0000	1.3
+++ complete	17 Sep 2006 20:26:16 -0000	1.4
@@ -8,6 +8,7 @@
 
 default xkb_types "complete" {
     include "basic"
+    include "numpad"
     include "mousekeys"
     include "pc"
     include "iso9995"

Index: default
===================================================================
RCS file: /cvs/xlibs/xkbdesc/types/default,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- default	17 Oct 2005 00:42:11 -0000	1.4
+++ default	17 Sep 2006 20:26:16 -0000	1.5
@@ -3,6 +3,7 @@
 
 default xkb_types "default" {
     include "basic"
+    include "numpad"
     include "pc"
     include "iso9995"
     include "extra"

Index: extra
===================================================================
RCS file: /cvs/xlibs/xkbdesc/types/extra,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- extra	16 Oct 2005 01:25:18 -0000	1.3
+++ extra	17 Sep 2006 20:26:16 -0000	1.4
@@ -51,23 +51,6 @@
 	level_name[Level4] = "Shift Alt";
     };
 
-    // This enables the four level shifting also for the keypad.
-    type "FOUR_LEVEL_KEYPAD" {
-	modifiers = Shift+NumLock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[NumLock+LevelThree] = Level4;
-	map[Shift+NumLock+LevelThree] = Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Alt Number";
-    };       
-
 // Special type for keys used in Serbian Latin Unicode map
 // It makes it possible to use all three forms of latin letters 
 // present in Unicode that are made up of two separate letters 
@@ -91,3 +74,45 @@
     };
 };
 
+// This enables the four level shifting also for the keypad.
+partial xkb_types "keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[NumLock] = Level2;
+	map[Shift+NumLock] = Level1;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[NumLock+LevelThree] = Level4;
+	map[Shift+NumLock+LevelThree] = Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Alt Number";
+    };       
+};
+
+// This enables the four level shifting also for the keypad,
+// but levels 1 and 2, and 3 and 4 are swapped on Mac keypads.
+partial xkb_types "mac_keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	map[LevelThree] = Level4;
+	map[Shift+LevelThree] = Level3;
+	map[NumLock+LevelThree] = Level3;
+	map[Shift+NumLock+LevelThree] = Level4;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+	level_name[Level4] = "Alt Base";
+	level_name[Level3] = "Alt Number";
+    };       
+};

Index: numpad
===================================================================
RCS file: /cvs/xlibs/xkbdesc/types/numpad,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- numpad	13 Sep 2004 18:49:30 -0000	1.2
+++ numpad	17 Sep 2006 20:26:16 -0000	1.3
@@ -1,6 +1,33 @@
 
-xkb_types "microsoft" {
+default
+xkb_types "pc" {
+    type "KEYPAD" {
+	modifiers = Shift+NumLock;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[NumLock] = Level2;
+	map[Shift+NumLock] = Level1;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+    };
+    include "extra(keypad)"
+};
 
+// On Mac keypads, level 1 and 2 are swapped
+xkb_types "mac" {
+    type "KEYPAD" {
+	modifiers = Shift+NumLock;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+    };
+    include "extra(mac_keypad)"
+};
+
+xkb_types "microsoft" {
     type "KEYPAD" {
         modifiers = Shift+NumLock;
         map[None] = Level1;
@@ -9,4 +36,6 @@
         level_name[Level1] = "Base";
         level_name[Level2] = "Number";
     };
+    include "extra(keypad)"
 };
+