diff options
author | Sergey V. Udaltsov <svu@gnome.org> | 2011-10-16 21:36:48 +0100 |
---|---|---|
committer | Sergey V. Udaltsov <svu@gnome.org> | 2011-10-16 21:36:48 +0100 |
commit | 566b887f8ecfda0719d445298ea8499bf53b4442 (patch) | |
tree | 992f7bdccf11e5eae36f3d35d34643568e439adc /types | |
parent | d7a239e3a0a2af299b746bc478653e573d172699 (diff) | |
download | xkeyboard-config-566b887f8ecfda0719d445298ea8499bf53b4442.tar.gz |
Fix "mac style" numpad
https://bugs.freedesktop.org/show_bug.cgi?id=41607
Diffstat (limited to 'types')
-rw-r--r-- | types/extra | 22 | ||||
-rw-r--r-- | types/numpad | 10 |
2 files changed, 3 insertions, 29 deletions
diff --git a/types/extra b/types/extra index 32908a2..465796b 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 03db4e5..7888d7d 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" { |