diff options
Diffstat (limited to 'perl-install/keyboard.pm')
| -rw-r--r-- | perl-install/keyboard.pm | 236 |
1 files changed, 124 insertions, 112 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 8b066d302..30526a83c 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -31,6 +31,7 @@ my %lang2keyboard = 'be' => 'by:90 ru:50 ru_yawerty:40', 'bg' => 'bg_phonetic:60 bg:50', 'bn' => 'ben:90 dev:20 us_intl:5', +# 'bo' => 'dz', 'br' => 'fr:90', 'bs' => 'bs:90', 'ca' => 'es:90 fr:15', @@ -38,6 +39,7 @@ my %lang2keyboard = 'cy' => 'uk:90', 'da' => 'dk:90', 'de' => 'de_nodeadkeys:70 de:50 be:50 ch_de:50', +# 'dz' => 'dz', 'el' => 'gr:90', 'en' => 'us:89 us_intl:50 qc:50 uk:50', 'en_IE' => 'ie:80 uk:70', @@ -129,7 +131,7 @@ my %lang2keyboard = 'uz\@Cyrl' => 'uz:80 ru_yawerty:40', 'uz\@Latn' => 'us:80 uz:80', 've' => 'us_intl', - 'vi' => 'vn:80 us:60 us_intl:50', + 'vi' => 'vn:80 us:70 us_intl:60', 'wa' => 'be:90 fr:5', 'xh' => 'us_intl', 'yi' => 'il_phonetic:90 il:10 us_intl:10', @@ -158,129 +160,137 @@ my @usb2keyboard = #- a multigroup layout (eg: one with latin/non-latin letters) my %keyboards = ( arch() =~ /^sparc/ ? ( - "cz" => [ N_("Czech (QWERTZ)"), "sunt5-cz-us", "cz", 0 ], - "de" => [ N_("German"), "sunt5-de-latin1", "de", 0 ], - "dvorak" => [ N_("Dvorak"), "sundvorak", "dvorak",0 ], - "es" => [ N_("Spanish"), "sunt5-es", "es", 0 ], - "fi" => [ N_("Finnish"), "sunt5-fi-latin1", "fi", 0 ], - "fr" => [ N_("French"), "sunt5-fr-latin1", "fr", 0 ], - "no" => [ N_("Norwegian"), "sunt4-no-latin1", "no", 0 ], - "pl" => [ N_("Polish"), "sun-pl-altgraph", "pl", 0 ], - "ru" => [ N_("Russian"), "sunt5-ru", "ru", 1 ], + "cz" => [ N_("_: keyboard\nCzech (QWERTZ)"), "sunt5-cz-us", "cz", 0 ], + "de" => [ N_("_: keyboard\nGerman"), "sunt5-de-latin1", "de", 0 ], + "dvorak" => [ N_("_: keyboard\nDvorak"), "sundvorak", "dvorak",0 ], + "es" => [ N_("_: keyboard\nSpanish"), "sunt5-es", "es", 0 ], + "fi" => [ N_("_: keyboard\nFinnish"), "sunt5-fi-latin1", "fi", 0 ], + "fr" => [ N_("_: keyboard\nFrench"), "sunt5-fr-latin1", "fr", 0 ], + "no" => [ N_("_: keyboard\nNorwegian"), "sunt4-no-latin1", "no", 0 ], + "pl" => [ N_("_: keyboard\nPolish"), "sun-pl-altgraph", "pl", 0 ], + "ru" => [ N_("_: keyboard\nRussian"), "sunt5-ru", "ru", 1 ], # TODO: check the console map - "se" => [ N_("Swedish"), "sunt5-fi-latin1", "se", 0 ], + "se" => [ N_("_: keyboard\nSwedish"), "sunt5-fi-latin1", "se", 0 ], "uk" => [ N_("UK keyboard"), "sunt5-uk", "gb", 0 ], "us" => [ N_("US keyboard"), "sunkeymap", "us", 0 ], ) : ( - "al" => [ N_("Albanian"), "al", "al", 0 ], - "am_old" => [ N_("Armenian (old)"), "am_old", "am(old)", 1 ], - "am" => [ N_("Armenian (typewriter)"), "am-armscii8", "am", 1 ], - "am_phonetic" => [ N_("Armenian (phonetic)"), "am_phonetic", "am(phonetic)",1 ], - "ar" => [ N_("Arabic"), "us", "ar(digits)", 1 ], - "az" => [ N_("Azerbaidjani (latin)"), "az", "az", 0 ], -#"a3" => [ N_("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ], - "be" => [ N_("Belgian"), "be2-latin1", "be", 0 ], - "ben" => [ N_("Bengali"), "us", "ben", 1 ], -"bg_phonetic" => [ N_("Bulgarian (phonetic)"), "bg", "bg(phonetic)", 1 ], - "bg" => [ N_("Bulgarian (BDS)"), "bg", "bg", 1 ], - "br" => [ N_("Brazilian (ABNT-2)"), "br-abnt2", "br", 0 ], -#- Bosnia and Croatia use the same layout, but people are confused if there -#- isn't an antry for their country - "bs" => [ N_("Bosnian"), "croat", "hr", 0 ], - "by" => [ N_("Belarusian"), "by-cp1251", "by", 1 ], - "ch_de" => [ N_("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ], - "ch_fr" => [ N_("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ], - "cz" => [ N_("Czech (QWERTZ)"), "cz", "cz", 0 ], - "cz_qwerty" => [ N_("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ], - "de" => [ N_("German"), "de-latin1", "de", 0 ], - "de_nodeadkeys" => [ N_("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ], - "dev" => [ N_("Devanagari"), "us", "dev", 0 ], - "dk" => [ N_("Danish"), "dk-latin1", "dk", 0 ], - "dvorak" => [ N_("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ], - "dvorak_eo" => [ N_("Dvorak (Esperanto)"), "us", "dvorak(eo)", 0 ], - "dvorak_no" => [ N_("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ], - "dvorak_se" => [ N_("Dvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ], - "ee" => [ N_("Estonian"), "ee-latin9", "ee", 0 ], - "es" => [ N_("Spanish"), "es-latin1", "es", 0 ], - "fi" => [ N_("Finnish"), "fi-latin1", "fi", 0 ], - "fr" => [ N_("French"), "fr-latin1", "fr", 0 ], - "ge_ru" => [N_("Georgian (\"Russian\" layout)"), "ge_ru-georgian_academy", "ge_ru",1], - "ge_la" => [N_("Georgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge_la",1], - "gr" => [ N_("Greek"), "gr-8859_7", "el(extended)", 1 ], - "gr_pl" => [ N_("Greek (polytonic)"), "gr-8859_7", "el(polytonic)", 1 ], - "guj" => [ N_("Gujarati"), "us", "guj", 1 ], - "gur" => [ N_("Gurmukhi"), "us", "gur", 1 ], - "hu" => [ N_("Hungarian"), "hu-latin2", "hu", 0 ], - "hr" => [ N_("Croatian"), "croat", "hr", 0 ], - "ie" => [ N_("Irish"), "uk", "ie", 0 ], - "il" => [ N_("Israeli"), "il-8859_8", "il", 1 ], - "il_phonetic" => [ N_("Israeli (Phonetic)"), "hebrew", "il_phonetic", 1 ], - "ir" => [ N_("Iranian"), "ir-isiri_3342", "ir", 1 ], - "is" => [ N_("Icelandic"), "is-latin1", "is", 0 ], - "it" => [ N_("Italian"), "it-latin1", "it", 0 ], - "iu" => [ N_("Inuktitut"), "us", "iu", 1 ], + "al" => [ N_("_: keyboard\nAlbanian"), "al", "al", 0 ], + "am_old" => [ N_("_: keyboard\nArmenian (old)"), "am_old", "am(old)", 1 ], + "am" => [ N_("_: keyboard\nArmenian (typewriter)"), "am-armscii8", "am", 1 ], + "am_phonetic" => [ N_("_: keyboard\nArmenian (phonetic)"), "am_phonetic", "am(phonetic)",1 ], + "ar" => [ N_("_: keyboard\nArabic"), "us", "ar(digits)", 1 ], + "az" => [ N_("_: keyboard\nAzerbaidjani (latin)"), "az", "az", 0 ], + "be" => [ N_("_: keyboard\nBelgian"), "be2-latin1", "be", 0 ], + "ben" => [ N_("_: keyboard\nBengali"), "us", "ben", 1 ], +"bg_phonetic" => [ N_("_: keyboard\nBulgarian (phonetic)"), "bg", "bg(phonetic)", 1 ], + "bg" => [ N_("_: keyboard\nBulgarian (BDS)"), "bg", "bg", 1 ], + "br" => [ N_("_: keyboard\nBrazilian (ABNT-2)"), "br-abnt2", "br", 0 ], + "bs" => [ N_("_: keyboard\nBosnian"), "croat", "bs", 0 ], + "by" => [ N_("_: keyboard\nBelarusian"), "by-cp1251", "by", 1 ], +# old XKB layout + "ch_de" => [ N_("_: keyboard\nSwiss (German layout)"), "sg-latin1", "de_CH", 0 ], +# old XKB layout + "ch_fr" => [ N_("_: keyboard\nSwiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ], + "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 ], + "de_nodeadkeys" => [ N_("_: keyboard\nGerman (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ], + "dev" => [ N_("_: keyboard\nDevanagari"), "us", "dev", 0 ], + "dk" => [ N_("_: keyboard\nDanish"), "dk-latin1", "dk", 0 ], + "dvorak" => [ N_("_: keyboard\nDvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ], + "dvorak_eo" => [ N_("_: keyboard\nDvorak (Esperanto)"), "us", "dvorak(eo)", 0 ], + "dvorak_no" => [ N_("_: keyboard\nDvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ], + "dvorak_se" => [ N_("_: keyboard\nDvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ], +#"dz" => [ N_("_: keyboard\nDzonkha/Tibetan"), "us", "dz", 1 ], + "ee" => [ N_("_: keyboard\nEstonian"), "ee-latin9", "ee", 0 ], + "es" => [ N_("_: keyboard\nSpanish"), "es-latin1", "es", 0 ], + "fi" => [ N_("_: keyboard\nFinnish"), "fi-latin1", "fi", 0 ], + "fr" => [ N_("_: keyboard\nFrench"), "fr-latin1", "fr", 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], + "gr" => [ N_("_: keyboard\nGreek"), "gr-8859_7", "el(extended)", 1 ], + "gr_pl" => [ N_("_: keyboard\nGreek (polytonic)"), "gr-8859_7", "el(polytonic)", 1 ], + "guj" => [ N_("_: keyboard\nGujarati"), "us", "guj", 1 ], + "gur" => [ N_("_: keyboard\nGurmukhi"), "us", "gur", 1 ], +# old XKB layout + "hu" => [ N_("_: keyboard\nHungarian"), "hu-latin2", "hu", 0 ], + "hr" => [ N_("_: keyboard\nCroatian"), "croat", "hr", 0 ], + "ie" => [ N_("_: keyboard\nIrish"), "uk", "ie", 0 ], + "il" => [ N_("_: keyboard\nIsraeli"), "il-8859_8", "il", 1 ], + "il_phonetic" => [ N_("_: keyboard\nIsraeli (phonetic)"), "hebrew", "il_phonetic", 1 ], + "ir" => [ N_("_: keyboard\nIranian"), "ir-isiri_3342", "ir", 1 ], + "is" => [ N_("_: keyboard\nIcelandic"), "is-latin1", "is", 0 ], + "it" => [ N_("_: keyboard\nItalian"), "it-latin1", "it", 0 ], + "iu" => [ N_("_: keyboard\nInuktitut"), "us", "iu", 1 ], +# old XKB layout # Japanese keyboard is dual latin/kana; but telling it here shows a # message to choose the switching key that is misleading, as input methods # aren't automatically enabled when typing in kana - "jp" => [ N_("Japanese 106 keys"), "jp106", "jp", 0 ], - "kan" => [ N_("Kannada"), "us", "kan", 1 ], -#There is no XKB korean file yet; but using xmodmap one disables -# some functioanlity; "us" used for XKB until this is fixed - "kr" => [ N_("Korean keyboard"), "us", "us", 1 ], - "ky" => [ N_("Kyrgyz keyboard"), "ru", "ky", 1 ], - "la" => [ N_("Latin American"), "la-latin1", "la", 0 ], - "lao" => [ N_("Laotian"), "us", "lo", 1 ], - "lt" => [ N_("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ], + "jp" => [ N_("_: keyboard\nJapanese 106 keys"), "jp106", "jp", 0 ], + "kan" => [ N_("_: keyboard\nKannada"), "us", "kan", 1 ], +# There is no XKB korean file yet; but using xmodmap one disables +# some functionality; "us" used for XKB until this is fixed + "kr" => [ N_("_: keyboard\nKorean"), "us", "us", 1 ], + "ky" => [ N_("_: keyboard\nKyrgyz"), "ru", "ky", 1 ], + "la" => [ N_("_: keyboard\nLatin American"), "la-latin1", "la", 0 ], + "lao" => [ N_("_: keyboard\nLaotian"), "us", "lo", 1 ], +# old XKB layout + "lt" => [ N_("_: keyboard\nLithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ], +# old XKB layout #- TODO: write a console kbd map for lt_new - "lt_new" => [ N_("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ], - "lt_b" => [ N_("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ], - "lt_p" => [ N_("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ], - "lv" => [ N_("Latvian"), "lv-latin7", "lv", 0 ], - "mal" => [ N_("Malayalam"), "us", "ml(mlplusnum)", 1 ], - "mk" => [ N_("Macedonian"), "mk", "mk", 1 ], - "mm" => [ N_("Myanmar (Burmese)"), "us", "mm", 1 ], - "mng" => [ N_("Mongolian (cyrillic)"), "us", "mng", 1 ], - "mt" => [ N_("Maltese (UK)"), "uk", "mt", 0 ], - "mt_us" => [ N_("Maltese (US)"), "us", "mt_us", 0 ], - "nl" => [ N_("Dutch"), "nl-latin1", "nl", 0 ], - "no" => [ N_("Norwegian"), "no-latin1", "no", 0 ], - "ori" => [ N_("Oriya"), "us", "ori", 1 ], - "pl" => [ N_("Polish (qwerty layout)"), "pl", "pl", 0 ], - "pl2" => [ N_("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ], - "pt" => [ N_("Portuguese"), "pt-latin1", "pt", 0 ], - "qc" => [ N_("Canadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ], + "lt_new" => [ N_("_: keyboard\nLithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ], +# old XKB layout + "lt_b" => [ N_("_: keyboard\nLithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ], +# old XKB layout + "lt_p" => [ N_("_: keyboard\nLithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ], + "lv" => [ N_("_: keyboard\nLatvian"), "lv-latin7", "lv", 0 ], + "mal" => [ N_("_: keyboard\nMalayalam"), "us", "ml(mlplusnum)", 1 ], + "mk" => [ N_("_: keyboard\nMacedonian"), "mk", "mk", 1 ], + "mm" => [ N_("_: keyboard\nMyanmar (Burmese)"), "us", "mm", 1 ], + "mng" => [ N_("_: keyboard\nMongolian (cyrillic)"), "us", "mng", 1 ], + "mt" => [ N_("_: keyboard\nMaltese (UK)"), "uk", "mt", 0 ], + "mt_us" => [ N_("_: keyboard\nMaltese (US)"), "us", "mt_us", 0 ], + "nl" => [ N_("_: keyboard\nDutch"), "nl-latin1", "nl", 0 ], + "no" => [ N_("_: keyboard\nNorwegian"), "no-latin1", "no", 0 ], + "ori" => [ N_("_: keyboard\nOriya"), "us", "ori", 1 ], + "pl" => [ N_("_: keyboard\nPolish (qwerty layout)"), "pl", "pl", 0 ], + "pl2" => [ N_("_: keyboard\nPolish (qwertz layout)"), "pl-latin2", "pl2", 0 ], + "pt" => [ N_("_: keyboard\nPortuguese"), "pt-latin1", "pt", 0 ], +# old XKB layout + "qc" => [ N_("_: keyboard\nCanadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ], #- TODO: write a console kbd map for ro2 - "ro2" => [ N_("Romanian (qwertz)"), "ro2", "ro2", 0 ], - "ro" => [ N_("Romanian (qwerty)"), "ro", "ro", 0 ], - "ru" => [ N_("Russian"), "ru4", "ru(winkeys)", 1 ], - "ru_yawerty" => [ N_("Russian (Phonetic)"), "ru-yawerty", "ru_yawerty", 1 ], - "sapmi" => [ N_("Saami (norwegian)"), "no-latin1", "sapmi", 0 ], - "sapmi_sefi" => [ N_("Saami (swedish/finnish)"), "se-latin1", "sapmi(sefi)", 0 ], - "se" => [ N_("Swedish"), "se-latin1", "se", 0 ], - "si" => [ N_("Slovenian"), "slovene", "si", 0 ], - "sk" => [ N_("Slovakian (QWERTZ)"), "sk-qwertz", "sk", 0 ], - "sk_qwerty" => [ N_("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ], + "ro2" => [ N_("_: keyboard\nRomanian (qwertz)"), "ro2", "ro", 0 ], + "ro" => [ N_("_: keyboard\nRomanian (qwerty)"), "ro", "ro(us_ro)", 0 ], + "ru" => [ N_("_: keyboard\nRussian"), "ru4", "ru(winkeys)", 1 ], + "ru_yawerty" => [ N_("_: keyboard\nRussian (phonetic)"), "ru-yawerty", "ru(phonetic)", 1 ], + "sapmi" => [ N_("_: keyboard\nSaami (norwegian)"), "no-latin1", "sapmi", 0 ], + "sapmi_sefi" => [ N_("_: keyboard\nSaami (swedish/finnish)"), "se-latin1", "sapmi(sefi)", 0 ], + "se" => [ N_("_: keyboard\nSwedish"), "se-latin1", "se", 0 ], + "si" => [ N_("_: keyboard\nSlovenian"), "slovene", "si", 0 ], + "sk" => [ N_("_: keyboard\nSlovakian (QWERTZ)"), "sk-qwertz", "sk", 0 ], + "sk_qwerty" => [ N_("_: keyboard\nSlovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ], # TODO: console map - "sr" => [ N_("Serbian (cyrillic)"), "sr", "sr", 1 ], - "syr" => [ N_("Syriac"), "us", "syr", 1 ], - "syr_p" => [ N_("Syriac (phonetic)"), "us", "syr_phonetic", 1 ], - "tel" => [ N_("Telugu"), "us", "tel", 1 ], + "sr" => [ N_("_: keyboard\nSerbian (cyrillic)"), "sr", "sr", 1 ], + "syr" => [ N_("_: keyboard\nSyriac"), "us", "syr", 1 ], + "syr_p" => [ N_("_: keyboard\nSyriac (phonetic)"), "us", "syr_phonetic", 1 ], + "tel" => [ N_("_: keyboard\nTelugu"), "us", "tel", 1 ], # no console kbd that I'm aware of - "tml" => [ N_("Tamil (ISCII-layout)"), "us", "tml", 1 ], - "tscii" => [ N_("Tamil (Typewriter-layout)"), "us", "ta(UNI)", 1 ], - "th" => [ N_("Thai keyboard"), "th", "th", 1 ], + "tml" => [ N_("_: keyboard\nTamil (ISCII-layout)"), "us", "tml(INSCRIPT)", 1 ], + "tscii" => [ N_("_: keyboard\nTamil (Typewriter-layout)"), "us", "tml(UNI)", 1 ], + "th" => [ N_("_: keyboard\nThai"), "th", "th", 1 ], # TODO: console map - "tj" => [ N_("Tajik keyboard"), "ru4", "tj", 1 ], - "tr_f" => [ N_("Turkish (traditional \"F\" model)"), "trf", "tr_f", 0 ], - "tr_q" => [ N_("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ], -#-"tw => [ N_("Chineses bopomofo"), "tw", "tw", 1 ], - "ua" => [ N_("Ukrainian"), "ua", "ua", 1 ], + "tj" => [ N_("_: keyboard\nTajik"), "ru4", "tj", 1 ], + "tr_f" => [ N_("_: keyboard\nTurkish (traditional \"F\" model)"), "trf", "tr(tr_f)", 0 ], + "tr_q" => [ N_("_: keyboard\nTurkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ], +#-"tw => [ N_("_: keyboard\nChineses bopomofo"), "tw", "tw", 1 ], + "ua" => [ N_("_: keyboard\nUkrainian"), "ua", "ua", 1 ], "uk" => [ N_("UK keyboard"), "uk", "gb", 0 ], "us" => [ N_("US keyboard"), "us", "en_US", 0 ], "us_intl" => [ N_("US keyboard (international)"), "us-latin1", "us_intl", 0 ], - "uz" => [ N_("Uzbek (cyrillic)"), "uz.uni", "uz", 1 ], - "vn" => [ N_("Vietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn(toggle)", 0 ], - "yu" => [ N_("Yugoslavian (latin)"), "sr", "yu", 0 ], + "uz" => [ N_("_: keyboard\nUzbek (cyrillic)"), "uz.uni", "uz", 1 ], +# old XKB layout + "vn" => [ N_("_: keyboard\nVietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn(toggle)", 0 ], + "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "yu", 0 ], ), ); @@ -291,6 +301,7 @@ my %grp_toggles = ( shift_toggle => N_("Both Shift keys simultaneously"), ctrl_shift_toggle => N_("Control and Shift keys simultaneously"), caps_toggle => N_("CapsLock key"), + shift_caps_toggle => N_("Shift and CapsLock keys simultaneously"), ctrl_alt_toggle => N_("Ctrl and Alt keys simultaneously"), alt_shift_toggle => N_("Alt and Shift keys simultaneously"), menu_toggle => N_("\"Menu\" key"), @@ -454,10 +465,10 @@ sub keyboard2full_xkb { XkbModel => $XkbModel, XkbOptions => join(',', if_($keyboard->{GRP_TOGGLE}, - if_($keyboard->{GRP_TOGGLE} eq 'rwin_toggle', 'compose:rwin'), + if_($keyboard->{GRP_TOGGLE} ne 'rwin_toggle', 'compose:rwin'), "grp:$keyboard->{GRP_TOGGLE}", 'grp_led:scroll'), - if_(member($XkbLayout, 'az', 'tr', 'tr_f'), 'caps:shift')), + ), }; } @@ -535,13 +546,14 @@ sub write { $keyboard->{KEYTABLE} = keyboard2kmap($keyboard); setVarsInSh("$::prefix/etc/sysconfig/keyboard", $keyboard); - run_program::rooted($::prefix, 'dumpkeys', '>', '/etc/sysconfig/console/default.kmap') or log::l("dumpkeys failed"); if (arch() =~ /ppc/) { my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1\n"; substInFile { $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/; $_ .= $s if eof; } "$::prefix/etc/sysctl.conf"; + } else { + run_program::rooted($::prefix, 'dumpkeys', '>', '/etc/sysconfig/console/default.kmap') or log::l("dumpkeys failed"); } } |