Attachment 52362 Details for Bug 41607 – Make numpad(mac) always enter Level2, regardless of NumLock and other modifiers

[patch] Make numpad(mac) always enter Level2, regardless of NumLock and other modifiers

mac.diff (text/plain), 1.94 KB, created by Rimas Kudelis on 2011-10-15 05:09:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rimas Kudelis

Created: 2011-10-15 05:09:04 UTC

Size: 1.94 KB

patch

obsolete

>diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
>index d66a776..551eabc 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 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" {

Actions: View | Splinter Review

Attachments on bug 41607: 52362

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.