From e464019be22a495fbf7aaee2b5bed714c7f47467 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 3 Oct 2006 10:37:41 +0100 Subject: [PATCH] * Always map the PC105 less than / greater than key, since the BIOS keymap doesn't always appear to be what we'd expect (closes: Malone #43956). --- debian/changelog | 7 ++ keytables.inc | 202 +++++++++++++++++++++++++++++++++++++------ scrape-console-setup | 6 +- 3 files changed, 186 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0ce250..82cea81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gfxboot-theme-ubuntu (0.2.6) UNRELEASED; urgency=low + + * Always map the PC105 less than / greater than key, since the BIOS keymap + doesn't always appear to be what we'd expect (closes: Malone #43956). + + -- Colin Watson Tue, 3 Oct 2006 10:35:20 +0100 + gfxboot-theme-ubuntu (0.2.5) edgy; urgency=low * Update font from unifont 1:1.0-3ubuntu1, improving Georgian glyphs diff --git a/keytables.inc b/keytables.inc index 757a726..6c2ad01 100644 --- a/keytables.inc +++ b/keytables.inc @@ -26,6 +26,7 @@ [ 0x25 0x6b 0x4b 0xef ] [ 0x26 0x6c 0x4c 0xb7 ] [ 0x2e 0x63 0x43 0xe7 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.af [ @@ -56,6 +57,7 @@ [ 0x34 0x2e 0x3c 0x00 ] [ 0x35 0x2f 0x00 0x00 ] [ 0x39 0x20 0x00 0xa0 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.al [ @@ -105,6 +107,15 @@ [ 0x33 0x2c 0x3b 0x3c ] [ 0x34 0x2e 0x3a 0x3e ] [ 0x35 0x2f 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.am [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.ara [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.az [ @@ -125,6 +136,7 @@ [ 0x33 0xe7 0xc7 0xe7 ] [ 0x34 0xba 0xaa 0xba ] [ 0x35 0x2e 0x2c 0x2e ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.ba [ @@ -166,6 +178,11 @@ [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] [ 0x35 0x00 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.bd [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.be [ @@ -217,6 +234,10 @@ [ 0x56 0x3c 0x3e 0x5c ] ] def +/keymap.bg [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.br [ [ 0x02 0x31 0x21 0xb9 ] [ 0x03 0x32 0x40 0xb2 ] @@ -263,6 +284,15 @@ [ 0x33 0x2c 0x3c 0x00 ] [ 0x34 0x2e 0x3e 0xb7 ] [ 0x35 0x3b 0x3a 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.bt [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.by [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.ca [ @@ -359,6 +389,7 @@ [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] [ 0x35 0x00 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.cz [ @@ -458,6 +489,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.dk [ @@ -554,6 +586,7 @@ [ 0x33 0x2c 0x3b 0x3c ] [ 0x34 0x2e 0x3a 0x3e ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.epo [ @@ -604,6 +637,7 @@ [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.es [ @@ -652,6 +686,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.fi [ @@ -699,6 +734,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0xad ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.fi_smi [ @@ -847,6 +883,7 @@ [ 0x33 0x3b 0x2e 0x00 ] [ 0x34 0x3a 0x2f 0xb7 ] [ 0x35 0x21 0xa7 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.gb [ @@ -897,6 +934,18 @@ [ 0x56 0x5c 0x7c 0x7c ] ] def +/keymap.ge [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.gh [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.gr [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.hr [ [ 0x02 0x00 0x21 0x00 ] [ 0x03 0x00 0x22 0x00 ] @@ -936,6 +985,7 @@ [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] [ 0x35 0x00 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.hu [ @@ -1040,6 +1090,14 @@ [ 0x56 0x5c 0x7c 0x00 ] ] def +/keymap.il [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.in [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.in_guj [ [ 0x04 0x00 0x23 0x00 ] [ 0x05 0x00 0x24 0x00 ] @@ -1053,6 +1111,7 @@ [ 0x33 0x2c 0x00 0x2c ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_guru [ @@ -1069,6 +1128,7 @@ [ 0x0c 0x00 0x5f 0x00 ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_kan [ @@ -1084,6 +1144,7 @@ [ 0x33 0x2c 0x00 0x2c ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x40 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_mal [ @@ -1101,6 +1162,7 @@ [ 0x33 0x2c 0x00 0x2c ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_tam [ @@ -1118,6 +1180,7 @@ [ 0x33 0x2c 0x00 0x2c ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_tel [ @@ -1133,6 +1196,11 @@ [ 0x33 0x2c 0x00 0x2c ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x40 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.ir [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.is [ @@ -1181,6 +1249,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0xfe 0xde 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.it [ @@ -1233,6 +1302,10 @@ [ 0x56 0x3c 0x3e 0xab ] ] def +/keymap.jp [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.kg [ [ 0x03 0x32 0x22 0x32 ] [ 0x04 0x33 0x00 0x33 ] @@ -1244,6 +1317,10 @@ [ 0x56 0x2f 0x7c 0x7c ] ] def +/keymap.kh [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.kz [ [ 0x02 0x00 0x21 0x00 ] [ 0x07 0x2c 0x3b 0x2c ] @@ -1251,6 +1328,11 @@ [ 0x29 0x28 0x29 0x00 ] [ 0x2b 0x5c 0x2f 0x5c ] [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.la [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.latam [ @@ -1298,6 +1380,11 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.lk [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.lt [ @@ -1381,6 +1468,7 @@ [ 0x31 0x6e 0x4e 0xf1 ] [ 0x33 0x2c 0x3c 0x00 ] [ 0x34 0x2e 0x3e 0xb7 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.mao [ @@ -1429,6 +1517,19 @@ [ 0x33 0x2c 0x3c 0x00 ] [ 0x34 0x2e 0x3e 0xb7 ] [ 0x35 0x2f 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.mk [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.mm [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.mn [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.mt [ @@ -1480,6 +1581,10 @@ [ 0x56 0xbf 0xaf 0x5c ] ] def +/keymap.mv [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.nl [ [ 0x02 0x31 0x21 0xb9 ] [ 0x03 0x32 0x22 0xb2 ] @@ -1629,6 +1734,10 @@ [ 0x56 0xb8 0xb4 0x00 ] ] def +/keymap.pk [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.pl [ [ 0x02 0x31 0x21 0xb9 ] [ 0x03 0x32 0x40 0xb2 ] @@ -1676,6 +1785,7 @@ [ 0x33 0x2c 0x3c 0x00 ] [ 0x34 0x2e 0x3e 0xb7 ] [ 0x35 0x2f 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.pt [ @@ -1722,6 +1832,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.ro [ @@ -1755,6 +1866,10 @@ [ 0x56 0x5c 0x7c 0x7c ] ] def +/keymap.ru [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.se [ [ 0x02 0x31 0x21 0xa1 ] [ 0x03 0x32 0x22 0x40 ] @@ -1800,6 +1915,7 @@ [ 0x33 0x2c 0x3b 0x00 ] [ 0x34 0x2e 0x3a 0xb7 ] [ 0x35 0x2d 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.se_smi [ @@ -1892,6 +2008,7 @@ [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] [ 0x35 0x00 0x5f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.sk [ @@ -1946,6 +2063,18 @@ [ 0x56 0x5c 0x7c 0x2f ] ] def +/keymap.sy [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.th [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.tj [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.tr [ [ 0x02 0x31 0x21 0xb9 ] [ 0x03 0x32 0x27 0xa3 ] @@ -1993,6 +2122,7 @@ [ 0x34 0xe7 0xc7 0xb7 ] [ 0x35 0x2e 0x3a 0x2e ] [ 0x39 0x20 0x20 0xa0 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.tr_f [ @@ -2044,6 +2174,15 @@ [ 0x34 0x2e 0x3a 0xf7 ] [ 0x35 0x2c 0x3b 0xb7 ] [ 0x39 0x20 0x20 0xa0 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.ua [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.us [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.us_dvorak [ @@ -2083,6 +2222,11 @@ [ 0x33 0x77 0x57 0x77 ] [ 0x34 0x76 0x56 0x76 ] [ 0x35 0x7a 0x5a 0x7a ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + +/keymap.uz [ + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.vn [ @@ -2099,6 +2243,7 @@ [ 0x0d 0x3d 0x2b 0x00 ] [ 0x1a 0x5b 0x7b 0x00 ] [ 0x1b 0x5d 0x7d 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.za [ @@ -2147,23 +2292,24 @@ [ 0x32 0x6d 0x4d 0x00 ] [ 0x33 0x2c 0x3c 0x00 ] [ 0x35 0x2f 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymaps [ [ "af" keymap.af "Afghanistan" [ ] ] [ "al" keymap.al "Albania" [ "_AL" ] ] [ "ad" keymap.ad "Andorra" [ ] ] - [ "ara" .undef "Arabic" [ "ar_" ] ] - [ "am" .undef "Armenia" [ "hy_" ] ] + [ "ara" keymap.ara "Arabic" [ "ar_" ] ] + [ "am" keymap.am "Armenia" [ "hy_" ] ] [ "az" keymap.az "Azerbaijan" [ "_AZ" ] ] - [ "bd" .undef "Bangladesh" [ "_BD" ] ] - [ "by" .undef "Belarus" [ "_BY" ] ] + [ "bd" keymap.bd "Bangladesh" [ "_BD" ] ] + [ "by" keymap.by "Belarus" [ "_BY" ] ] [ "be" keymap.be "Belgium" [ "_BE" ] ] - [ "bt" .undef "Bhutan" [ ] ] + [ "bt" keymap.bt "Bhutan" [ ] ] [ "ba" keymap.ba "Bosnia" [ "bs_" ] ] [ "br" keymap.br "Brazil" [ "_BR" ] ] - [ "bg" .undef "Bulgaria" [ "_BG" ] ] - [ "kh" .undef "Cambodia" [ ] ] + [ "bg" keymap.bg "Bulgaria" [ "_BG" ] ] + [ "kh" keymap.kh "Cambodia" [ ] ] [ "ca" keymap.ca "Canada" [ "_CA" ] ] [ "hr" keymap.hr "Croatia" [ "hr_" ] ] [ "cz" keymap.cz "Czechia" [ "_CZ" ] ] @@ -2175,62 +2321,62 @@ [ "fi" keymap.fi "Finland" [ "_FI" ] ] [ "fi_smi" keymap.fi_smi "Finland (Saami)" [ "se_FI" ] ] [ "fr" keymap.fr "France" [ "fr_" ] ] - [ "ge" .undef "Georgia" [ "ka_" ] ] + [ "ge" keymap.ge "Georgia" [ "ka_" ] ] [ "de" keymap.de "Germany" [ "de_" ] ] - [ "gh" .undef "Ghana" [ ] ] - [ "gr" .undef "Greece" [ "el_" ] ] + [ "gh" keymap.gh "Ghana" [ ] ] + [ "gr" keymap.gr "Greece" [ "el_" ] ] [ "in_guj" keymap.in_guj "Gujarati" [ "gu_" ] ] [ "in_guru" keymap.in_guru "Gurmukhi" [ "pa_" ] ] [ "hu" keymap.hu "Hungary" [ "_HU" ] ] [ "is" keymap.is "Iceland" [ "_IS" ] ] - [ "in" .undef "India" [ "hi_" ] ] - [ "ir" .undef "Iran" [ "_IR" ] ] + [ "in" keymap.in "India" [ "hi_" ] ] + [ "ir" keymap.ir "Iran" [ "_IR" ] ] [ "ie" keymap.ie "Ireland" [ "_IE" ] ] - [ "il" .undef "Israel" [ "_IL" ] ] + [ "il" keymap.il "Israel" [ "_IL" ] ] [ "it" keymap.it "Italy" [ "_IT" ] ] - [ "jp" .undef "Japan" [ "_JP" ] ] + [ "jp" keymap.jp "Japan" [ "_JP" ] ] [ "in_kan" keymap.in_kan "Kannada" [ "kn_" ] ] [ "kz" keymap.kz "Kazakhstan" [ ] ] [ "kg" keymap.kg "Kyrgyzstan" [ ] ] - [ "la" .undef "Laos" [ "lo_" ] ] + [ "la" keymap.la "Laos" [ "lo_" ] ] [ "latam" keymap.latam "Latin American" [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] ] [ "lv" keymap.lv "Latvia" [ ] ] [ "lt" keymap.lt "Lithuania" [ "_LT" ] ] - [ "mk" .undef "Macedonia" [ "_MK" ] ] + [ "mk" keymap.mk "Macedonia" [ "_MK" ] ] [ "in_mal" keymap.in_mal "Malayalam" [ "ml_" ] ] - [ "mv" .undef "Maldives" [ ] ] + [ "mv" keymap.mv "Maldives" [ ] ] [ "mt" keymap.mt "Malta" [ "_MT" ] ] [ "mao" keymap.mao "Maori" [ ] ] - [ "mn" .undef "Mongolia" [ "_MN" ] ] - [ "mm" .undef "Myanmar" [ ] ] + [ "mn" keymap.mn "Mongolia" [ "_MN" ] ] + [ "mm" keymap.mm "Myanmar" [ ] ] [ "nl" keymap.nl "Netherlands" [ "_NL" ] ] [ "no" keymap.no "Norway" [ "_NO" ] ] [ "no_smi" keymap.no_smi "Norway (Saami)" [ "se_NO" ] ] - [ "pk" .undef "Pakistan" [ ] ] + [ "pk" keymap.pk "Pakistan" [ ] ] [ "pl" keymap.pl "Poland" [ "_PL" ] ] [ "pt" keymap.pt "Portugal" [ "_PT" ] ] [ "ro" keymap.ro "Romania" [ "_RO" ] ] - [ "ru" .undef "Russia" [ "_RU" ] ] + [ "ru" keymap.ru "Russia" [ "_RU" ] ] [ "cs" keymap.cs "Serbia" [ "sr_" ] ] [ "sk" keymap.sk "Slovakia" [ "_SK" ] ] [ "si" keymap.si "Slovenia" [ "_SI" ] ] [ "za" keymap.za "South Africa" [ ] ] [ "es" keymap.es "Spain" [ "_ES" ] ] - [ "lk" .undef "Sri Lanka" [ ] ] + [ "lk" keymap.lk "Sri Lanka" [ ] ] [ "se" keymap.se "Sweden" [ "sv_" ] ] [ "se_smi" keymap.se_smi "Sweden (Saami)" [ "se_SE" ] ] [ "ch" keymap.ch "Switzerland" [ "_CH" ] ] - [ "sy" .undef "Syria" [ ] ] - [ "tj" .undef "Tajikistan" [ "_TJ" ] ] + [ "sy" keymap.sy "Syria" [ ] ] + [ "tj" keymap.tj "Tajikistan" [ "_TJ" ] ] [ "in_tam" keymap.in_tam "Tamil" [ "ta_" ] ] [ "in_tel" keymap.in_tel "Telugu" [ "te_" ] ] - [ "th" .undef "Thailand" [ "_TH" ] ] + [ "th" keymap.th "Thailand" [ "_TH" ] ] [ "tr" keymap.tr "Turkey" [ "_TR" ] ] [ "tr_f" keymap.tr_f "Turkey ((F))" [ ] ] - [ "us" .undef "U.S. English" [ "en_US" ] ] - [ "ua" .undef "Ukraine" [ "_UA" ] ] + [ "us" keymap.us "U.S. English" [ "en_US" ] ] + [ "ua" keymap.ua "Ukraine" [ "_UA" ] ] [ "gb" keymap.gb "United Kingdom" [ "_GB" ] ] - [ "uz" .undef "Uzbekistan" [ ] ] + [ "uz" keymap.uz "Uzbekistan" [ ] ] [ "vn" keymap.vn "Vietnam" [ "_VN" ] ] ] def diff --git a/scrape-console-setup b/scrape-console-setup index ae81a4d..6876389 100755 --- a/scrape-console-setup +++ b/scrape-console-setup @@ -276,7 +276,11 @@ for my $keymap (@keymaps) { if ($plain eq $keycodes{us}{plain}[$index] and $shift eq $keycodes{us}{shift}[$index] and $altgr eq $keycodes{us}{altgr}[$index]) { - next; + # The PC105 less than / greater than key isn't necessarily + # mapped correctly by the BIOS. + if ($index != 86) { + next; + } } if (($plain ne '0x00') or ($shift ne '0x00') or ($altgr ne '0x00')) { print "/keymap.$keymap [\n" unless $found;