From 4780501922e725910dd7b9544bddb1931dac7beb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 Feb 2024 14:21:59 +1000 Subject: Purge the old macs from our rules See the previous commits, none of these machines need the latest xkeyboard-config. --- geometry/macintosh | 179 ---------------------------------------------- keycodes/macintosh | 156 ---------------------------------------- rules/0001-lists.part | 2 - rules/0004-base.m_k.part | 3 - rules/0009-m_g.part | 1 - rules/0013-ml_s.part | 7 -- rules/0015-ml1_s.part | 4 -- rules/0026-base.m_s.part | 2 - rules/0035-m_t.part | 1 - rules/base.xml | 21 ------ symbols/macintosh_vndr/us | 73 ------------------- 11 files changed, 449 deletions(-) diff --git a/geometry/macintosh b/geometry/macintosh index eb356440..baab1d66 100644 --- a/geometry/macintosh +++ b/geometry/macintosh @@ -1,182 +1,3 @@ -// -// Some modifications () : -// - Added a key -// - Fixed the shape of the key -// - Moved to the 'AC' row -// - Added a special Macintosh sysctl key -// - Minor changes (Function keys shape, LED position...) - -// Minor changes -// - Mail address above is no longer valid -// - Changed {L,R}MTA to {L,R}WIN, which are defined -// 2005/10 -- Simon Vallet - -default xkb_geometry "macintosh" { - - description= "Apple Extended Keyboard II"; - width = 475; - height = 194; - - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } }; - shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } }; - shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } }; - shape "TAB" { { [ 33,18] }, { [2,1], [ 31,17] } }; - shape "RTRN" { - { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, - { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } }; - shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } }; - shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "LALT" { { [ 22,18] }, { [2,1], [ 20,17] } }; - shape "LMTA" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "RCTL" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "RALT" { { [ 22,18] }, { [2,1], [ 20,17] } }; - shape "RMTA" { { [ 28,18] }, { [2,1], [ 26,17] } }; - shape "RTSH" { { [ 47,18] }, { [2,1], [ 45,17] } }; - shape "SPCE" { { [123,18] }, { [2,1], [121,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [ 35,17] } }; - shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } }; - // Macintosh keyboards have a special sysctl key at the top right - shape "AAPL" { - { [ 0,0], [ 18,0], [ 18,18], [ 0,18] }, - { [ 1,1], [ 17,1], [ 17,17], [ 1,17] }, - { [ 8,5], [ 8,12], [ 2,9] } }; - - shape "LEDS" { cornerRadius = 0, { [ 55,19] } }; - shape "LED" { cornerRadius = 0, { [ 8, 2] } }; - - solid "LedPanel" { - shape= "LEDS"; - top = 48; - left = 378; - }; - - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top = 50; - indicator.shape= "LED"; - indicator "NumLock" { left = 381; }; - indicator "CapsLock" { left = 398; }; - indicator "ScrollLock" { left = 415; }; - text.top= 55; - text.color= "black"; - text "NumLockLabel" { left = 381; text = "Num\nLock"; }; - text "CapsLockLabel" { left = 398; text = "Caps\nLock"; }; - text "ScrollLockLabel" { left = 415; text = "Scroll\nLock"; }; - - section.left= 19; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Function" { - top = 48; - row { - top= 1; - keys { , - { , 20 }, , , , - { , 11 }, , , , - { , 11 }, , , , - { , 10 }, , , - // This is the sysctl key on macintosh keyboards - // keycode is 222 with a 4.21 kernel, which is - { , "AAPL", 67 } - }; - }; - }; // End of "Function" section - - section "Alpha" { - top = 87; - row { - top= 1; - keys { { , "TLDE" }, , , , - , , , , , , - , , , { , "BKSP" } - }; - }; - row { - top= 20; - keys { { , "TAB" }, , , , - , , , , , , - , , , { , "RTRN" } - }; - }; - row { - top= 39; - keys { { , "CAPS" }, , , , - , , , , , , - , , - }; - }; - row { - top= 58; - keys { { , "LFSH" }, , , , - , , , , , , - , , { , "RTSH" } - }; - }; - row { - top= 77; - keys { { , "LCTL" }, { , "LALT" }, - { , "LMTA" }, - { , "SPCE" }, - { , "RMTA" }, - { , "RALT" }, { , "RCTL" } - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top = 87; - left = 314; - row { - top= 1; - keys { , , }; - }; - row { - top= 20; - keys { , , }; - }; - row { - top= 58; - left= 20; - keys { }; - }; - row { - top= 77; - keys { , , }; - }; - }; // End of "Editing" section - - section "Keypad" { - top = 87; - left = 380; - row { - top= 1; - keys { , , , }; - }; - row { - top= 20; - keys { , , , }; - }; - row { - top= 39; - keys { , , , }; - }; - row { - top= 58; - keys { , , , { , "KPEN" } }; - }; - row { - top= 77; - keys { { , "KP0" }, }; - }; - }; // End of "Keypad" section - -}; // End of "default" geometry - - // This section describes the geometry of the "Apple Pro" keyboard // included with NewWorld desktop machines // diff --git a/keycodes/macintosh b/keycodes/macintosh index 12d0e866..ed4ce5ed 100644 --- a/keycodes/macintosh +++ b/keycodes/macintosh @@ -26,162 +26,6 @@ //from the X Consortium. // // -default xkb_keycodes "macintosh" { - include "xfree86" - - = 182; - = 183; - = 184; - = 157; - -}; - -xkb_keycodes "old" { - - minimum= 8; - maximum= 255; - - = 61; - = 58; - = 26; - = 27; - = 28; - = 29; - = 31; - = 30; - = 34; - = 36; - = 33; - = 37; - = 35; - = 32; - = 59; - - = 56; - = 20; - = 21; - = 22; - = 23; - = 25; - = 24; - = 40; - = 42; - = 39; - = 43; - = 41; - = 38; - = 50; - - = 65; - = 8; - = 9; - = 10; - = 11; - = 13; - = 12; - = 46; - = 48; - = 45; - = 49; - = 47; - = 44; - - = 18; - = 14; - = 15; - = 16; - = 17; - = 19; - = 53; - = 54; - = 51; - = 55; - = 52; - - = 57; - - = 62; // Left Control - = 63; // Left Option - = 64; // Left Shift - = 66; // Left Command -// = 131; // Right Shift -// = 132; // Right Command -// = 133; // Right Control -// = 134; // Right Option - - = 130; - = 128; - = 107; - = 126; - = 104; - = 105; - = 106; - = 108; - = 109; - = 117; - = 111; - = 119; - - = 113; - = 115; - = 121; - - = 122; - = 123; - = 124; - = 125; - = 127; - = 129; - - = 70; - = 67; - = 69; - = 68; - - = 79; - = 89; - = 83; - = 75; - - = 97; - = 99; - = 100; - = 86; - - = 94; - = 95; - = 96; - = 77; - - = 91; - = 92; - = 93; - = 84; - - = 90; - = 73; - - indicator 3 = "Scroll Lock"; - indicator 2 = "Num Lock"; - indicator 1 = "Caps Lock"; - - alias = ; -}; - -xkb_keycodes "hhk" { - include "macintosh" - - = 51; - - = 49; - = 131; - = 129; - = 208; - - = 111; - = 78; - = 110; -}; // Aluminium Keyboards xkb_keycodes "alukbd" { diff --git a/rules/0001-lists.part b/rules/0001-lists.part index 4f22eaee..e3f4baef 100644 --- a/rules/0001-lists.part +++ b/rules/0001-lists.part @@ -20,9 +20,7 @@ // Country files that provide specializations for the OLPC: ! $olpclayouts = af am ara br ca es et fr in it kh kz mn ng np pk ru th tr us -! $maclaptop = ibook powerbook macbook78 macbook79 ! $applealu = applealu_ansi applealu_iso applealu_jis -! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79 ! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us diff --git a/rules/0004-base.m_k.part b/rules/0004-base.m_k.part index e779701b..81fb3e11 100644 --- a/rules/0004-base.m_k.part +++ b/rules/0004-base.m_k.part @@ -6,8 +6,5 @@ $sun = sun(type6_usb) pc98 = xfree98(pc98) $applealu = macintosh(alukbd) - macintosh_hhk = macintosh(hhk) - macintosh_old = macintosh(old) - $macs = macintosh thinkpadz60 = xfree86(thinkpadz60) * = xfree86 diff --git a/rules/0009-m_g.part b/rules/0009-m_g.part index a2172e95..00cb87ac 100644 --- a/rules/0009-m_g.part +++ b/rules/0009-m_g.part @@ -20,7 +20,6 @@ winbook = winbook(XP5) pc98 = nec(pc98) $applealu = macintosh(%m) - $macs = macintosh(macintosh) hhk = hhk(basic) kinesis = kinesis(model100) sun_type6_jp = sun(type6jp) diff --git a/rules/0013-ml_s.part b/rules/0013-ml_s.part index baefa8a7..e576d101 100644 --- a/rules/0013-ml_s.part +++ b/rules/0013-ml_s.part @@ -9,17 +9,10 @@ jollasbj * = jolla_vndr/sbj(common)+%l%(v) $sun $sun_custom = pc+sun_vndr/%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old en_US = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v) - macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 - macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2 applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2 $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) - $macs en_US = pc+macintosh_vndr/us(extended) - $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) olpcm $olpclayouts = olpc+%l%(m) diff --git a/rules/0015-ml1_s.part b/rules/0015-ml1_s.part index ab3b59e8..db5b62de 100644 --- a/rules/0015-ml1_s.part +++ b/rules/0015-ml1_s.part @@ -3,12 +3,8 @@ amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) jollasbj * = jolla_vndr/sbj(common)+%l[1]%(v[1]) $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1]) - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) - macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) - $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) diff --git a/rules/0026-base.m_s.part b/rules/0026-base.m_s.part index 9749814b..c8e481a2 100644 --- a/rules/0026-base.m_s.part +++ b/rules/0026-base.m_s.part @@ -45,8 +45,6 @@ trust_slimline = +inet(media_nav_acpi_common) vsonku306 = +inet(microsoftprooem) $inetkbds = +inet(%m) - $maclaptop = +inet(apple)+level3(enter_switch) $applealu = +inet(apple) - $macs = +inet(apple) sun_type7_jp_usb = +sun_vndr/solaris(defaults_type7jp) $sun = +sun_vndr/solaris(defaults) diff --git a/rules/0035-m_t.part b/rules/0035-m_t.part index 2d4aeb49..f1f97ec4 100644 --- a/rules/0035-m_t.part +++ b/rules/0035-m_t.part @@ -1,4 +1,3 @@ ! model = types - $macs = complete+numpad(mac) $applealu = complete+numpad(mac) * = complete diff --git a/rules/base.xml b/rules/base.xml index 848a3433..3785e412 100644 --- a/rules/base.xml +++ b/rules/base.xml @@ -542,13 +542,6 @@ Fujitsu - - - macintosh_hhk - Happy Hacking for Mac - Fujitsu - - hpi6 @@ -851,20 +844,6 @@ Logitech - - - macintosh - Macintosh - Apple - - - - - macintosh_old - Macintosh Old - Apple - - mx1998 diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us index 2cf938d1..ccd008e6 100644 --- a/symbols/macintosh_vndr/us +++ b/symbols/macintosh_vndr/us @@ -64,76 +64,3 @@ default xkb_symbols "extended" { key { [ equal ] }; }; - -hidden -xkb_symbols "oldmac" { - - include "macintosh_vndr/us(extended)" - - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ Print ] }; - key { [ Scroll_Lock ] }; - key { [ Pause ] }; - - key { [ Insert ] }; - key { [ Home ] }; - key { [ Prior ] }; - key { [ Delete ] }; - key { [ End ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - - key { [ BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - key { [ Caps_Lock ] }; - key { [ Num_Lock, Pointer_EnableKeys ] }; - - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Control_L ] }; - key { [ Control_R ] }; - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Super_L ] }; - key { [ Super_R ] }; - - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod2 { Num_Lock }; - - // Fake keys for virtual<->real modifier mappings: - key { [ ISO_Level3_Shift ] }; - modifier_map Mod5 { }; - - key { [ ISO_Level5_Shift ] }; - modifier_map Mod3 { }; - - key { [ NoSymbol, Alt_L ] }; - modifier_map Mod1 { , }; - - key { [ NoSymbol, Meta_L ] }; - modifier_map Mod1 { }; - - key { [ NoSymbol, Super_L ] }; - modifier_map Mod4 { }; - - key { [ NoSymbol, Hyper_L ] }; - modifier_map Mod4 { }; -}; -- cgit v1.2.3