diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | rules/base.lists.part | 2 | ||||
| -rw-r--r-- | rules/base.m_s.part | 2 | ||||
| -rw-r--r-- | symbols/inet | 12 | ||||
| -rw-r--r-- | symbols/level3 | 24 |
5 files changed, 22 insertions, 22 deletions
@@ -1,5 +1,9 @@ 2006-09-18 Sergey Udaltsov + * rules/base.lists.part, rules/base.m_s.part, symbols/inet, + symbols/level3: lv3:enter_switch added, closing + https://bugs.freedesktop.org/show_bug.cgi?id=8324 + * symbols/ara: added ara(buckwalter), closing https://bugs.freedesktop.org/show_bug.cgi?id=8198 diff --git a/rules/base.lists.part b/rules/base.lists.part index abcd4be7..471885fa 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -26,7 +26,7 @@ ! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \ acer_c300 acer_ferrari4k acer_tm_800 \ acpi airkey armada azonaRF2300 \ - apple apple_laptop \ + apple \ brother \ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \ cherryblue cherrybluea cherryblueb cherrycyboard \ diff --git a/rules/base.m_s.part b/rules/base.m_s.part index a4e797c8..a2172ca1 100644 --- a/rules/base.m_s.part +++ b/rules/base.m_s.part @@ -1,3 +1,3 @@ $inetkbds = +inet(%m) - $maclaptop = +inet(apple_laptop) + $maclaptop = +inet(apple)+level3(enter_switch) $macs = +inet(apple) diff --git a/symbols/inet b/symbols/inet index ec3f37ab..cad572f2 100644 --- a/symbols/inet +++ b/symbols/inet @@ -2199,18 +2199,6 @@ partial xkb_symbols "apple" { key <KPEQ> { [ KP_Equal ] }; }; -partial modifier_keys -xkb_symbols "apple_laptop" { - include "inet(apple)" - - // These keyboards only generate a <RALT> when pressing fn+Alt. This makes - // it impossible to get to the third shift level on keys that are on - // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch, - // and use fn+Enter (Apple's code for Menu) for KP_Enter. - replace key <KPEN> { [ ISO_Level3_Shift ] }; - modifier_map Mod2 { ISO_Level3_Shift }; -}; - partial alphanumeric_keys xkb_symbols "cymotionlinux" { key <RWIN> { [ at ] }; diff --git a/symbols/level3 b/symbols/level3 index 27801683..e101ba40 100644 --- a/symbols/level3 +++ b/symbols/level3 @@ -80,20 +80,16 @@ xkb_symbols "menu_switch" { modifier_map Mod5 { ISO_Level3_Shift }; }; -// using the level(win_switch) map, the either Windows' logo key -// temporarily chooses the third shift level. If you use this map, -// you should define your keyboard as pc101 or pc102 instead of pc104 -// or pc105. +// using the level3(win_switch) map, the either Windows' logo key +// temporarily chooses the third shift level. partial modifier_keys xkb_symbols "win_switch" { include "level3(lwin_switch)" include "level3(rwin_switch)" }; -// using the level(lwin_switch) map, the left Windows' logo key -// temporarily chooses the third shift level. If you use this map, -// you should define your keyboard as pc101 or pc102 instead of pc104 -// or pc105. +// using the level3(lwin_switch) map, the left Windows' logo key +// temporarily chooses the third shift level. partial modifier_keys xkb_symbols "lwin_switch" { key <LWIN> { @@ -115,3 +111,15 @@ xkb_symbols "rwin_switch" { }; modifier_map Mod5 { ISO_Level3_Shift }; }; + +// using the level3(enter_switch) map, the Enter key on the keypad +// temporarily chooses the third shift level. This is especially +// useful for Mac laptops which miss the right Alt key. +partial hidden modifier_keys +xkb_symbols "enter_switch" { + key <KPEN> { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; |