calculate
/
gfxboot-theme-calculate
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Revert to previous console-setup/layoutcode and

Browse Source 
console-setup/variantcode values when booting with a non-Latin keymap.
  This has to be handled by casper instead, otherwise we break the
  alternate install CD (LP: #218754).
master
Colin Watson 16 years ago
parent f842c491fc
commit f5ca032340
4 changed files with 114 additions and 137 deletions
Show Stats Download Patch File Download Diff File

21
common.inc
Unescape View File

@ -379,24 +379,13 @@
} if
config.keymap .km.name get dup "us" ne {
config.keymap .km.real_layout get dup {
exch pop
dup "_" strstr dup 0 eq {
pop
"console-setup/layoutcode=%s " bc.cmd dup length add sprintf
config.keymap .km.real_variant get dup {
"console-setup/variantcode=%s " bc.cmd dup length add sprintf
} {
pop
} ifelse
} {
pop
dup "_" strstr dup 0 eq {
pop
"console-setup/layoutcode=%s " bc.cmd dup length add sprintf
} {
over over 1 sub 0 put
over "console-setup/layoutcode=%s " bc.cmd dup length add sprintf
add "console-setup/variantcode=%s " bc.cmd dup length add sprintf
} ifelse
over over 1 sub 0 put
over "console-setup/layoutcode=%s " bc.cmd dup length add sprintf
add "console-setup/variantcode=%s " bc.cmd dup length add sprintf
} ifelse
config.keymap .km.model get dup {
"console-setup/modelcode=%s " bc.cmd dup length add sprintf

9
debian/changelog vendored
Unescape View File

@ -1,3 +1,12 @@
gfxboot-theme-ubuntu (0.5.20) UNRELEASED; urgency=low
* Revert to previous console-setup/layoutcode and
console-setup/variantcode values when booting with a non-Latin keymap.
This has to be handled by casper instead, otherwise we break the
alternate install CD (LP: #218754).
-- Colin Watson <cjwatson@ubuntu.com> Mon, 21 Apr 2008 14:54:25 +0100
gfxboot-theme-ubuntu (0.5.19) hardy; urgency=low
* Rebuild font based on debian-installer 20070308ubuntu39.

199
keytables.inc
Unescape View File

@ -10,8 +10,6 @@
/.km.display 2 def
/.km.locales 3 def
/.km.model 4 def
/.km.real_layout 5 def
/.km.real_variant 6 def
/keymap.ad [
[ 0x03 0x32 0x40 0x00 ]
@ -769,10 +767,10 @@
[ 0x1f 0x00 0x53 0xdf ]
[ 0x20 0x64 0x44 0xf0 ]
[ 0x25 0x00 0x4b 0xa2 ]
[ 0x26 0x00 0x4c 0x00 ]
[ 0x26 0x00 0x4c 0x2d ]
[ 0x27 0xf6 0xd6 0xf8 ]
[ 0x28 0xe4 0xc4 0xe6 ]
[ 0x29 0x00 0xbd 0x00 ]
[ 0x29 0x00 0xbd 0x2d ]
[ 0x2b 0x27 0x2a 0x00 ]
[ 0x2c 0x7a 0x5a 0x00 ]
[ 0x2d 0x78 0x58 0xd7 ]
@ -1213,6 +1211,7 @@
[ 0x0a 0x00 0x28 0x00 ]
[ 0x0b 0x00 0x29 0x00 ]
[ 0x0c 0x2d 0x00 0x2d ]
[ 0x2b 0x00 0x5c 0x00 ]
[ 0x33 0x2c 0x00 0x2c ]
[ 0x34 0x2e 0x00 0x2e ]
[ 0x35 0x00 0x3f 0x00 ]
@ -2575,102 +2574,102 @@
] def
/keymaps [
[ "af" keymap.af "Afghanistan" [ ] .undef .undef .undef ]
[ "al" keymap.al "Albania" [ "_AL" ] .undef .undef .undef ]
[ "ad" keymap.ad "Andorra" [ ] .undef .undef .undef ]
[ "ara" keymap.ara "Arabic" [ "ar_" ] .undef "us,ara" .undef ]
[ "am" keymap.am "Armenia" [ "hy_" ] .undef "us,am" .undef ]
[ "az" keymap.az "Azerbaijan" [ "_AZ" ] .undef .undef .undef ]
[ "bd" keymap.bd "Bangladesh" [ "_BD" ] .undef "us,bd" .undef ]
[ "by" keymap.by "Belarus" [ "_BY" ] .undef "us,by" .undef ]
[ "be" keymap.be "Belgium" [ "_BE" ] .undef .undef .undef ]
[ "bt" keymap.bt "Bhutan" [ ] .undef "us,bt" .undef ]
[ "ba" keymap.ba "Bosnia" [ "bs_" ] .undef .undef .undef ]
[ "braille" keymap.braille "Braille" [ ] .undef .undef .undef ]
[ "br" keymap.br "Brazil" [ "_BR" ] "abnt2" .undef .undef ]
[ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef "us,bg" .undef ]
[ "kh" keymap.kh "Cambodia" [ ] .undef "us,kh" .undef ]
[ "ca" keymap.ca "Canada" [ "_CA" ] .undef .undef .undef ]
[ "cn" keymap.cn "China" [ "zh_CN" ] .undef .undef .undef ]
[ "cd" keymap.cd "Congo" [ ] .undef .undef .undef ]
[ "hr" keymap.hr "Croatia" [ "hr_" ] .undef .undef .undef ]
[ "cz" keymap.cz "Czechia" [ "_CZ" ] .undef .undef .undef ]
[ "dk" keymap.dk "Denmark" [ "_DK" ] .undef .undef .undef ]
[ "us_dvorak" keymap.us_dvorak "Dvorak" [ ] .undef .undef .undef ]
[ "epo" keymap.epo "Esperanto" [ "eo" ] .undef .undef .undef ]
[ "ee" keymap.ee "Estonia" [ "_EE" ] .undef .undef .undef ]
[ "et" keymap.et "Ethiopia" [ ] .undef .undef .undef ]
[ "fo" keymap.fo "Faroes" [ ] .undef .undef .undef ]
[ "fi" keymap.fi "Finland" [ "_FI" ] .undef .undef .undef ]
[ "fr_oss" keymap.fr_oss "France" [ "fr_" ] .undef .undef .undef ]
[ "ge" keymap.ge "Georgia" [ "ka_" ] .undef "us,ge" .undef ]
[ "de" keymap.de "Germany" [ "de_" ] .undef .undef .undef ]
[ "gh" keymap.gh "Ghana" [ ] .undef "us,gh" .undef ]
[ "gr" keymap.gr "Greece" [ "el_" ] .undef "us,gr" .undef ]
[ "gn" keymap.gn "Guinea" [ ] .undef .undef .undef ]
[ "in_guj" keymap.in_guj "Gujarati" [ "gu_" ] .undef .undef .undef ]
[ "in_guru" keymap.in_guru "Gurmukhi" [ "pa_" ] .undef .undef .undef ]
[ "hu" keymap.hu "Hungary" [ "_HU" ] .undef .undef .undef ]
[ "is" keymap.is "Iceland" [ "_IS" ] .undef .undef .undef ]
[ "in" keymap.in "India" [ "hi_" ] .undef "us,in" .undef ]
[ "ir" keymap.ir "Iran" [ "_IR" ] .undef "us,ir" .undef ]
[ "iq" keymap.iq "Iraq" [ ] .undef .undef .undef ]
[ "ie" keymap.ie "Ireland" [ "_IE" ] .undef .undef .undef ]
[ "il" keymap.il "Israel" [ "_IL" ] .undef "us,il" .undef ]
[ "it" keymap.it "Italy" [ "_IT" ] .undef .undef .undef ]
[ "jp" keymap.jp "Japan" [ "_JP" ] "jp106" .undef .undef ]
[ "in_kan" keymap.in_kan "Kannada" [ "kn_" ] .undef .undef .undef ]
[ "kz" keymap.kz "Kazakhstan" [ ] .undef .undef .undef ]
[ "kr" keymap.kr "Korea" [ ] .undef .undef .undef ]
[ "tr_ku" keymap.tr_ku "Kurdish" [ "ku_TR" ] .undef .undef .undef ]
[ "kg" keymap.kg "Kyrgyzstan" [ ] .undef .undef .undef ]
[ "la" keymap.la "Laos" [ "lo_" ] .undef "us,la" .undef ]
[ "latam" keymap.latam "Latin Amer." [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] .undef .undef .undef ]
[ "lv" keymap.lv "Latvia" [ "_LV" ] .undef .undef .undef ]
[ "lt" keymap.lt "Lithuania" [ "_LT" ] .undef "lt,lt" "basic,us" ]
[ "mk" keymap.mk "Macedonia" [ "_MK" ] .undef "us,mk" .undef ]
[ "in_mal" keymap.in_mal "Malayalam" [ "ml_" ] .undef .undef .undef ]
[ "mv" keymap.mv "Maldives" [ ] .undef "us,mv" .undef ]
[ "mt" keymap.mt "Malta" [ "_MT" ] .undef .undef .undef ]
[ "mao" keymap.mao "Maori" [ ] .undef .undef .undef ]
[ "mn" keymap.mn "Mongolia" [ "_MN" ] .undef "us,mn" .undef ]
[ "me" keymap.me "Montenegro" [ "sr_ME" ] .undef .undef .undef ]
[ "ma" keymap.ma "Morocco" [ "_MA" ] .undef .undef .undef ]
[ "mm" keymap.mm "Myanmar" [ ] .undef "us,mm" .undef ]
[ "np" keymap.np "Nepal" [ ] .undef .undef .undef ]
[ "nl" keymap.nl "Netherlands" [ ] .undef .undef .undef ]
[ "ng" keymap.ng "Nigeria" [ ] .undef .undef .undef ]
[ "no" keymap.no "Norway" [ "_NO" ] .undef .undef .undef ]
[ "pk" keymap.pk "Pakistan" [ ] .undef "us,pk" .undef ]
[ "pl" keymap.pl "Poland" [ "_PL" ] .undef .undef .undef ]
[ "pt" keymap.pt "Portugal" [ "_PT" ] .undef .undef .undef ]
[ "ro" keymap.ro "Romania" [ "_RO" ] .undef .undef .undef ]
[ "ru" keymap.ru "Russia" [ "_RU" ] .undef "us,ru" .undef ]
[ "fi_smi" keymap.fi_smi "Saami (Fin.)" [ "se_FI" ] .undef .undef .undef ]
[ "no_smi" keymap.no_smi "Saami (Nor.)" [ "se_NO" ] .undef .undef .undef ]
[ "se_smi" keymap.se_smi "Saami (Swe.)" [ "se_SE" ] .undef .undef .undef ]
[ "rs" keymap.rs "Serbia" [ "sr_" ] .undef .undef .undef ]
[ "sk" keymap.sk "Slovakia" [ "_SK" ] .undef .undef .undef ]
[ "si" keymap.si "Slovenia" [ "_SI" ] .undef .undef .undef ]
[ "za" keymap.za "South Africa" [ ] .undef .undef .undef ]
[ "es" keymap.es "Spain" [ "_ES" ] .undef .undef .undef ]
[ "lk" keymap.lk "Sri Lanka" [ ] .undef "us,lk" .undef ]
[ "se" keymap.se "Sweden" [ "sv_" ] .undef .undef .undef ]
[ "ch_fr" keymap.ch_fr "Swiss French" [ "fr_CH" ] .undef .undef .undef ]
[ "ch" keymap.ch "Swiss German" [ "_CH" ] .undef .undef .undef ]
[ "sy" keymap.sy "Syria" [ ] .undef "us,sy" .undef ]
[ "tj" keymap.tj "Tajikistan" [ "_TJ" ] .undef "us,tj" .undef ]
[ "in_tam" keymap.in_tam "Tamil" [ "ta_" ] .undef .undef .undef ]
[ "in_tel" keymap.in_tel "Telugu" [ "te_" ] .undef .undef .undef ]
[ "th" keymap.th "Thailand" [ "_TH" ] .undef "us,th" .undef ]
[ "tr" keymap.tr "Turkey" [ "_TR" ] .undef .undef .undef ]
[ "tr_f" keymap.tr_f "Turkey ((F))" [ ] .undef .undef .undef ]
[ "gb" keymap.gb "UK" [ "_GB" ] .undef .undef .undef ]
[ "us" keymap.us "USA" [ "en_US" "_VN" ] .undef .undef .undef ]
[ "us_intl" keymap.us_intl "USA Intl." [ "_NL" ] .undef .undef .undef ]
[ "ua" keymap.ua "Ukraine" [ "_UA" ] .undef "us,ua" .undef ]
[ "uz" keymap.uz "Uzbekistan" [ ] .undef "us,uz" .undef ]
[ "vn" keymap.vn "Vietnam" [ ] .undef .undef .undef ]
[ "af" keymap.af "Afghanistan" [ ] .undef ]
[ "al" keymap.al "Albania" [ "_AL" ] .undef ]
[ "ad" keymap.ad "Andorra" [ ] .undef ]
[ "ara" keymap.ara "Arabic" [ "ar_" ] .undef ]
[ "am" keymap.am "Armenia" [ "hy_" ] .undef ]
[ "az" keymap.az "Azerbaijan" [ "_AZ" ] .undef ]
[ "bd" keymap.bd "Bangladesh" [ "_BD" ] .undef ]
[ "by" keymap.by "Belarus" [ "_BY" ] .undef ]
[ "be" keymap.be "Belgium" [ "_BE" ] .undef ]
[ "bt" keymap.bt "Bhutan" [ ] .undef ]
[ "ba" keymap.ba "Bosnia" [ "bs_" ] .undef ]
[ "braille" keymap.braille "Braille" [ ] .undef ]
[ "br" keymap.br "Brazil" [ "_BR" ] "abnt2" ]
[ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef ]
[ "kh" keymap.kh "Cambodia" [ ] .undef ]
[ "ca" keymap.ca "Canada" [ "_CA" ] .undef ]
[ "cn" keymap.cn "China" [ "zh_CN" ] .undef ]
[ "cd" keymap.cd "Congo" [ ] .undef ]
[ "hr" keymap.hr "Croatia" [ "hr_" ] .undef ]
[ "cz" keymap.cz "Czechia" [ "_CZ" ] .undef ]
[ "dk" keymap.dk "Denmark" [ "_DK" ] .undef ]
[ "us_dvorak" keymap.us_dvorak "Dvorak" [ ] .undef ]
[ "epo" keymap.epo "Esperanto" [ "eo" ] .undef ]
[ "ee" keymap.ee "Estonia" [ "_EE" ] .undef ]
[ "et" keymap.et "Ethiopia" [ ] .undef ]
[ "fo" keymap.fo "Faroes" [ ] .undef ]
[ "fi" keymap.fi "Finland" [ "_FI" ] .undef ]
[ "fr_oss" keymap.fr_oss "France" [ "fr_" ] .undef ]
[ "ge" keymap.ge "Georgia" [ "ka_" ] .undef ]
[ "de" keymap.de "Germany" [ "de_" ] .undef ]
[ "gh" keymap.gh "Ghana" [ ] .undef ]
[ "gr" keymap.gr "Greece" [ "el_" ] .undef ]
[ "gn" keymap.gn "Guinea" [ ] .undef ]
[ "in_guj" keymap.in_guj "Gujarati" [ "gu_" ] .undef ]
[ "in_guru" keymap.in_guru "Gurmukhi" [ "pa_" ] .undef ]
[ "hu" keymap.hu "Hungary" [ "_HU" ] .undef ]
[ "is" keymap.is "Iceland" [ "_IS" ] .undef ]
[ "in" keymap.in "India" [ "hi_" ] .undef ]
[ "ir" keymap.ir "Iran" [ "_IR" ] .undef ]
[ "iq" keymap.iq "Iraq" [ ] .undef ]
[ "ie" keymap.ie "Ireland" [ "_IE" ] .undef ]
[ "il" keymap.il "Israel" [ "_IL" ] .undef ]
[ "it" keymap.it "Italy" [ "_IT" ] .undef ]
[ "jp" keymap.jp "Japan" [ "_JP" ] "jp106" ]
[ "in_kan" keymap.in_kan "Kannada" [ "kn_" ] .undef ]
[ "kz" keymap.kz "Kazakhstan" [ ] .undef ]
[ "kr" keymap.kr "Korea" [ ] .undef ]
[ "tr_ku" keymap.tr_ku "Kurdish" [ "ku_TR" ] .undef ]
[ "kg" keymap.kg "Kyrgyzstan" [ ] .undef ]
[ "la" keymap.la "Laos" [ "lo_" ] .undef ]
[ "latam" keymap.latam "Latin Amer." [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] .undef ]
[ "lv" keymap.lv "Latvia" [ "_LV" ] .undef ]
[ "lt" keymap.lt "Lithuania" [ "_LT" ] .undef ]
[ "mk" keymap.mk "Macedonia" [ "_MK" ] .undef ]
[ "in_mal" keymap.in_mal "Malayalam" [ "ml_" ] .undef ]
[ "mv" keymap.mv "Maldives" [ ] .undef ]
[ "mt" keymap.mt "Malta" [ "_MT" ] .undef ]
[ "mao" keymap.mao "Maori" [ ] .undef ]
[ "mn" keymap.mn "Mongolia" [ "_MN" ] .undef ]
[ "me" keymap.me "Montenegro" [ "sr_ME" ] .undef ]
[ "ma" keymap.ma "Morocco" [ "_MA" ] .undef ]
[ "mm" keymap.mm "Myanmar" [ ] .undef ]
[ "np" keymap.np "Nepal" [ ] .undef ]
[ "nl" keymap.nl "Netherlands" [ ] .undef ]
[ "ng" keymap.ng "Nigeria" [ ] .undef ]
[ "no" keymap.no "Norway" [ "_NO" ] .undef ]
[ "pk" keymap.pk "Pakistan" [ ] .undef ]
[ "pl" keymap.pl "Poland" [ "_PL" ] .undef ]
[ "pt" keymap.pt "Portugal" [ "_PT" ] .undef ]
[ "ro" keymap.ro "Romania" [ "_RO" ] .undef ]
[ "ru" keymap.ru "Russia" [ "_RU" ] .undef ]
[ "fi_smi" keymap.fi_smi "Saami (Fin.)" [ "se_FI" ] .undef ]
[ "no_smi" keymap.no_smi "Saami (Nor.)" [ "se_NO" ] .undef ]
[ "se_smi" keymap.se_smi "Saami (Swe.)" [ "se_SE" ] .undef ]
[ "rs" keymap.rs "Serbia" [ "sr_" ] .undef ]
[ "sk" keymap.sk "Slovakia" [ "_SK" ] .undef ]
[ "si" keymap.si "Slovenia" [ "_SI" ] .undef ]
[ "za" keymap.za "South Africa" [ ] .undef ]
[ "es" keymap.es "Spain" [ "_ES" ] .undef ]
[ "lk" keymap.lk "Sri Lanka" [ ] .undef ]
[ "se" keymap.se "Sweden" [ "sv_" ] .undef ]
[ "ch_fr" keymap.ch_fr "Swiss French" [ "fr_CH" ] .undef ]
[ "ch" keymap.ch "Swiss German" [ "_CH" ] .undef ]
[ "sy" keymap.sy "Syria" [ ] .undef ]
[ "tj" keymap.tj "Tajikistan" [ "_TJ" ] .undef ]
[ "in_tam" keymap.in_tam "Tamil" [ "ta_" ] .undef ]
[ "in_tel" keymap.in_tel "Telugu" [ "te_" ] .undef ]
[ "th" keymap.th "Thailand" [ "_TH" ] .undef ]
[ "tr" keymap.tr "Turkey" [ "_TR" ] .undef ]
[ "tr_f" keymap.tr_f "Turkey ((F))" [ ] .undef ]
[ "gb" keymap.gb "UK" [ "_GB" ] .undef ]
[ "us" keymap.us "USA" [ "en_US" "_VN" ] .undef ]
[ "us_intl" keymap.us_intl "USA Intl." [ "_NL" ] .undef ]
[ "ua" keymap.ua "Ukraine" [ "_UA" ] .undef ]
[ "uz" keymap.uz "Uzbekistan" [ ] .undef ]
[ "vn" keymap.vn "Vietnam" [ ] .undef ]
] def
% set to "us" for safety

22
scrape-console-setup
Unescape View File

@ -188,8 +188,6 @@ print <<EOF;
/.km.display 2 def
/.km.locales 3 def
/.km.model 4 def
/.km.real_layout 5 def
/.km.real_variant 6 def
EOF
@ -282,14 +280,8 @@ for my $keymap (@keymaps) {
}
}
my %real_keymaps;
for my $keymap (@non_latin) {
$keycodes{$keymap} = $keycodes{us};
if ($keymap eq 'lt') {
$real_keymaps{$keymap} = ['lt,lt', 'basic,us'];
} else {
$real_keymaps{$keymap} = ["us,$keymap"];
}
}
my %keymapfunc;
@ -368,19 +360,7 @@ for my $keymap (sort { $descriptions{$a} cmp $descriptions{$b} } @keymaps) {
} else {
$model = '.undef';
}
my $real_layout;
if (exists $real_keymaps{$keymap}) {
$real_layout = qq{"$real_keymaps{$keymap}[0]"};
} else {
$real_layout = '.undef';
}
my $real_variant;
if (exists $real_keymaps{$keymap} and @{$real_keymaps{$keymap}} > 1) {
$real_variant = qq{"$real_keymaps{$keymap}[1]"};
} else {
$real_variant = '.undef';
}
print qq{ [ "$keymap" $keymapfunc{$keymap} "$descriptions{$keymap}" $localelist $model $real_layout $real_variant ]\n};
print qq{ [ "$keymap" $keymapfunc{$keymap} "$descriptions{$keymap}" $localelist $model ]\n};
$us_index = $i if $keymap eq 'us';
++$i;
}

Write Preview
Loading…
Cancel
Save