diff options
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/fi | 16 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/hr | 56 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/jp | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/keypad | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/me | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/rs | 479 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/ru | 14 |
8 files changed, 281 insertions, 292 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index c924edf6d..59b03c338 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -3905,7 +3905,7 @@ <variant> <configItem> <name>cyrillicyz</name> - <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description> + <_description>Montenegrin (Cyrillic, ZE and ZHE swapped)</_description> </configItem> </variant> <variant> diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index 1818243dd..1bf9ff074 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -101,8 +101,7 @@ xkb_symbols "classic" { partial alphanumeric_keys hidden xkb_symbols "fi" { - // Classic Finnish keyboard layout with dead keys support - // and all ISO-8859-1 and ISO-8859-15 characters available + // Classic Finnish keyboard layout with dead keys key <TLDE> { [ section, onehalf, onequarter, threequarters ] }; key <AE01> { [ 1, exclam, exclamdown, onesuperior ] }; @@ -112,8 +111,8 @@ xkb_symbols "fi" { key <AE05> { [ 5, percent, EuroSign, masculine ] }; key <AE06> { [ 6, ampersand, yen, ordfeminine ] }; key <AE07> { [ 7, slash, braceleft, plusminus ] }; - key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ] }; - key <AE09> { [ 9, parenright, bracketright, guillemotright ] }; + key <AE08> { [ 8, parenleft, bracketleft, less ] }; + key <AE09> { [ 9, parenright, bracketright, greater ] }; key <AE10> { [ 0, equal, braceright, degree ] }; key <AE11> { [ plus, question, backslash, questiondown ] }; key <AE12> { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] }; @@ -205,9 +204,10 @@ xkb_symbols "mac" { name[Group1]="Finnish (Macintosh)"; }; -// EXTRAS: - partial alphanumeric_keys - xkb_symbols "sun_type6" { - include "sun_vndr/fi(sun_type6)" +xkb_symbols "sun_type6" { + + // Sun Type 6/7 keyboard for Finland + + include "sun_vndr/fi(sun_type6)" }; diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr index 61fc39221..cdceea1fe 100644 --- a/xorg-server/xkeyboard-config/symbols/hr +++ b/xorg-server/xkeyboard-config/symbols/hr @@ -4,12 +4,12 @@ xkb_symbols "basic" { include "rs(latin)" name[Group1]="Croatian"; - // Redefine these keys to match XFree86 Croatian layout - key <AE01> { [ 1, exclam, asciitilde, dead_tilde ] }; - key <AE03> { [ 3, numbersign, asciicircum, dead_circumflex ] }; - key <AE05> { [ 5, percent, degree, dead_abovering ] }; - key <AE07> { [ 7, slash, grave, dead_grave ] }; - key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] }; + // Redefine these keys to match the XFree86 Croatian layout. + key <AE01> { [ 1, exclam, asciitilde, dead_tilde ] }; + key <AE03> { [ 3, numbersign, asciicircum, dead_circumflex ] }; + key <AE05> { [ 5, percent, degree, dead_abovering ] }; + key <AE07> { [ 7, slash, grave, dead_grave ] }; + key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] }; }; partial alphanumeric_keys @@ -18,28 +18,28 @@ xkb_symbols "us" { include "us" name[Group1]= "Croatian (US keyboard with Croatian letters)"; - key <AD01> { [ any, any, backslash ] }; - key <AD02> { [ any, any, bar ] }; - key <AD03> { [ any, any, EuroSign ] }; - key <AD06> { [ any, any, z, Z ] }; - key <AD11> { [ any, any, scaron, Scaron ] }; - key <AD12> { [ any, any, dstroke, Dstroke ] }; - key <AC04> { [ any, any, bracketleft ] }; - key <AC05> { [ any, any, bracketright ] }; - key <AC08> { [ any, any, lstroke ] }; - key <AC09> { [ any, any, Lstroke ] }; - key <AC10> { [ any, any, ccaron, Ccaron ] }; - key <AC11> { [ any, any, cacute, Cacute ] }; - key <LSGT> { [ any, any, bar ] }; - key <AB01> { [ any, any, y, Y ] }; - key <AB04> { [ any, any, at ] }; - key <AB05> { [ any, any, braceleft ] }; - key <AB06> { [ any, any, braceright ] }; - key <AB07> { [ any, any, section ] }; - key <AB08> { [ any, any, semicolon ] }; - key <AB09> { [ any, any, colon ] }; - key <AB10> { [ any, any, minus, underscore ] }; - key <BKSL> { [ any, any, zcaron, Zcaron ] }; + key <AD01> { [ any, any, backslash ] }; + key <AD02> { [ any, any, bar ] }; + key <AD03> { [ any, any, EuroSign ] }; + key <AD06> { [ any, any, z, Z ] }; + key <AD11> { [ any, any, scaron, Scaron ] }; + key <AD12> { [ any, any, dstroke, Dstroke ] }; + key <AC04> { [ any, any, bracketleft ] }; + key <AC05> { [ any, any, bracketright ] }; + key <AC08> { [ any, any, lstroke ] }; + key <AC09> { [ any, any, Lstroke ] }; + key <AC10> { [ any, any, ccaron, Ccaron ] }; + key <AC11> { [ any, any, cacute, Cacute ] }; + key <LSGT> { [ any, any, bar ] }; + key <AB01> { [ any, any, y, Y ] }; + key <AB04> { [ any, any, at ] }; + key <AB05> { [ any, any, braceleft ] }; + key <AB06> { [ any, any, braceright ] }; + key <AB07> { [ any, any, section ] }; + key <AB08> { [ any, any, semicolon ] }; + key <AB09> { [ any, any, colon ] }; + key <AB10> { [ any, any, minus, underscore ] }; + key <BKSL> { [ any, any, zcaron, Zcaron ] }; include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index f0b2c4d75..26dfdf9bd 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -131,7 +131,7 @@ xkb_symbols "kana86" { name[Group1]= "Japanese (Kana 86)"; key <ESC> { [ Escape ] }; - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + key <NMLK> { [ Num_Lock ] }; key <BKSP> { [ BackSpace ] }; key <TAB> { [ Tab, ISO_Left_Tab ] }; key <RTRN> { [ Return ] }; diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index 9b49a5773..0187ecbeb 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -211,7 +211,7 @@ xkb_symbols "core" { modifier_map Mod2 { Num_Lock }; - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + key <NMLK> { [ Num_Lock ] }; key <KPEN> { [ KP_Enter ] }; key <KPEQ> { [ KP_Equal ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/me b/xorg-server/xkeyboard-config/symbols/me index acb37e76d..1ada63493 100644 --- a/xorg-server/xkeyboard-config/symbols/me +++ b/xorg-server/xkeyboard-config/symbols/me @@ -21,7 +21,7 @@ xkb_symbols "cyrillic" { partial alphanumeric_keys xkb_symbols "cyrillicyz" { include "rs(yz)" - name[Group1]= "Montenegrin (Cyrillic, Z and ZHE swapped)"; + name[Group1]= "Montenegrin (Cyrillic, ZE and ZHE swapped)"; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index 06025e17e..c39f4ed49 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -1,342 +1,331 @@ -// Bosnian, Croatian, Serbian and Slovenian XKB keyboard mapping -// (derived from "Danube" D.2) +// Bosnian, Croatian, Serbian and Slovenian XKB keyboard mappings. // -// Danube D.2 from 2003-05-12 is available at http://srpski.org/dunav/ +// Derived from "Danube" D.2 from 2003-05-12, +// which is available at http://srpski.org/dunav/. // // Original authors: // Danilo Segan (Данило Шеган) <danilo@kvota.net> // Chusslove Illich (Часлав Илић) <caslav.ilic@gmx.net> // // Danilo Segan <danilo@kvota.net>: -// - Modified for inclusion in XFree86 -// - Further modifications on 2005-08-18 to support Bosnian, Croatian -// and Slovenian in xkeyboard-config -// +// - Modified for inclusion in XFree86. +// - Further modifications on 2005-08-18 to support Bosnian, +// Croatian and Slovenian in xkeyboard-config. default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Serbian"; + name[Group1]= "Serbian"; - include "rs(cyrlevel3)" - include "rs(common)" - include "rs(cyralpha)" - include "level3(ralt_switch)" + include "rs(cyrlevel3)" + include "rs(common)" + include "rs(cyralpha)" + include "level3(ralt_switch)" }; - partial alphanumeric_keys xkb_symbols "latin" { - name[Group1]= "Serbian (Latin)"; + name[Group1]= "Serbian (Latin)"; - include "latin(type3)" - include "rs(latalpha)" - include "rs(latlevel3)" - include "rs(common)" - include "level3(ralt_switch)" + include "latin(type3)" + include "rs(latalpha)" + include "rs(latlevel3)" + include "rs(common)" + include "level3(ralt_switch)" }; - partial alphanumeric_keys xkb_symbols "yz" { - include "rs(basic)" - name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)"; + include "rs(basic)" + name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)"; - key <AD06> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // y - key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // z + key <AD06> { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // y + key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z }; partial hidden alphanumeric_keys xkb_symbols "common" { - // "Common" keys: keys which are same for both latin and cyrillic keyboards - - key.type[Group1] = "FOUR_LEVEL"; - - key <TLDE> { [ grave, asciitilde, any,any ] }; // - key <AE01> { [ 1, exclam, any,any ] }; // - key <AE02> { [ 2, quotedbl, any,any ] }; // - key <AE03> { [ 3, numbersign, any,any ] }; // - key <AE04> { [ 4, dollar, any,any ] }; // - key <AE05> { [ 5, percent, any,any ] }; // - key <AE06> { [ 6, ampersand, any,any ] }; // - key <AE07> { [ 7, slash, any,any ] }; // - key <AE08> { [ 8, parenleft, any,any ] }; // - key <AE09> { [ 9, parenright, any,any ] }; // - key <AE10> { [ 0, equal, any,any ] }; // - key <AE11> { [ apostrophe, question, any,any ] }; // - key <AE12> { [ plus, asterisk, any,any ] }; // - - key <AB08> { [ comma, semicolon, any,any ] }; // - key <AB09> { [ period, colon, any,any ] }; // - key <AB10> { [ minus, underscore, any,any ] }; // - - include "kpdl(comma)" + // "Common" keys: keys that are the same + // for both latin and cyrillic keyboards. + + key.type[Group1] = "FOUR_LEVEL"; + + key <TLDE> { [ grave, asciitilde, any, any ] }; + key <AE01> { [ 1, exclam, any, any ] }; + key <AE02> { [ 2, quotedbl, any, any ] }; + key <AE03> { [ 3, numbersign, any, any ] }; + key <AE04> { [ 4, dollar, any, any ] }; + key <AE05> { [ 5, percent, any, any ] }; + key <AE06> { [ 6, ampersand, any, any ] }; + key <AE07> { [ 7, slash, any, any ] }; + key <AE08> { [ 8, parenleft, any, any ] }; + key <AE09> { [ 9, parenright, any, any ] }; + key <AE10> { [ 0, equal, any, any ] }; + key <AE11> { [ apostrophe, question, any, any ] }; + key <AE12> { [ plus, asterisk, any, any ] }; + + key <AB08> { [ comma, semicolon, any, any ] }; + key <AB09> { [ period, colon, any, any ] }; + key <AB10> { [ minus, underscore, any, any ] }; + + include "kpdl(comma)" }; partial hidden alphanumeric_keys xkb_symbols "cyralpha" { - key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; - - key <AD01> { [ Cyrillic_lje, Cyrillic_LJE, any,any ] }; // q - key <AD02> { [ Cyrillic_nje, Cyrillic_NJE, any,any ] }; // w - key <AD03> { [ Cyrillic_ie, Cyrillic_IE, any,any ] }; // e - key <AD04> { [ Cyrillic_er, Cyrillic_ER, any,any ] }; // r - key <AD05> { [ Cyrillic_te, Cyrillic_TE, any,any ] }; // t - key <AD06> { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // y - key <AD07> { [ Cyrillic_u, Cyrillic_U, any,any ] }; // u - key <AD08> { [ Cyrillic_i, Cyrillic_I, any,any ] }; // i - key <AD09> { [ Cyrillic_o, Cyrillic_O, any,any ] }; // o - key <AD10> { [ Cyrillic_pe, Cyrillic_PE, any,any ] }; // p - key <AD11> { [ Cyrillic_sha, Cyrillic_SHA, any,any ] }; // [ { - key <AD12> { [ Serbian_dje, Serbian_DJE, any,any ] }; // ] } - - key <AC01> { [ Cyrillic_a, Cyrillic_A, any,any ] }; // a - key <AC02> { [ Cyrillic_es, Cyrillic_ES, any,any ] }; // s - key <AC03> { [ Cyrillic_de, Cyrillic_DE, any,any ] }; // d - key <AC04> { [ Cyrillic_ef, Cyrillic_EF, any,any ] }; // f - key <AC05> { [ Cyrillic_ghe, Cyrillic_GHE, any,any ] }; // g - key <AC06> { [ Cyrillic_ha, Cyrillic_HA, any,any ] }; // h - key <AC07> { [ Cyrillic_je, Cyrillic_JE, any,any ] }; // j - key <AC08> { [ Cyrillic_ka, Cyrillic_KA, any,any ] }; // k - key <AC09> { [ Cyrillic_el, Cyrillic_EL, any,any ] }; // l - key <AC10> { [ Cyrillic_che, Cyrillic_CHE, any,any ] }; // ; : - key <AC11> { [ Serbian_tshe, Serbian_TSHE, any,any ] }; // ' " - key <BKSL> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // \ | - - key <AB01> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // z - key <AB02> { [ Cyrillic_dzhe, Cyrillic_DZHE, any,any ] }; // x - key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, any,any ] }; // c - key <AB04> { [ Cyrillic_ve, Cyrillic_VE, any,any ] }; // v - key <AB05> { [ Cyrillic_be, Cyrillic_BE, any,any ] }; // b - key <AB06> { [ Cyrillic_en, Cyrillic_EN, any,any ] }; // n - key <AB07> { [ Cyrillic_em, Cyrillic_EM, any,any ] }; // m + key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; + + key <AD01> { [ Cyrillic_lje, Cyrillic_LJE, any, any ] }; // q + key <AD02> { [ Cyrillic_nje, Cyrillic_NJE, any, any ] }; // w + key <AD03> { [ Cyrillic_ie, Cyrillic_IE, any, any ] }; // e + key <AD04> { [ Cyrillic_er, Cyrillic_ER, any, any ] }; // r + key <AD05> { [ Cyrillic_te, Cyrillic_TE, any, any ] }; // t + key <AD06> { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // y + key <AD07> { [ Cyrillic_u, Cyrillic_U, any, any ] }; // u + key <AD08> { [ Cyrillic_i, Cyrillic_I, any, any ] }; // i + key <AD09> { [ Cyrillic_o, Cyrillic_O, any, any ] }; // o + key <AD10> { [ Cyrillic_pe, Cyrillic_PE, any, any ] }; // p + key <AD11> { [ Cyrillic_sha, Cyrillic_SHA, any, any ] }; // [ { + key <AD12> { [ Serbian_dje, Serbian_DJE, any, any ] }; // ] } + + key <AC01> { [ Cyrillic_a, Cyrillic_A, any, any ] }; // a + key <AC02> { [ Cyrillic_es, Cyrillic_ES, any, any ] }; // s + key <AC03> { [ Cyrillic_de, Cyrillic_DE, any, any ] }; // d + key <AC04> { [ Cyrillic_ef, Cyrillic_EF, any, any ] }; // f + key <AC05> { [ Cyrillic_ghe, Cyrillic_GHE, any, any ] }; // g + key <AC06> { [ Cyrillic_ha, Cyrillic_HA, any, any ] }; // h + key <AC07> { [ Cyrillic_je, Cyrillic_JE, any, any ] }; // j + key <AC08> { [ Cyrillic_ka, Cyrillic_KA, any, any ] }; // k + key <AC09> { [ Cyrillic_el, Cyrillic_EL, any, any ] }; // l + key <AC10> { [ Cyrillic_che, Cyrillic_CHE, any, any ] }; // ; : + key <AC11> { [ Serbian_tshe, Serbian_TSHE, any, any ] }; // ' " + key <BKSL> { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // \ | + + key <AB01> { [ Cyrillic_zhe, Cyrillic_ZHE, any, any ] }; // z + key <AB02> { [ Cyrillic_dzhe, Cyrillic_DZHE, any, any ] }; // x + key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, any, any ] }; // c + key <AB04> { [ Cyrillic_ve, Cyrillic_VE, any, any ] }; // v + key <AB05> { [ Cyrillic_be, Cyrillic_BE, any, any ] }; // b + key <AB06> { [ Cyrillic_en, Cyrillic_EN, any, any ] }; // n + key <AB07> { [ Cyrillic_em, Cyrillic_EM, any, any ] }; // m }; partial hidden alphanumeric_keys xkb_symbols "latalpha" { - key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; + key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; - key <AD11> { [ scaron, Scaron, any,any ] }; // - key <AD12> { [ dstroke, Dstroke, any,any ] }; // - - key <AC10> { [ ccaron, Ccaron, any,any ] }; // - key <AC11> { [ cacute, Cacute, any,any ] }; // - key <BKSL> { [ zcaron, Zcaron, any,any ] }; // + key <AD11> { [ scaron, Scaron, any, any ] }; // [ { + key <AD12> { [ dstroke, Dstroke, any, any ] }; // ] } + key <AC10> { [ ccaron, Ccaron, any, any ] }; // ; : + key <AC11> { [ cacute, Cacute, any, any ] }; // ' " + key <BKSL> { [ zcaron, Zcaron, any, any ] }; // \ | }; partial hidden alphanumeric_keys xkb_symbols "twoletter" { - // These are letters which are written in latin transcription with two-characters. - key <AD01> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", - [ U1C9, U1C8, any, U1C7 ] }; // q - key <AD02> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", - [ U1CC, U1CB, any, U1CA ] }; // w - key <AB02> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", - [ U1C6, U1C5, any, U1C4 ] }; // x + // Letters which are written in latin transcription with two characters. + key <AD01> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", + [ U1C9, U1C8, any, U1C7 ] }; // q + key <AD02> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", + [ U1CC, U1CB, any, U1CA ] }; // w + key <AB02> { type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC", + [ U1C6, U1C5, any, U1C4 ] }; // x - // Also replace letter Y with Zcaron, since Y is of no use any longer - key <AB01> { [ zcaron, Zcaron, any,any ] }; // + // Also replace letter Y with Zcaron, since Y is of no use any longer. + key <AB01> { [ zcaron, Zcaron, any, any ] }; // z }; partial hidden alphanumeric_keys xkb_symbols "latlevel3" { - key <TLDE> { [ any,any, notsign, notsign ] }; // ` ~ - key <AE01> { [ any,any, dead_tilde, asciitilde ] }; // 1 ! - key <AE02> { [ any,any, dead_caron, caron ] }; // 2 @ - key <AE03> { [ any,any, dead_circumflex, asciicircum ] }; // 3 # - key <AE04> { [ any,any, dead_breve, breve ] }; // 4 $ - key <AE05> { [ any,any, dead_abovering, degree ] }; // 5 % - key <AE06> { [ any,any, dead_ogonek, ogonek ] }; // 6 ^ - key <AE07> { [ any,any, dead_grave, grave ] }; // 7 & - key <AE08> { [ any,any, dead_abovedot, abovedot ] }; // 8 * - key <AE09> { [ any,any, dead_acute, apostrophe ] }; // 9 ( - key <AE10> { [ any,any, dead_doubleacute, doubleacute ] }; // 0 ) - key <AE11> { [ any,any, dead_diaeresis, diaeresis ] }; // - _ - key <AE12> { [ any,any, dead_cedilla, cedilla ] }; // = + - - key <AD01> { [ any,any, backslash, Greek_OMEGA ] }; // q - key <AD02> { [ any,any, bar, Lstroke ] }; // w - key <AD03> { [ any,any, EuroSign, EuroSign ] }; // e - key <AD04> { [ any,any, paragraph, registered ] }; // r - key <AD05> { [ any,any, tslash, Tslash ] }; // t // ALPHABETIC - key <AD06> { [ any,any, leftarrow, yen ] }; // y - key <AD07> { [ any,any, downarrow, uparrow ] }; // u - key <AD08> { [ any,any, rightarrow, idotless ] }; // i - key <AD09> { [ any,any, oslash, Ooblique ] }; // o // ALPHABETIC - key <AD10> { [ any,any, thorn, THORN ] }; // p // ALPHABETIC - key <AD11> { [ any,any, division, dead_abovering ] }; // [ - key <AD12> { [ any,any, multiply, dead_macron ] }; // ] - - key <AC01> { [ any,any, ae, AE ] }; // a // ALPHABETIC - key <AC02> { [ any,any, doublelowquotemark, guillemotright ] }; // s - key <AC03> { [ any,any, leftdoublequotemark, guillemotleft ] }; // d - key <AC04> { [ any,any, bracketleft, ordfeminine ] }; // f - key <AC05> { [ any,any, bracketright, ENG ] }; // g - key <AC06> { [ any,any, hstroke, Hstroke ] }; // h // ALPHABETIC - key <AC07> { [ any,any, NoSymbol, NoSymbol ] }; // j - key <AC08> { [ any,any, lstroke, ampersand ] }; // k - key <AC09> { [ any,any, lstroke, Lstroke ] }; // l - key <AC10> { [ any,any, dead_acute, dead_doubleacute ] }; // ; - key <AC11> { [ any,any, ssharp, dead_caron ] }; // ' - key <BKSL> { [ any,any, currency, dead_breve ] }; // \ - - key <AB01> { [ any,any, leftsinglequotemark, guillemotright ] }; // z - key <AB02> { [ any,any, rightsinglequotemark,guillemotleft ] }; // x - key <AB03> { [ any,any, cent, copyright ] }; // c - key <AB04> { [ any,any, at, grave ] }; // v - key <AB05> { [ any,any, braceleft, apostrophe ] }; // b - key <AB06> { [ any,any, braceright, braceright ] }; // n - key <AB07> { [ any,any, asciicircum, masculine ] }; // m - key <AB08> { [ any,any, less, multiply ] }; // , < - key <AB09> { [ any,any, greater, division ] }; // . > - key <AB10> { [ any,any, emdash, endash ] }; // / ? - + key <TLDE> { [ any, any, notsign, notsign ] }; // ` ~ + key <AE01> { [ any, any, dead_tilde, asciitilde ] }; // 1 ! + key <AE02> { [ any, any, dead_caron, caron ] }; // 2 @ + key <AE03> { [ any, any, dead_circumflex, asciicircum ] }; // 3 # + key <AE04> { [ any, any, dead_breve, breve ] }; // 4 $ + key <AE05> { [ any, any, dead_abovering, degree ] }; // 5 % + key <AE06> { [ any, any, dead_ogonek, ogonek ] }; // 6 ^ + key <AE07> { [ any, any, dead_grave, grave ] }; // 7 & + key <AE08> { [ any, any, dead_abovedot, abovedot ] }; // 8 * + key <AE09> { [ any, any, dead_acute, apostrophe ] }; // 9 ( + key <AE10> { [ any, any, dead_doubleacute, doubleacute ] }; // 0 ) + key <AE11> { [ any, any, dead_diaeresis, diaeresis ] }; // - _ + key <AE12> { [ any, any, dead_cedilla, cedilla ] }; // = + + + key <AD01> { [ any, any, backslash, Greek_OMEGA ] }; // q + key <AD02> { [ any, any, bar, Lstroke ] }; // w + key <AD03> { [ any, any, EuroSign, EuroSign ] }; // e + key <AD04> { [ any, any, paragraph, registered ] }; // r + key <AD05> { [ any, any, tslash, Tslash ] }; // t // ALPHABETIC + key <AD06> { [ any, any, leftarrow, yen ] }; // y + key <AD07> { [ any, any, downarrow, uparrow ] }; // u + key <AD08> { [ any, any, rightarrow, idotless ] }; // i + key <AD09> { [ any, any, oslash, Ooblique ] }; // o // ALPHABETIC + key <AD10> { [ any, any, thorn, THORN ] }; // p // ALPHABETIC + key <AD11> { [ any, any, division, dead_abovering ] }; // [ + key <AD12> { [ any, any, multiply, dead_macron ] }; // ] + + key <AC01> { [ any, any, ae, AE ] }; // a // ALPHABETIC + key <AC02> { [ any, any, doublelowquotemark, guillemotright ] }; // s + key <AC03> { [ any, any, leftdoublequotemark, guillemotleft ] }; // d + key <AC04> { [ any, any, bracketleft, ordfeminine ] }; // f + key <AC05> { [ any, any, bracketright, ENG ] }; // g + key <AC06> { [ any, any, hstroke, Hstroke ] }; // h // ALPHABETIC + key <AC07> { [ any, any, NoSymbol, NoSymbol ] }; // j + key <AC08> { [ any, any, lstroke, ampersand ] }; // k + key <AC09> { [ any, any, lstroke, Lstroke ] }; // l + key <AC10> { [ any, any, dead_acute, dead_doubleacute ] }; // ; + key <AC11> { [ any, any, ssharp, dead_caron ] }; // ' + key <BKSL> { [ any, any, currency, dead_breve ] }; // \ + + key <AB01> { [ any, any, leftsinglequotemark, guillemotright ] }; // z + key <AB02> { [ any, any, rightsinglequotemark,guillemotleft ] }; // x + key <AB03> { [ any, any, cent, copyright ] }; // c + key <AB04> { [ any, any, at, grave ] }; // v + key <AB05> { [ any, any, braceleft, apostrophe ] }; // b + key <AB06> { [ any, any, braceright, braceright ] }; // n + key <AB07> { [ any, any, asciicircum, masculine ] }; // m + key <AB08> { [ any, any, less, multiply ] }; // , < + key <AB09> { [ any, any, greater, division ] }; // . > + key <AB10> { [ any, any, emdash, endash ] }; // / ? }; partial hidden alphanumeric_keys xkb_symbols "cyrlevel3" { - key <TLDE> { [ any,any, degree, notsign ] }; // ` ~ - key <AE03> { [ any,any, dead_circumflex, NoSymbol ] }; // 3 # - key <AE07> { [ any,any, dead_grave, NoSymbol ] }; // 7 & - key <AE08> { [ any,any, dead_doublegrave, NoSymbol ] }; // 8 * - key <AE09> { [ any,any, dead_acute, NoSymbol ] }; // 9 ( - key <AE10> { [ any,any, dead_invertedbreve, NoSymbol ] }; // 0 ) - key <AE11> { [ any,any, dead_macron, NoSymbol ] }; // - _ - - key <AD01> { [ any,any, backslash, NoSymbol ] }; // q - key <AD02> { [ any,any, bar, NoSymbol ] }; // w - key <AD03> { [ any,any, EuroSign, sterling ] }; // e - key <AD04> { [ any,any, paragraph, registered ] }; // r - key <AD05> { [ any,any, ellipsis, NoSymbol ] }; // t // ALPHABETIC - key <AD06> { [ any,any, leftarrow, yen ] }; // y - key <AD07> { [ any,any, downarrow, uparrow ] }; // u - key <AD08> { [ any,any, rightarrow, NoSymbol ] }; // i - key <AD09> { [ any,any, section, NoSymbol ] }; // o // ALPHABETIC - key <AD11> { [ any,any, division, NoSymbol ] }; // [ - key <AD12> { [ any,any, multiply, NoSymbol ] }; // ] - - key <AC02> { [ any,any, doublelowquotemark, guillemotright ] }; // s - key <AC03> { [ any,any, leftdoublequotemark, guillemotleft ] }; // d - key <AC04> { [ any,any, bracketleft, NoSymbol ] }; // f - key <AC05> { [ any,any, bracketright, NoSymbol ] }; // g - key <BKSL> { [ any,any, currency, NoSymbol ] }; // \ - - key <AB01> { [ any,any, leftsinglequotemark, NoSymbol ] }; // z - key <AB02> { [ any,any, rightsinglequotemark,NoSymbol ] }; // x - key <AB03> { [ any,any, cent, copyright ] }; // c - key <AB04> { [ any,any, at, NoSymbol ] }; // v - key <AB05> { [ any,any, braceleft, NoSymbol ] }; // b - key <AB06> { [ any,any, braceright, NoSymbol ] }; // n - key <AB07> { [ any,any, asciicircum, NoSymbol ] }; // m - key <AB08> { [ any,any, less, NoSymbol ] }; // , < - key <AB09> { [ any,any, greater, NoSymbol ] }; // . > - key <AB10> { [ any,any, emdash, endash ] }; // / ? + key <TLDE> { [ any, any, degree, notsign ] }; // ` ~ + key <AE03> { [ any, any, dead_circumflex, NoSymbol ] }; // 3 # + key <AE07> { [ any, any, dead_grave, NoSymbol ] }; // 7 & + key <AE08> { [ any, any, dead_doublegrave, NoSymbol ] }; // 8 * + key <AE09> { [ any, any, dead_acute, NoSymbol ] }; // 9 ( + key <AE10> { [ any, any, dead_invertedbreve, NoSymbol ] }; // 0 ) + key <AE11> { [ any, any, dead_macron, NoSymbol ] }; // - _ + + key <AD01> { [ any, any, backslash, NoSymbol ] }; // q + key <AD02> { [ any, any, bar, NoSymbol ] }; // w + key <AD03> { [ any, any, EuroSign, sterling ] }; // e + key <AD04> { [ any, any, paragraph, registered ] }; // r + key <AD05> { [ any, any, ellipsis, NoSymbol ] }; // t // ALPHABETIC + key <AD06> { [ any, any, leftarrow, yen ] }; // y + key <AD07> { [ any, any, downarrow, uparrow ] }; // u + key <AD08> { [ any, any, rightarrow, NoSymbol ] }; // i + key <AD09> { [ any, any, section, NoSymbol ] }; // o // ALPHABETIC + key <AD11> { [ any, any, division, NoSymbol ] }; // [ + key <AD12> { [ any, any, multiply, NoSymbol ] }; // ] + + key <AC02> { [ any, any, doublelowquotemark, guillemotright ] }; // s + key <AC03> { [ any, any, leftdoublequotemark, guillemotleft ] }; // d + key <AC04> { [ any, any, bracketleft, NoSymbol ] }; // f + key <AC05> { [ any, any, bracketright, NoSymbol ] }; // g + key <BKSL> { [ any, any, currency, NoSymbol ] }; // \ + + key <AB01> { [ any, any, leftsinglequotemark, NoSymbol ] }; // z + key <AB02> { [ any, any, rightsinglequotemark,NoSymbol ] }; // x + key <AB03> { [ any, any, cent, copyright ] }; // c + key <AB04> { [ any, any, at, NoSymbol ] }; // v + key <AB05> { [ any, any, braceleft, NoSymbol ] }; // b + key <AB06> { [ any, any, braceright, NoSymbol ] }; // n + key <AB07> { [ any, any, asciicircum, NoSymbol ] }; // m + key <AB08> { [ any, any, less, NoSymbol ] }; // , < + key <AB09> { [ any, any, greater, NoSymbol ] }; // . > + key <AB10> { [ any, any, emdash, endash ] }; // / ? }; partial alphanumeric_keys xkb_symbols "latinunicode" { - // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj - // as single character). You get the title form with AltGr+Shift. + // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj + // as single character). You get the title form with AltGr+Shift. - include "rs(latin)" + include "rs(latin)" + name[Group1]= "Serbian (Latin Unicode)"; - name[Group1]= "Serbian (Latin Unicode)"; - - include "rs(twoletter)" + include "rs(twoletter)" }; partial alphanumeric_keys xkb_symbols "latinyz" { - // For those who insist on using "english-position" Z and Y. - - include "rs(latin)" + // For those who insist on using "english-position" Z and Y. - name[Group1]= "Serbian (Latin qwerty)"; + include "rs(latin)" + name[Group1]= "Serbian (Latin qwerty)"; - key <AD06> { [ y, Y, any,any ] }; // y - key <AB01> { [ z, Z, any,any ] }; // z + key <AD06> { [ y, Y, any, any ] }; // y + key <AB01> { [ z, Z, any, any ] }; // z }; partial alphanumeric_keys xkb_symbols "latinunicodeyz" { - // Unicode, ZHE and Z swapped. - - include "rs(latinunicode)" + // Unicode, ZHE and Z swapped. - name[Group1]= "Serbian (Latin Unicode qwerty)"; + include "rs(latinunicode)" + name[Group1]= "Serbian (Latin Unicode qwerty)"; - key <AD06> { [ zcaron, Zcaron, any,any ] }; // y - key <AB01> { [ z, Z, any,any ] }; // z + key <AD06> { [ zcaron, Zcaron, any, any ] }; // y + key <AB01> { [ z, Z, any, any ] }; // z }; xkb_symbols "alternatequotes" { - // Another acceptable »pair of quotes« for Serbian + // Another acceptable »pair of quotes« for Serbian. - include "rs(basic)" + include "rs(basic)" + name[Group1]= "Serbian (Cyrillic with guillemets)"; - name[Group1]= "Serbian (Cyrillic with guillemets)"; - - key <AC02> { [ any,any, guillemotright, NoSymbol ] }; // s - key <AC03> { [ any,any, guillemotleft, NoSymbol ] }; // d + key <AC02> { [ any, any, guillemotright, NoSymbol ] }; // s + key <AC03> { [ any, any, guillemotleft, NoSymbol ] }; // d }; xkb_symbols "latinalternatequotes" { - // Another acceptable »pair of quotes« for Serbian - - include "rs(latin)" + // Another acceptable »pair of quotes« for Serbian. - name[Group1]= "Serbian (Latin with guillemets)"; + include "rs(latin)" + name[Group1]= "Serbian (Latin with guillemets)"; - key <AC02> { [ any,any, guillemotright, NoSymbol ] }; // s - key <AC03> { [ any,any, guillemotleft, NoSymbol ] }; // d + key <AC02> { [ any, any, guillemotright, NoSymbol ] }; // s + key <AC03> { [ any, any, guillemotleft, NoSymbol ] }; // d }; xkb_symbols "rue" { - // Layout for Pannonian Rusyn (spoken mainly in Serbia and - // Croatia by the Rusyn people), based on Serbian Cyrillic layout. - // Authors: - // Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com> - // Mihajlo Hornjak <smeceiotpad@gmail.com> - - include "rs(basic)" + // Layout for Pannonian Rusyn (spoken mainly in Serbia and Croatia + // by the Rusyn people), based on Serbian Cyrillic layout. + // Authors: + // Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com> + // Mihajlo Hornjak <smeceiotpad@gmail.com> - name[Group1]= "Pannonian Rusyn"; + include "rs(basic)" + name[Group1]= "Pannonian Rusyn"; - key <TLDE> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ` + key <TLDE> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ` - key <AD01> { [ Cyrillic_ya, Cyrillic_YA ] }; // q - key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] }; // w - key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // ] + key <AD01> { [ Cyrillic_ya, Cyrillic_YA ] }; // q + key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] }; // w + key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // ] - key <AC05> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; // g - key <AC07> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // j - key <AC11> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // ' + key <AC05> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; // g + key <AC07> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // j + key <AC11> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // ' - key <AB01> { [ Cyrillic_yu, Cyrillic_YU ] }; // z - key <AB02> { [ Ukrainian_yi, Ukrainian_YI ] }; // x + key <AB01> { [ Cyrillic_yu, Cyrillic_YU ] }; // z + key <AB02> { [ Ukrainian_yi, Ukrainian_YI ] }; // x }; // EXTRAS: xkb_symbols "combiningkeys" { - // Raw combining characters instead of dead keys, - // especially good for post-accenting texts. - - include "rs(basic)" - - name[Group1]= "Serbian (combining accents instead of dead keys)"; - - key <AE03> { [ any,any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT - key <AE07> { [ any,any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT - key <AE08> { [ any,any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT - key <AE09> { [ any,any, U0301, NoSymbol ] }; // 9, U0301 = COMBINING ACUTE ACCENT - key <AE10> { [ any,any, U0311, NoSymbol ] }; // 0, U0311 = COMBINING INVERTED BREVE - key <AE11> { [ any,any, U0304, NoSymbol ] }; // -, U0304 = COMBINING MACRON + // Raw combining characters instead of dead keys, + // especially good for post-accenting texts. + + include "rs(basic)" + name[Group1]= "Serbian (combining accents instead of dead keys)"; + + key <AE03> { [ any, any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT + key <AE07> { [ any, any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT + key <AE08> { [ any, any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT + key <AE09> { [ any, any, U0301, NoSymbol ] }; // 9, U0301 = COMBINING ACUTE ACCENT + key <AE10> { [ any, any, U0311, NoSymbol ] }; // 0, U0311 = COMBINING INVERTED BREVE + key <AE11> { [ any, any, U0304, NoSymbol ] }; // -, U0304 = COMBINING MACRON }; diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index 2b34a4d52..fd1cc0ec5 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -182,7 +182,7 @@ xkb_symbols "phonetic" { key <LatA> { [ Cyrillic_a, Cyrillic_A ] }; key <LatW> { [ Cyrillic_ve, Cyrillic_VE ] }; key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] }; - key <LatX> { [ Cyrillic_ha, Cyrillic_HA ] }; + key <LatX> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; key <LatD> { [ Cyrillic_de, Cyrillic_DE ] }; key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] }; key <LatV> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; @@ -191,7 +191,7 @@ xkb_symbols "phonetic" { key <LatR> { [ Cyrillic_er, Cyrillic_ER ] }; key <LatN> { [ Cyrillic_en, Cyrillic_EN ] }; key <LatB> { [ Cyrillic_be, Cyrillic_BE ] }; - key <LatH> { [ Cyrillic_che, Cyrillic_CHE ] }; + key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] }; key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] }; key <LatY> { [ Cyrillic_yeru, Cyrillic_YERU ] }; key <LatM> { [ Cyrillic_em, Cyrillic_EM ] }; @@ -204,7 +204,7 @@ xkb_symbols "phonetic" { key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] }; key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] }; - key <AE12> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key <AE12> { [ Cyrillic_che, Cyrillic_CHE ] }; key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; key <BKSL> { [ Cyrillic_e, Cyrillic_E ] }; }; @@ -268,10 +268,10 @@ xkb_symbols "cv" { key.type[group1]="FOUR_LEVEL"; - key <AD03> { [ Cyrillic_u, Cyrillic_U, U04F3, U04F2 ] }; - key <AD05> { [ Cyrillic_ie, Cyrillic_IE, U04D7, U04D6 ] }; - key <AC04> { [ Cyrillic_a, Cyrillic_A, U04D1, U04D0 ] }; - key <AB03> { [ Cyrillic_es, Cyrillic_ES, U04AB, U04AA ] }; + key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x010004f3, 0x010004f2 ] }; + key <AD05> { [ Cyrillic_ie, Cyrillic_IE, 0x010004d7, 0x010004d6 ] }; + key <AC04> { [ Cyrillic_a, Cyrillic_A, 0x010004d1, 0x010004d0 ] }; + key <AB03> { [ Cyrillic_es, Cyrillic_ES, 0x010004ab, 0x010004aa ] }; include "level3(ralt_switch)" }; |