diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/keyboard.pm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/keyboard.pm b/lib/keyboard.pm index aaaa76f..3af902f 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -198,7 +198,7 @@ arch() =~ /^sparc/ ? ( "us" => [ N_("US keyboard"), "sunkeymap", "us", "", 0 ], ) : ( "al" => [ N_("_: keyboard\nAlbanian"), "al", "al", "", 0 ], - "am_old" => [ N_("_: keyboard\nArmenian (old)"), "am_old", "am", "old", 1 ], + #"am_old" => [ N_("_: keyboard\nArmenian (old)"), "am_old", "am", "", 1 ], # X11 variant BROKEN (was: am(old) ) "am" => [ N_("_: keyboard\nArmenian (typewriter)"), "am-armscii8", "am", "", 1 ], "am_phonetic" => [ N_("_: keyboard\nArmenian (phonetic)"), "am_phonetic", "am", "phonetic", 1 ], "ara" => [ N_("_: keyboard\nArabic"), "us", "ara", "digits", 1 ], @@ -216,7 +216,7 @@ arch() =~ /^sparc/ ? ( "ch_de" => [ N_("_: keyboard\nSwiss (German layout)"), "sg-latin1", "ch", "de", 0 ], "ch_fr" => [ N_("_: keyboard\nSwiss (French layout)"), "fr_CH-latin1", "ch", "fr", 0 ], # TODO: console map - "chr" => [ N_("_: keyboard\nCherokee syllabics"), "us", "chr", "", 1 ], +# "chr" => [ N_("_: keyboard\nCherokee syllabics"), "us", "chr", "", 1 ], # BROKEN "cz" => [ N_("_: keyboard\nCzech (QWERTZ)"), "cz", "cz", "", 0 ], "cz_qwerty" => [ N_("_: keyboard\nCzech (QWERTY)"), "cz-lat2", "cz", "qwerty", 0 ], "de" => [ N_("_: keyboard\nGerman"), "de-latin1", "de", "", 0 ], @@ -224,7 +224,7 @@ arch() =~ /^sparc/ ? ( "dev" => [ N_("_: keyboard\nDevanagari"), "us", "in", "deva", 1 ], "dk" => [ N_("_: keyboard\nDanish"), "dk-latin1", "dk", "", 0 ], "dvorak" => [ N_("_: keyboard\nDvorak (US)"), "pc-dvorak-latin1", "us", "dvorak", 0 ], - "dvorak_eo" => [ N_("_: keyboard\nDvorak (Esperanto)"), "eo-dvorak", "dvorak", "eo", 0 ], +# "dvorak_eo" => [ N_("_: keyboard\nDvorak (Esperanto)"), "eo-dvorak", "dvorak", "eo", 0 ], # BROKEN "dvorak_fr" => [ N_("_: keyboard\nDvorak (French)"), "fr-dvorak", "fr", "dvorak", 0 ], "dvorak_gb" => [ N_("_: keyboard\nDvorak (UK)"), "pc-dvorak-latin1", "gb", "dvorak", 0 ], "dvorak_no" => [ N_("_: keyboard\nDvorak (Norwegian)"), "no-dvorak", "no", "dvorak", 0 ], @@ -239,7 +239,7 @@ arch() =~ /^sparc/ ? ( "fr_bepo_latin9" => [ N_("_: keyboard\nFrench (Bepo, only latin-9)"), "fr-bepo-latin9", "fr", "bepo_latin9", 0 ], "gb" => [ N_("UK keyboard"), "uk-latin1", "gb", "", 0 ], "ge_ru" => [ N_("_: keyboard\nGeorgian (\"Russian\" layout)"), "ge_ru-georgian_academy", "ge", "ru", 1 ], - "ge_la" => [ N_("_: keyboard\nGeorgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge", "la", 1 ], + "ge_la" => [ N_("_: keyboard\nGeorgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge", "qwerty", 1 ], "gr" => [ N_("_: keyboard\nGreek"), "gr-8859_7", "gr", "extended", 1 ], "gr_pl" => [ N_("_: keyboard\nGreek (polytonic)"), "gr-8859_7", "gr", "polytonic", 1 ], "guj" => [ N_("_: keyboard\nGujarati"), "us", "in", "guj", 1 ], @@ -258,18 +258,18 @@ arch() =~ /^sparc/ ? ( # are not automatically enabled when typing in kana "jp" => [ N_("_: keyboard\nJapanese 106 keys"), "jp106", "jp", "", 0 ], "kan" => [ N_("_: keyboard\nKannada"), "us", "in", "kan", 1 ], - "kg" => [ N_("_: keyboard\nKyrgyz"), "ky", "kg", "direct", 1 ], + "kg" => [ N_("_: keyboard\nKyrgyz"), "ky", "kg", "", 1 ], "kr" => [ N_("_: keyboard\nKorean"), "us", "kr", "kr104", 0 ], # TODO: console map - "kur" => [ N_("_: keyboard\nKurdish (arabic script)"), "us", "kur", "", 1 ], + "kur" => [ N_("_: keyboard\nKurdish (arabic script)"), "us", "iq", "ku_ara", 1 ], "lat" => [ N_("_: keyboard\nLatin American"), "la-latin1", "latam", "", 0 ], # TODO: console map "lao" => [ N_("_: keyboard\nLaotian"), "us", "la", "", 1 ], - "lt" => [ N_("_: keyboard\nLithuanian"), "lt-latin7", "lt,us", "", 1 ], + "lt" => [ N_("_: keyboard\nLithuanian"), "lt-latin7", "lt,us", ",", 1 ], "lv" => [ N_("_: keyboard\nLatvian"), "lv-latin7", "lv", "", 0 ], "mal" => [ N_("_: keyboard\nMalayalam"), "us", "in", "mal", 1 ], "mao" => [ N_("_: keyboard\nMaori"), "us", "mao", "", 0 ], - "mk" => [ N_("_: keyboard\nMacedonian"), "mk", "mkd", "", 1 ], + "mk" => [ N_("_: keyboard\nMacedonian"), "mk", "mk", "", 1 ], "mm" => [ N_("_: keyboard\nMyanmar (Burmese)"), "us", "mm", "", 1 ], "mn" => [ N_("_: keyboard\nMongolian (cyrillic)"), "us", "mn", "", 1 ], "mt" => [ N_("_: keyboard\nMaltese (UK)"), "mt", "mt", "", 0 ], @@ -281,7 +281,7 @@ arch() =~ /^sparc/ ? ( "pl" => [ N_("_: keyboard\nPolish (qwerty layout)"), "pl", "pl", "", 0 ], "pl2" => [ N_("_: keyboard\nPolish (qwertz layout)"), "pl-latin2", "pl", "qwertz", 0 ], # TODO: console map - "pus" => [ N_("_: keyboard\nPashto"), "us", "pus", "", 1 ], + "pus" => [ N_("_: keyboard\nPashto"), "us", "af", "ps", 1 ], "pt" => [ N_("_: keyboard\nPortuguese"), "pt-latin1", "pt", "", 0 ], "qc" => [ N_("_: keyboard\nCanadian (Quebec)"), "qc-latin1", "ca", "", 0 ], "ro_qwertz" => [ N_("_: keyboard\nRomanian (qwertz)"), "ro2", "ro", "winkeys", 0 ], @@ -298,7 +298,7 @@ arch() =~ /^sparc/ ? ( "smi" => [ N_("_: keyboard\nSaami (norwegian)"), "no-latin1", "no", "smi", 0 ], "smi_sefi" => [ N_("_: keyboard\nSaami (swedish/finnish)"), "se-latin1", "se", "smi", 0 ], # TODO: console map - "snd" => [ N_("_: keyboard\nSindhi"), "us", "snd", "digits", 1 ], +# "snd" => [ N_("_: keyboard\nSindhi"), "us", "snd", "digits", 1 ], # BROKEN # TODO: console map "srp" => [ N_("_: keyboard\nSerbian (cyrillic)"), "sr", "srp,srp", "basic,latin", 1 ], "syr" => [ N_("_: keyboard\nSyriac"), "us", "sy", "syc", 1 ], @@ -312,8 +312,8 @@ arch() =~ /^sparc/ ? ( # TODO: console map "th_pat" => [ N_("_: keyboard\nThai (Pattachote)"), "us", "th", "pat", 1 ], # NOTE: we define a triple layout here - "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr-tifinagh", "fr,tifinagh,ara", ",basic,azerty", 1 ], - "tifinagh_p" => [ N_("_: keyboard\nTifinagh (phonetic) (+latin/arabic)"), "fr-tifinaghp", "fr,tifinagh,ara", ",phonetic,azerty", 1 ], + "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr-tifinagh", "fr,am,ara", ",tifinagh,azerty", 1 ], + "tifinagh_p" => [ N_("_: keyboard\nTifinagh (phonetic) (+latin/arabic)"), "fr-tifinaghp", "fr,am,ara", ",tifinagh-phonetic,azerty", 1 ], # TODO: console map "tj" => [ N_("_: keyboard\nTajik"), "ru4", "tj", "", 1 ], # TODO: console map @@ -323,12 +323,12 @@ arch() =~ /^sparc/ ? ( #-"tw => [ N_("_: keyboard\nChineses bopomofo"), "tw", "tw", "", 1 ], "ua" => [ N_("_: keyboard\nUkrainian"), "ua", "ua", "", 1 ], # TODO: console map - "urd" => [ N_("_: keyboard\nUrdu keyboard"), "us", "urd", "", 1 ], + "urd" => [ N_("_: keyboard\nUrdu keyboard"), "us", "pk", "urd", 1 ], "us" => [ N_("US keyboard"), "us", "us", "", 0 ], "us_intl" => [ N_("US keyboard (international)"), "us-intl", "us", "alt-intl", 0 ], "us_mac" => [ N_("US keyboard (Macintosh)"), "mac-us", "us", "mac", 0 ], "us3" => [ N_("ISO9995-3 (US keyboard with 3 levels per key)"), "us", "latin+level3", "ralt_switch", 0 ], - "uz" => [ N_("_: keyboard\nUzbek (cyrillic)"), "uz", "uz", "", 1 ], + "uz" => [ N_("_: keyboard\nUzbek (cyrillic)"), "uz", "uz", "cyrillic", 1 ], # old XKB layout "vn" => [ N_("_: keyboard\nVietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn", "", 0 ], "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "srp", "latin", 0 ], @@ -545,12 +545,12 @@ sub keyboard2full_xkb { my ($keyboard) = @_; my $Layout = _keyboard2xkbl($keyboard) or return { XkbDisable => '' }; + my $Variant = _keyboard2xkbv($keyboard); if ($keyboard->{GRP_TOGGLE} && $Layout !~ /,/) { $Layout = join(',', 'us', $Layout); + $Variant = join(',', '', $Variant); } - my $Variant = _keyboard2xkbv($keyboard); - my $Model = $keyboard->{XkbModel} || default_XkbModel($keyboard); my $Options = join(',', |