diff --git a/temp/xkeyboard-config/0001-re-nokia.patch b/temp/xkeyboard-config/0001-re-nokia.patch index c52d6ab12..f9f7ecc8b 100644 --- a/temp/xkeyboard-config/0001-re-nokia.patch +++ b/temp/xkeyboard-config/0001-re-nokia.patch @@ -1,29 +1,42 @@ -From 8e01047b4faf3ed4b1d5ff901d3fbeaa3259da41 Mon Sep 17 00:00:00 2001 +From 2b01300337208ea78223582fea744030ca7629a2 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Thu, 31 Jul 2025 00:18:52 +0200 -Subject: [PATCH] restore and update nokia configs +Subject: [PATCH] Restore and update Nokia device configs +These were dropped in !672 [0], but the devices are still relatively popular in +the Linux community. + +[0] https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/672 + +Signed-off-By: Sicelo A. Mhlongo --- - geometry/nokia | 53 + - rules/0010-lists.part | 3 + - rules/0090-model_geometry.part | 1 + - rules/0130-modellayout_symbols.part | 4 + - rules/0160-modellayout1_symbols.part | 2 + - rules/0180-modellayout2_symbols.part | 2 + - rules/0200-modellayout3_symbols.part | 2 + - rules/0220-modellayout4_symbols.part | 2 + - rules/0350-model_types.part | 1 + - symbols/nokia_vndr/nokiarx44 | 303 ++++++ - symbols/nokia_vndr/nokiarx51 | 1385 ++++++++++++++++++++++++++ - symbols/nokia_vndr/nokiasu8w | 490 +++++++++ - types/nokia | 15 + - 13 files changed, 2263 insertions(+) + changes/models/+restore-nokia.feature.md | 5 + + geometry/nokia | 53 + + rules/base.xml | 21 + + rules/rules.in | 13 + + symbols/nokia_vndr/nokiarx44 | 303 +++++ + symbols/nokia_vndr/nokiarx51 | 1385 ++++++++++++++++++++++ + symbols/nokia_vndr/nokiasu8w | 490 ++++++++ + types/nokia | 15 + + 8 files changed, 2285 insertions(+) + create mode 100644 changes/models/+restore-nokia.feature.md create mode 100644 geometry/nokia create mode 100644 symbols/nokia_vndr/nokiarx44 create mode 100644 symbols/nokia_vndr/nokiarx51 create mode 100644 symbols/nokia_vndr/nokiasu8w create mode 100644 types/nokia +diff --git a/changes/models/+restore-nokia.feature.md b/changes/models/+restore-nokia.feature.md +new file mode 100644 +index 00000000..6ebc5063 +--- /dev/null ++++ b/changes/models/+restore-nokia.feature.md +@@ -0,0 +1,5 @@ ++Restored configs for Nokia Internet Tablets (N900, N810) and SU-8W Bluetooth keyboard ++ ++Relevant discussion: [xkeyboard-config-672] ++ ++[xkeyboard-config-672] https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/672#note_2445614 diff --git a/geometry/nokia b/geometry/nokia new file mode 100644 index 00000000..2d0fd56c @@ -83,11 +96,43 @@ index 00000000..2d0fd56c + }; // End of "Keys" section + +}; // End of "nokiarx51" geometry -diff --git a/rules/0010-lists.part b/rules/0010-lists.part -index 2f55b528..1e97585c 100644 ---- a/rules/0010-lists.part -+++ b/rules/0010-lists.part -@@ -14,6 +14,9 @@ +diff --git a/rules/base.xml b/rules/base.xml +index 51140ca2..7cdd405e 100644 +--- a/rules/base.xml ++++ b/rules/base.xml +@@ -1012,6 +1012,27 @@ + NEC + + ++ ++ ++ nokiarx44 ++ Nokia N810 ++ Nokia ++ ++ ++ ++ ++ nokiarx51 ++ Nokia N900 ++ Nokia ++ ++ ++ ++ ++ nokiasu8w ++ Nokia Wireless Keyboard SU-8W ++ Nokia ++ ++ + + + omnikey101 +diff --git a/rules/rules.in b/rules/rules.in +index 610820f4..ccb207dc 100644 +--- a/rules/rules.in ++++ b/rules/rules.in +@@ -44,6 +44,9 @@ // Microsoft models (using MS geometry) ! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface @@ -97,90 +142,51 @@ index 2f55b528..1e97585c 100644 // TypeMatrix geometries ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 -diff --git a/rules/0090-model_geometry.part b/rules/0090-model_geometry.part -index 00cb87ac..de91a6e7 100644 ---- a/rules/0090-model_geometry.part -+++ b/rules/0090-model_geometry.part -@@ -22,6 +22,7 @@ - $applealu = macintosh(%m) - hhk = hhk(basic) - kinesis = kinesis(model100) -+ $nokiamodels = nokia(%m) - sun_type6_jp = sun(type6jp) - sun_type6_usb = sun(type6) - sun_type6_euro_usb = sun(type6tuv) -diff --git a/rules/0130-modellayout_symbols.part b/rules/0130-modellayout_symbols.part -index 6e1e7371..819c740a 100644 ---- a/rules/0130-modellayout_symbols.part -+++ b/rules/0130-modellayout_symbols.part -@@ -15,6 +15,10 @@ - applealu_iso us = macintosh_vndr/apple(alukbd)+macintosh_vndr/us(applealu_iso) +@@ -194,6 +197,7 @@ + $applealu = macintosh(%m) + hhk = hhk(basic) + kinesis = kinesis(model100) ++ $nokiamodels = nokia(%m) + sun_type6_jp = sun(type6jp) + sun_type6_usb = sun(type6) + sun_type6_euro_usb = sun(type6tuv) +@@ -231,6 +235,10 @@ + applealu_iso us = macintosh_vndr/apple(alukbd)+macintosh_vndr/us(applealu_iso) $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l - $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) -+ nokiarx44 * = nokia_vndr/%m(%l) -+ nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) -+ nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l%_v) -+ nokiasu8w * = nokia_vndr/%m(%l) + $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) ++ nokiarx44 * = nokia_vndr/%m(%l) ++ nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) ++ nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l%_v) ++ nokiasu8w * = nokia_vndr/%m(%l) olpc $olpclayouts = olpc+%l%(m) - olpc * = olpc+%l%(v) + olpc * = olpc+%l%(v) olpcm $olpclayouts = olpc+%l%(m) -diff --git a/rules/0160-modellayout1_symbols.part b/rules/0160-modellayout1_symbols.part -index 86c5996e..2549a067 100644 ---- a/rules/0160-modellayout1_symbols.part -+++ b/rules/0160-modellayout1_symbols.part -@@ -7,5 +7,7 @@ - applealu_iso us = macintosh_vndr/apple(alukbd)+macintosh_vndr/us(applealu_iso) - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1] - $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) -+ nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) -+ nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l[1]%_v[1]) - $thinkpads br = pc+%l[1](thinkpad) - * * = pc+%l[1]%(v[1]) -diff --git a/rules/0180-modellayout2_symbols.part b/rules/0180-modellayout2_symbols.part -index a7dc7814..cfab36a4 100644 ---- a/rules/0180-modellayout2_symbols.part -+++ b/rules/0180-modellayout2_symbols.part -@@ -1,5 +1,7 @@ - ! model layout[2] = symbols - applealu_iso us = +macintosh_vndr/us(applealu_iso):2 - $applealu $macvendorlayouts = +macintosh_vndr/%l[2]:2 -+ nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):2 -+ nokiarx51 * = +nokia_vndr/%m(%l[2]%_v[2]):2 - $sun $sun_custom = +sun_vndr/%l[2]:2 - * * = +%l[2]%(v[2]):2 -diff --git a/rules/0200-modellayout3_symbols.part b/rules/0200-modellayout3_symbols.part -index 1f4285d8..cda6d308 100644 ---- a/rules/0200-modellayout3_symbols.part -+++ b/rules/0200-modellayout3_symbols.part -@@ -1,5 +1,7 @@ - ! model layout[3] = symbols - applealu_iso us = +macintosh_vndr/us(applealu_iso):3 - $applealu $macvendorlayouts = +macintosh_vndr/%l[3]:3 -+ nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):3 -+ nokiarx51 * = +nokia_vndr/%m(%l[3]%_v[3]):3 - $sun $sun_custom = +sun_vndr/%l[3]:3 - * * = +%l[3]%(v[3]):3 -diff --git a/rules/0220-modellayout4_symbols.part b/rules/0220-modellayout4_symbols.part -index 7b4d41d9..170b1544 100644 ---- a/rules/0220-modellayout4_symbols.part -+++ b/rules/0220-modellayout4_symbols.part -@@ -1,5 +1,7 @@ - ! model layout[4] = symbols - applealu_iso us = +macintosh_vndr/us(applealu_iso):4 - $applealu $macvendorlayouts = +macintosh_vndr/%l[4]:4 -+ nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):4 -+ nokiarx51 * = +nokia_vndr/%m(%l[4]%_v[4]):4 - $sun $sun_custom = +sun_vndr/%l[4]:4 - * * = +%l[4]%(v[4]):4 -diff --git a/rules/0350-model_types.part b/rules/0350-model_types.part -index f1f97ec4..98a7d4f9 100644 ---- a/rules/0350-model_types.part -+++ b/rules/0350-model_types.part -@@ -1,3 +1,4 @@ +@@ -263,6 +271,8 @@ + applealu_iso us = macintosh_vndr/apple(alukbd)+macintosh_vndr/us(applealu_iso) + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1] + $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) ++ nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) ++ nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l[1]%_v[1]) + $thinkpads br = pc+%l[1](thinkpad) + * * = pc+%l[1]%(v[1]) + +@@ -272,6 +282,8 @@ + # endfor + applealu_iso us = +macintosh_vndr/us(applealu_iso):%i + $applealu $macvendorlayouts = +macintosh_vndr/%l[%i]:%i ++ nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):%i ++ nokiarx51 * = +nokia_vndr/%m(%l[%i]%_v[%i]):%i + $sun $sun_custom = +sun_vndr/%l[%i]:%i + * * = +%l[%i]%(v[%i]):%i + +@@ -385,6 +397,7 @@ + ! model = types - $applealu = complete+numpad(mac) -+ $nokiamodels = complete+nokia + $applealu = complete+numpad(mac) ++ $nokiamodels = complete+nokia * = complete + + ! layout[any] option = symbols diff --git a/symbols/nokia_vndr/nokiarx44 b/symbols/nokia_vndr/nokiarx44 new file mode 100644 index 00000000..350e2dfa @@ -2399,5 +2405,5 @@ index 00000000..9eaaa4e0 + +}; -- -2.50.1 +GitLab diff --git a/temp/xkeyboard-config/0002-add-symbols-for-BlackBerry-KEY2-keypad.patch b/temp/xkeyboard-config/0002-add-symbols-for-BlackBerry-KEY2-keypad.patch index 5d3afc683..4be0c7c50 100644 --- a/temp/xkeyboard-config/0002-add-symbols-for-BlackBerry-KEY2-keypad.patch +++ b/temp/xkeyboard-config/0002-add-symbols-for-BlackBerry-KEY2-keypad.patch @@ -1,195 +1,121 @@ -From 699bf0ac9e162d158eeea16a43a9efb32484aa6d Mon Sep 17 00:00:00 2001 +From f05f728327f30037567cb79725120a498cb0848b Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Tue, 29 Jul 2025 19:14:33 -0700 -Subject: [PATCH] add symbols for BlackBerry KEY2 keypad +Subject: [PATCH] Added BlackBerry KEY2 model and its US English layout -photo of keypad https://i5.walmartimages.com/asr/124528ca-7cf7-45bd-a894-f4b990d27acf.0298c9875736e2f63493862033537803.jpeg +Added [BlackBerry KEY2] model and its corresponding vendor-specific US English layout. -layer 5 on "sym" key, mapped as ralt https://i.imgur.com/DfDZh5y.png +Sources: +- Phone: + - https://en.wikipedia.org/wiki/BlackBerry_Key2 + - https://wiki.postmarketos.org/wiki/BlackBerry_KEY2_Generic_(blackberry-key2-generic) +- Keyboard: + - Photo of keypad: https://wiki.postmarketos.org/images/thumb/f/f0/BlackBerry_KEY2_keyboard.jpg/600px-BlackBerry_KEY2_keyboard.jpg + - Layer 5 on "sym" key, mapped as ralt: https://wiki.postmarketos.org/images/thumb/a/af/BlackBerry_KEY2_SYM_Keys.png/600px-BlackBerry_KEY2_SYM_Keys.png + +Part-of: --- - rules/0010-lists.part | 3 ++ - rules/0040-evdev.model_keycodes.part | 1 + - rules/0130-modellayout_symbols.part | 1 + - rules/0160-modellayout1_symbols.part | 1 + - rules/0180-modellayout2_symbols.part | 1 + - rules/0200-modellayout3_symbols.part | 1 + - rules/0270-evdev.modellayout_symbols1.part | 2 + - rules/base.xml | 6 +++ - symbols/bbry_vndr/key2 | 55 ++++++++++++++++++++++ - symbols/us | 7 +++ - 10 files changed, 78 insertions(+) - create mode 100644 symbols/bbry_vndr/key2 + changes/models/+856-blackberry-key2.md | 4 +++ + rules/base.xml | 7 ++++ + rules/rules.in | 1 + + symbols/blackberry_vndr/key2/us | 47 ++++++++++++++++++++++++++ + 4 files changed, 59 insertions(+) + create mode 100644 changes/models/+856-blackberry-key2.md + create mode 100644 symbols/blackberry_vndr/key2/us -diff --git a/rules/0010-lists.part b/rules/0010-lists.part -index 1e97585c..07202ec2 100644 ---- a/rules/0010-lists.part -+++ b/rules/0010-lists.part -@@ -14,6 +14,9 @@ - // Microsoft models (using MS geometry) - ! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface - -+// BlackBerry devices and keyboards -+! $bbrymodels = key2 +diff --git a/changes/models/+856-blackberry-key2.md b/changes/models/+856-blackberry-key2.md +new file mode 100644 +index 00000000..5eef3da4 +--- /dev/null ++++ b/changes/models/+856-blackberry-key2.md +@@ -0,0 +1,4 @@ ++Added [BlackBerry KEY2](https://en.wikipedia.org/wiki/BlackBerry_Key2) ++model and its corresponding vendor-specific US English layout. + - // Nokia devices and keyboards - ! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 - -diff --git a/rules/0040-evdev.model_keycodes.part b/rules/0040-evdev.model_keycodes.part -index 62c21ffc..fec42fcc 100644 ---- a/rules/0040-evdev.model_keycodes.part -+++ b/rules/0040-evdev.model_keycodes.part -@@ -2,4 +2,5 @@ - $jollamodels = evdev+jolla(jolla) - olpc = evdev+olpc(olpc) - olpcm = evdev+olpc(olpcm) -+ key2 = evdev+bbry_vndr/key2(us) - * = evdev -diff --git a/rules/0130-modellayout_symbols.part b/rules/0130-modellayout_symbols.part -index 819c740a..ba563e04 100644 ---- a/rules/0130-modellayout_symbols.part -+++ b/rules/0130-modellayout_symbols.part -@@ -15,6 +15,7 @@ - applealu_iso us = macintosh_vndr/apple(alukbd)+macintosh_vndr/us(applealu_iso) - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l - $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) -+ key2 us = bbry_vndr/key2(us) - nokiarx44 * = nokia_vndr/%m(%l) - nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) - nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l%_v) -diff --git a/rules/0160-modellayout1_symbols.part b/rules/0160-modellayout1_symbols.part -index 2549a067..14bfd067 100644 ---- a/rules/0160-modellayout1_symbols.part -+++ b/rules/0160-modellayout1_symbols.part -@@ -9,5 +9,6 @@ - $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) - nokiarx51 cz(qwerty) = nokia_vndr/%m(common)+nokia_vndr/%m(cz_qwerty) - nokiarx51 * = nokia_vndr/%m(common)+nokia_vndr/%m(%l[1]%_v[1]) -+ key2 us = bbry_vndr/key2(us) - $thinkpads br = pc+%l[1](thinkpad) - * * = pc+%l[1]%(v[1]) -diff --git a/rules/0180-modellayout2_symbols.part b/rules/0180-modellayout2_symbols.part -index cfab36a4..6db84c53 100644 ---- a/rules/0180-modellayout2_symbols.part -+++ b/rules/0180-modellayout2_symbols.part -@@ -3,5 +3,6 @@ - $applealu $macvendorlayouts = +macintosh_vndr/%l[2]:2 - nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):2 - nokiarx51 * = +nokia_vndr/%m(%l[2]%_v[2]):2 -+ key2 us = +bbry_vndr/key2(us):2 - $sun $sun_custom = +sun_vndr/%l[2]:2 - * * = +%l[2]%(v[2]):2 -diff --git a/rules/0200-modellayout3_symbols.part b/rules/0200-modellayout3_symbols.part -index cda6d308..b5c51ae5 100644 ---- a/rules/0200-modellayout3_symbols.part -+++ b/rules/0200-modellayout3_symbols.part -@@ -3,5 +3,6 @@ - $applealu $macvendorlayouts = +macintosh_vndr/%l[3]:3 - nokiarx51 cz(qwerty) = +nokia_vndr/%m(cz_qwerty):3 - nokiarx51 * = +nokia_vndr/%m(%l[3]%_v[3]):3 -+ key2 us = +bbry_vndr/key2(us):3 - $sun $sun_custom = +sun_vndr/%l[3]:3 - * * = +%l[3]%(v[3]):3 -diff --git a/rules/0270-evdev.modellayout_symbols1.part b/rules/0270-evdev.modellayout_symbols1.part -index 8ff2163a..857cd664 100644 ---- a/rules/0270-evdev.modellayout_symbols1.part -+++ b/rules/0270-evdev.modellayout_symbols1.part -@@ -1 +1,3 @@ - ! model layout = symbols -+ -+ key2 us = +bbry_vndr/key2(us) ++Contributed by Paul Sajna !856 diff --git a/rules/base.xml b/rules/base.xml -index f91ebaab..8b9458a4 100644 +index 3cd33b8f..51140ca2 100644 --- a/rules/base.xml +++ b/rules/base.xml -@@ -3099,6 +3099,12 @@ - English (Dvorak, Macintosh, ISO) - - -+ -+ -+ key2 -+ English (US, BlackBerry KEY 2) -+ -+ - - - norman -diff --git a/symbols/bbry_vndr/key2 b/symbols/bbry_vndr/key2 +@@ -171,6 +171,13 @@ + Generic + + ++ ++ ++ blackberry-key2 ++ BlackBerry KEY2 ++ BlackBerry ++ ++ + + + brother +diff --git a/rules/rules.in b/rules/rules.in +index d17b1071..610820f4 100644 +--- a/rules/rules.in ++++ b/rules/rules.in +@@ -219,6 +219,7 @@ + # endfor + ataritt * = xfree68_vndr/ataritt(us)+%l%(v) + amiga * = xfree68_vndr/amiga(usa1)+%l%(v) ++ blackberry-key2 us = pc+blackberry_vndr/key2/us + empty * = empty(basic) + * empty = empty(basic) + jollasbj * = jolla_vndr/sbj(common)+%l%(v) +diff --git a/symbols/blackberry_vndr/key2/us b/symbols/blackberry_vndr/key2/us new file mode 100644 -index 00000000..d5e80367 +index 00000000..ba0a62e0 --- /dev/null -+++ b/symbols/bbry_vndr/key2 -@@ -0,0 +1,55 @@ ++++ b/symbols/blackberry_vndr/key2/us +@@ -0,0 +1,47 @@ ++// https://en.wikipedia.org/wiki/BlackBerry_Key2 ++ +partial alphanumeric_keys + -+xkb_symbols "us" { -+ // I can't figure out how to make Level4 not Shift+Level3, so Level4,6,7,8 will be none, and Level5 will be the sym key ++xkb_symbols "key2" { + key.type = "EIGHT_LEVEL"; -+ // 1. row -+ key { [ q, Q, numbersign, none, asciitilde, none,none,none] }; -+ key { [ w, W, 1, none, grave, none,none,none] }; -+ key { [ e, E, 2, none, braceleft, none,none,none] }; -+ key { [ r, R, 3, none, braceright, none,none,none] }; -+ key { [ t, T, parenleft, none, bracketleft, none,none,none] }; -+ key { [ y, Y, parenright, none, bracketright, none,none,none] }; -+ key { [ u, U, underscore, none, less, none,none,none] }; -+ key { [ i, I, minus, none, greater, none,none,none] }; -+ key { [ o, O, plus, none, asciicircum, none,none,none] }; -+ key { [ p, P, at, none, percent, none,none,none] }; ++ // 1st row ++ key { [ q, Q, numbersign, none, asciitilde] }; ++ key { [ w, W, 1, none, grave] }; ++ key { [ e, E, 2, none, braceleft] }; ++ key { [ r, R, 3, none, braceright] }; ++ key { [ t, T, parenleft, none, bracketleft] }; ++ key { [ y, Y, parenright, none, bracketright] }; ++ key { [ u, U, underscore, none, less] }; ++ key { [ i, I, minus, none, greater] }; ++ key { [ o, O, plus, none, asciicircum] }; ++ key { [ p, P, at, none, percent] }; + -+ // 2. row -+ key { [ a, A, asterisk, none, equal, none,none,none] }; -+ key { [ s, S, 4, none, division, none,none,none] }; -+ key { [ d, D, 5, none, plusminus, none,none,none] }; -+ key { [ f, F, 6, none, U2022, none,none,none] }; -+ key { [ g, G, slash, none, backslash, none,none,none] }; -+ key { [ h, H, colon, none, bar, none,none,none] }; -+ key { [ j, J, semicolon, none, ampersand, none,none,none] }; -+ key { [ k, K, apostrophe, none, leftdoublequotemark, none,none,none] }; -+ key { [ l, L, quotedbl, none, rightdoublequotemark, none,none,none] }; ++ // 2nd row ++ key { [ a, A, asterisk, none, equal] }; ++ key { [ s, S, 4, none, division] }; ++ key { [ d, D, 5, none, plusminus] }; ++ key { [ f, F, 6, none, U2022] }; ++ key { [ g, G, slash, none, backslash] }; ++ key { [ h, H, colon, none, bar] }; ++ key { [ j, J, semicolon, none, ampersand] }; ++ key { [ k, K, apostrophe, none, leftdoublequotemark] }; ++ key { [ l, L, quotedbl, none, rightdoublequotemark] }; + -+ // 3. row -+ key { [ z, Z, 7, none, U00AB, none,none,none] }; -+ key { [ x, X, 8, none, U00BB, none,none,none] }; -+ key { [ c, C, 9, none, trademark, none,none,none] }; -+ key { [ v, V, question, none, questiondown, none,none,none] }; -+ key { [ b, B, exclam, none, exclamdown, none,none,none] }; -+ key { [ n, N, comma, none, brokenbar, none,none,none] }; -+ key { [ m, M, period, none, U00A7 , none,none,none] }; ++ // 3rd row ++ key { [ z, Z, 7, none, U00AB] }; ++ key { [ x, X, 8, none, U00BB] }; ++ key { [ c, C, 9, none, trademark] }; ++ key { [ v, V, question, none, questiondown] }; ++ key { [ b, B, exclam, none, exclamdown] }; ++ key { [ n, N, comma, none, brokenbar] }; ++ key { [ m, M, period, none, U00A7] }; + // This key has a speaker symbol on it. It doesn't do anything in Android AFAICT, but let's make it mute -+ key { [ dollar, EuroSign, XF86AudioMute, none, dollar, none,none,none] }; ++ key { [ dollar, EuroSign, XF86AudioMute, none, dollar] }; + -+ // 4. row -+ key { [ space, none, none, none, none, none,none,none] }; -+ // KEY_DICTATE (mic) -+ // there's no actual dictation option in freedesktop (xf86 keymap) AFAICT, so I'll make this mic mute I guess??? -+ key { [ XF86AudioMicMute, none, 0, none, none, none,none,none] }; -+ key { [ ISO_Level3_Shift ] }; -+ key { [ ISO_Level5_Shift ] }; ++ // 4th row ++ key { [ space, space, space, space, space] }; ++ key { [ XF86Dictate, none, 0] }; + ++ include "level3(lalt_switch)" + include "level5(ralt_switch)" +}; -+ -+partial modifier_keys -+xkb_symbols "modifiers" { -+ modifier_map Mod3 { Alt_L }; -+ modifier_map Mod5 { Alt_R }; -+}; -diff --git a/symbols/us b/symbols/us -index d9e65c3e..9e89be68 100644 ---- a/symbols/us -+++ b/symbols/us -@@ -2260,3 +2260,10 @@ xkb_symbols "de_se_fi" { - - include "level3(ralt_switch)" - }; -+ -+partial alphanumeric_keys -+xkb_symbols "key2" { -+ name[Group1] = "English (US, BlackBerry KEY 2)"; -+ -+ include "bbry_vndr/key2(us)" -+}; -- -2.51.0 +GitLab diff --git a/temp/xkeyboard-config/APKBUILD b/temp/xkeyboard-config/APKBUILD index 7d4205a22..63ddbe59b 100644 --- a/temp/xkeyboard-config/APKBUILD +++ b/temp/xkeyboard-config/APKBUILD @@ -3,7 +3,7 @@ # * https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/856 maintainer="Paul Sajna " pkgname=xkeyboard-config -_pkgver=2.47 +_pkgver=2.48 pkgver=9999$_pkgver pkgrel=0 pkgdesc="X keyboard configuration files" @@ -41,7 +41,7 @@ package() { } sha512sums=" -49bc09162b0688b3b2b267b49e4d1be2c1d1b2660f465400c0d925c841202244f5521fd334126c24a69f1a927a989d0a49661173e3761a5d9fbeffc0b67b29ca xkeyboard-config-xkeyboard-config-2.47.tar.gz -88c44ba723dc97fdaba04076fc49ff09c01384b689e93c9b1ab2b7c4547ea88cb64fbd2f203094abe149d4c1ff6efe38529ddf37f97fbbc3a22a714966289775 0001-re-nokia.patch -5aaf4b72badd86e2a371300eac0eaa741c2f7d221f794fbcd7ab8bd4a626f0a80402993bc45af50760723885079b2836972bc927b99260491e6b2ff9e36b0019 0002-add-symbols-for-BlackBerry-KEY2-keypad.patch +7fc550af99b66c5032a2162e60c86519e3a2cca67966c9b3264d046d827436a248293946408d61fde590e915c621f1db4a533b7529908946f420c22a719a6b23 xkeyboard-config-xkeyboard-config-2.48.tar.gz +99042ebe47474a6125f992d0f7d4624ce28100b556192772ab541b21b76826a235c26160b128eb0e087ebee551dbcade1436f1469f56d3affcc48488b43aa005 0001-re-nokia.patch +8c999e1a056cfa7cef97153a5ddd55c30dcb4ec51c521d8120e734828fdf17fe4e4185d9f46e1eea187d21b026df6f257fea4571bfbdd64b3c496799bcf9e75c 0002-add-symbols-for-BlackBerry-KEY2-keypad.patch "