Fix "mac style" numpad

https://bugs.freedesktop.org/show_bug.cgi?id=41607

4 files changed, 5 insertions, 31 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6814a6b7..c74c894a 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -6209,7 +6209,7 @@
       <option>
         <configItem>
           <name>numpad:mac</name>
-          <_description>Numeric keypad keys work as with Macintosh</_description>
+          <_description>Numeric keypad keys always enter digits</_description>
         </configItem>
       </option>
       <option>
diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
index d66a776c..551eabc3 100644
--- a/symbols/macintosh_vndr/apple
+++ b/symbols/macintosh_vndr/apple
@@ -68,7 +68,7 @@ xkb_symbols "alukbd" {
     key <FK19> { [ F19 ] };
 
     // On aluminium keyboards, Num_Lock is replace by Clear
-    replace key <NMLK> { [ XF86Clear ] };
+    replace key <NMLK> { [ Clear ] };
     // CAPS key is always Caps_Lock, even for JIS keyboards
     replace key <CAPS> { [ Caps_Lock ] };
 
diff --git a/types/extra b/types/extra
index 32908a27..465796b5 100644
--- a/types/extra
+++ b/types/extra
@@ -159,25 +159,3 @@ partial xkb_types "keypad" {
 	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";
-    };       
-};
diff --git a/types/numpad b/types/numpad
index 03db4e58..7888d7db 100644
--- a/types/numpad
+++ b/types/numpad
@@ -14,15 +14,11 @@ partial default xkb_types "pc" {
 // On Mac keypads, level 1 and 2 are swapped
 partial xkb_types "mac" {
     type "KEYPAD" {
-	modifiers = Shift+NumLock;
+	modifiers = None;
 	map[None] = Level2;
-	map[Shift] = Level1;
-	map[NumLock] = Level1;
-	map[Shift+NumLock] = Level2;
-	level_name[Level2] = "Base";
-	level_name[Level1] = "Number";
+	level_name[Level2] = "Number";
     };
-    include "extra(mac_keypad)"
+    include "extra(keypad)"
 };
 
 partial xkb_types "microsoft" {