From 438af0c7d4bf60b408b259c88205ff2193195466 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 21 Sep 2014 18:11:28 +0200 Subject: libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014 plink revision 10233 xserver commit 28337cb14e4347e1dd7936c5393a22e042866687 xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a glproto commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0 libxtrans commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96 mesa commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f --- .../xkeyboard-config/rules/base.extras.xml.in | 292 ++++++++++++--------- xorg-server/xkeyboard-config/rules/base.xml.in | 269 +++++++++++-------- xorg-server/xkeyboard-config/symbols/altwin | 4 +- xorg-server/xkeyboard-config/symbols/am | 2 - xorg-server/xkeyboard-config/symbols/apl | 27 +- xorg-server/xkeyboard-config/symbols/ara | 3 +- xorg-server/xkeyboard-config/symbols/bg | 2 +- xorg-server/xkeyboard-config/symbols/br | 1 - xorg-server/xkeyboard-config/symbols/brai | 2 +- xorg-server/xkeyboard-config/symbols/capslock | 24 +- xorg-server/xkeyboard-config/symbols/epo | 3 +- xorg-server/xkeyboard-config/symbols/fi | 2 +- xorg-server/xkeyboard-config/symbols/group | 2 +- xorg-server/xkeyboard-config/symbols/inet | 18 +- xorg-server/xkeyboard-config/symbols/ir | 67 ++--- xorg-server/xkeyboard-config/symbols/jp | 2 +- xorg-server/xkeyboard-config/symbols/keypad | 10 +- xorg-server/xkeyboard-config/symbols/kr | 4 +- xorg-server/xkeyboard-config/symbols/kz | 2 - xorg-server/xkeyboard-config/symbols/level3 | 2 +- xorg-server/xkeyboard-config/symbols/pc | 2 +- xorg-server/xkeyboard-config/symbols/rs | 12 +- xorg-server/xkeyboard-config/symbols/ru | 2 +- 23 files changed, 417 insertions(+), 337 deletions(-) (limited to 'xorg-server/xkeyboard-config') diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 2bda88ba7..2e1e89d6b 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -8,7 +8,9 @@ apl <_shortDescription>apl <_description>APL keyboard symbols - eng + + eng + @@ -60,7 +62,9 @@ ca <_shortDescription>fr <_description>French (Canada) - fra + + fra + @@ -133,14 +137,18 @@ ir <_shortDescription>fa <_description>Persian - per + + per + ave <_description>Avestan - ave + + ave + @@ -150,7 +158,9 @@ lt <_shortDescription>lt <_description>Lithuanian - lit + + lit + @@ -210,7 +220,7 @@ minuskeydvorakprogr - <_description>Latvian (programmer US Dvorak, minus variant) + <_description>Latvian (programmer US Dvorak, minus variant) @@ -238,7 +248,9 @@ us <_shortDescription>en <_description>English (US) - eng + + eng + @@ -264,17 +276,21 @@ crd <_description>Coeur d'Alene Salish - crd + + crd + cz_sk_de <_description>Czech Slovak and German (US) - eng - cze - slo - ger + + eng + cze + slo + ger + @@ -296,7 +312,9 @@ pl <_shortDescription>pl <_description>Polish - pol + + pol + @@ -324,7 +342,9 @@ ro <_shortDescription>ro <_description>Romanian - rum + + rum + @@ -356,7 +376,9 @@ rs <_shortDescription>sr <_description>Serbian - srp + + srp + @@ -378,7 +400,9 @@ chu <_description>Church Slavonic - chu + + chu + @@ -386,9 +410,11 @@ ruu <_shortDescription>ru <_description>Russian (with Ukrainian-Belorussian layout) - rus - ukr - bel + + rus + ukr + bel + @@ -417,19 +443,23 @@ - + il <_shortDescription>he <_description>Hebrew - heb + + heb + biblicalSIL <_description>Hebrew (Biblical, SIL phonetic) - heb + + heb + @@ -439,173 +469,173 @@ ara <_shortDescription>ar <_description>Arabic - - + + sun_type6 <_description>Arabic (Sun Type 6/7) - - + + be <_shortDescription>be <_description>Belgian - - + + sun_type6 <_description>Belgian (Sun Type 6/7) - - + + br <_shortDescription>pt <_description>Portuguese (Brazil) - - + + sun_type6 <_description>Portuguese (Brazil, Sun Type 6/7) - - + + cz <_shortDescription>cs <_description>Czech - - + + sun_type6 <_description>Czech (Sun Type 6/7) - - + + dk <_shortDescription>da <_description>Danish - - + + sun_type6 <_description>Danish (Sun Type 6/7) - - + + nl <_shortDescription>nl <_description>Dutch - - + + sun_type6 <_description>Dutch (Sun Type 6/7) - - + + ee <_shortDescription>et <_description>Estonian - - + + sun_type6 <_description>Estonian (Sun Type 6/7) - - + + fi <_shortDescription>fi <_description>Finnish - - + + sun_type6 <_description>Finnish (Sun Type 6/7) - - + + fr <_shortDescription>fr <_description>French - - + + sun_type6 <_description>French (Sun Type 6/7) - - + + gr <_shortDescription>gr <_description>Greek - - + + sun_type6 <_description>Greek (Sun Type 6/7) - - + + it <_shortDescription>it <_description>Italian - - + + sun_type6 <_description>Italian (Sun Type 6/7) - - + + jp <_shortDescription>ja <_description>Japanese - - + + sun_type6 @@ -624,68 +654,68 @@ <_description>Japanese (Sun Type 7 - sun compatible) - - + + no <_shortDescription>no <_description>Norwegian - - + + sun_type6 <_description>Norwegian (Sun Type 6/7) - - + + pt <_shortDescription>pt <_description>Portuguese - - + + sun_type6 <_description>Portuguese (Sun Type 6/7) - - + + sk <_shortDescription>sk <_description>Slovak - - + + sun_type6 <_description>Slovak (Sun Type 6/7) - - + + es <_shortDescription>es <_description>Spanish - - + + sun_type6 <_description>Spanish (Sun Type 6/7) - - + + se @@ -712,8 +742,8 @@ ch <_shortDescription>de <_description>German (Switzerland) - - + + sun_type6_de @@ -726,93 +756,93 @@ <_description>French (Switzerland, Sun Type 6/7) - - + + tr <_shortDescription>tr <_description>Turkish - - + + sun_type6 <_description>Turkish (Sun Type 6/7) - - + + ua <_shortDescription>uk <_description>Ukrainian - - + + sun_type6 <_description>Ukrainian (Sun Type 6/7) - - + + gb <_shortDescription>en <_description>English (UK) - - + + sun_type6 <_description>English (UK, Sun Type 6/7) - - + + kr <_shortDescription>ko <_description>Korean - - + + sun_type6 <_description>Korean (Sun Type 6/7) - - - - - eu - - <_shortDescription>eu - <_description>EurKEY (US based layout with european letters) - - cat - dan - eng - est - fao - fin - ger - gre - gsw - ita - lav - lit - nld - nor - por - spa - swe - + + + + + eu + + <_shortDescription>eu + <_description>EurKEY (US based layout with european letters) + + cat + dan + eng + est + fao + fin + ger + gre + gsw + ita + lav + lit + nld + nor + por + spa + swe + diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index a7aa5de29..3fd0ce427 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -856,21 +856,21 @@ - microsoftmult + microsoftmult <_description>Microsoft Wireless Multimedia Keyboard 1.0A Microsoft Inc. - microsoftelite + microsoftelite <_description>Microsoft Natural Keyboard Elite Microsoft Inc. - microsoftccurve2k + microsoftccurve2k <_description>Microsoft Comfort Curve Keyboard 2000 Microsoft Inc. @@ -1406,9 +1406,11 @@ altgr-intl <_description>English (international AltGr dead keys) - eng - fra - ger + + eng + fra + ger + @@ -1421,11 +1423,13 @@ hbs <_description>Serbo-Croatian (US) - eng - bos - hbs - hrv - srp + + eng + bos + hbs + hrv + srp + @@ -1717,9 +1721,11 @@ <_shortDescription>be <_description>Belgian - ger - nld - fra + + ger + nld + fra + @@ -1819,35 +1825,45 @@ ben_baishakhi <_description>Bangla (India, Baishakhi) - ben + + ben + ben_bornona <_description>Bangla (India, Bornona) - ben - + + ben + + ben_gitanjali <_description>Bangla (India, Uni Gitanjali) - ben + + ben + ben_inscript <_description>Bangla (India, Baishakhi Inscript) - ben + + ben + eeyek <_description>Manipuri (Eeyek) - mni + + mni + @@ -1933,7 +1949,9 @@ <_shortDescription>ml <_description>Malayalam (enhanced Inscript, with rupee sign) - mal + + mal + @@ -2326,14 +2344,18 @@ <_shortDescription>cm <_description>English (Cameroon) - eng + + eng + french <_description>French (Cameroon) - fra + + fra + @@ -2817,8 +2839,10 @@ <_shortDescription>ar <_description>Iraqi - ara - kur + + ara + kur + @@ -2919,7 +2943,9 @@ smi <_description>Northern Saami (Finland) - sme + + sme + @@ -3232,14 +3258,18 @@ ro <_description>Romanian (Germany) - rum + + rum + ro_nodeadkeys <_description>Romanian (Germany, eliminate dead keys) - rum + + rum + @@ -3705,16 +3735,20 @@ <_shortDescription>ru <_description>Russian (Kazakhstan, with Kazakh) - kaz - rus + + kaz + rus + kazrus <_description>Kazakh (with Russian) - kaz - rus + + kaz + rus + @@ -3734,7 +3768,8 @@ stea <_description>Lao (STEA proposed standard layout) - lao + + lao @@ -4064,7 +4099,7 @@ <_description>Norwegian (Macintosh, eliminate dead keys) - + colemak <_description>Norwegian (Colemak) @@ -4126,7 +4161,9 @@ szl <_description>Silesian - szl + + szl + @@ -4387,8 +4424,10 @@ srp <_description>Serbian (Russia) - rus - srp + + rus + srp + @@ -4668,7 +4707,9 @@ swl <_description>Swedish Sign Language - swl + + swl + @@ -4679,8 +4720,10 @@ <_shortDescription>de <_description>German (Switzerland) - ger - gsw + + ger + gsw + @@ -5578,33 +5621,37 @@ <_shortDescription>ph <_description>Filipino - eng - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + eng + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + qwerty-bay <_description>Filipino (QWERTY Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5617,16 +5664,18 @@ capewell-dvorak-bay <_description>Filipino (Capewell-Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5639,16 +5688,18 @@ capewell-qwerf2k6-bay <_description>Filipino (Capewell-QWERF 2006 Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5661,16 +5712,18 @@ colemak-bay <_description>Filipino (Colemak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5683,16 +5736,18 @@ dvorak-bay <_description>Filipino (Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5702,7 +5757,9 @@ md <_shortDescription>md <_description>Moldavian - rum + + rum + @@ -5710,7 +5767,9 @@ gag <_shortDescription>gag <_description>Moldavian (Gagauz) - gag + + gag + @@ -5848,7 +5907,7 @@ grp:rctrl_rshift_toggle <_description>Right Ctrl+Right Shift - + - diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin index 239d4878c..76a289ad1 100644 --- a/xorg-server/xkeyboard-config/symbols/altwin +++ b/xorg-server/xkeyboard-config/symbols/altwin @@ -93,7 +93,7 @@ xkb_symbols "swap_alt_win" { }; // Swap the left Alt and Win keys. -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "swap_lalt_lwin" { key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Super_L ] }; @@ -101,7 +101,7 @@ xkb_symbols "swap_lalt_lwin" { }; // Swap the right Alt and Win keys. -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "swap_ralt_rwin" { key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Super_R ] }; diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am index dbe6e96d8..21ff1e872 100644 --- a/xorg-server/xkeyboard-config/symbols/am +++ b/xorg-server/xkeyboard-config/symbols/am @@ -63,8 +63,6 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "olpc" { include "am(basic)" - name[Group1]= "Armenian"; - include "group(olpc)" }; diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl index c60f11723..4d81ac295 100644 --- a/xorg-server/xkeyboard-config/symbols/apl +++ b/xorg-server/xkeyboard-config/symbols/apl @@ -62,9 +62,9 @@ xkb_symbols "basic" { // ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { - name[Group1]= "APL"; + name[Group1]= "APL keyboard symbols"; key { [ U2282 ] }; // Z: ⊂ -- Subset Of key { [ U2283 ] }; // X: ⊃ -- Superset Of @@ -129,7 +129,7 @@ xkb_symbols "common" { partial alphanumeric_keys xkb_symbols "unified" { - name[Group1]= "APL Keyboard Symbols: Unified Layout"; + name[Group1]= "APL keyboard symbols (unified)"; include "apl(common)" @@ -162,7 +162,7 @@ xkb_symbols "unified" { partial alphanumeric_keys xkb_symbols "sax" { - name[Group1]= "APL Keyboard Symbols"; + name[Group1]= "APL keyboard symbols (sax)"; include "apl(unified)" @@ -224,7 +224,7 @@ xkb_symbols "sax" { partial alphanumeric_keys xkb_symbols "apl2" { - name[Group1]= "APL Keyboard Symbols: IBM APL2"; + name[Group1]= "APL keyboard symbols (IBM APL2)"; include "apl(common)" @@ -284,7 +284,7 @@ xkb_symbols "apl2" { partial alphanumeric_keys xkb_symbols "aplplusII" { - name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II"; + name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)"; // AFS - short for APL Functional Symbol include "apl(apl2)" @@ -321,7 +321,7 @@ xkb_symbols "aplplusII" { partial alphanumeric_keys xkb_symbols "aplx" { - name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout"; + name[Group1]= "APL keyboard symbols (APLX unified)"; include "apl(unified)" @@ -372,9 +372,8 @@ xkb_symbols "aplx" { // the alphabet and similar. If this keyboard is placed as the 2nd layout then it can // be reached with a latching shift to increase group by one. -partial alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "dyalog_base" { - name[Group1]="APL"; // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ @@ -445,9 +444,8 @@ xkb_symbols "dyalog_base" { key { [ U22c4, currency] }; // diamond }; -partial keypad_keys +hidden partial keypad_keys xkb_symbols "dyalog_box" { - name[Group1]="Dyalog box"; // ┌───┬───┬───┬───┐ // │ │ │ │ │ @@ -473,10 +471,9 @@ xkb_symbols "dyalog_box" { key { [ U2510 ] }; // box drawing light down and left key { [ U2502 ] }; // box drawing light vertical -}; +}; -xkb_symbols "dyalog_codes" { - name[Group1]="Dyalog Codes"; +hidden xkb_symbols "dyalog_codes" { // Layout of private use area for this. In the style of the Unicode book // @@ -613,6 +610,6 @@ xkb_symbols "dyalog" { include "apl(dyalog_base)" include "apl(dyalog_box)" include "apl(dyalog_codes)" - name[Group1] = "Dyalog APL complete"; + name[Group1] = "APL keyboard symbols (Dyalog)"; }; diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index d048b0090..9c1d57e09 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -96,7 +96,6 @@ xkb_symbols "azerty" { partial hidden alphanumeric_keys xkb_symbols "digits_KP" { - name[Group1]= "Arabic (digits_KP)"; // Use Arabic-script digits on the keypad. @@ -120,7 +119,7 @@ xkb_symbols "digits" { include "ara(basic)" name[Group1]= "Arabic (digits)"; - // Use Arabic-script digits on the numberic row. + // Use Arabic-script digits on the numeric row. key { [ 0x1000661, exclam ] }; key { [ 0x1000662, at ] }; diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg index f44b5c60d..1de6c3065 100644 --- a/xorg-server/xkeyboard-config/symbols/bg +++ b/xorg-server/xkeyboard-config/symbols/bg @@ -190,7 +190,7 @@ xkb_symbols "bas_phonetic" { // This is an extended variant of the standard Latin QWERTY layout with // additional symbols in levels 3 and 4. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latin" { key {[ grave, asciitilde, U2248, U2245 ]}; diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br index 85f5f5522..f65d13aa1 100644 --- a/xorg-server/xkeyboard-config/symbols/br +++ b/xorg-server/xkeyboard-config/symbols/br @@ -64,7 +64,6 @@ partial alphanumeric_keys xkb_symbols "thinkpad" { include "br(abnt2)" - name[Group1]="Portuguese (Brazil)"; key { [ slash, question, degree, questiondown ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai index 66364e60e..46bc2c6b6 100644 --- a/xorg-server/xkeyboard-config/symbols/brai +++ b/xorg-server/xkeyboard-config/symbols/brai @@ -48,7 +48,7 @@ xkb_symbols "right_hand" { }; // 6-dot patterns on the keypad -partial hidden keypad_keys +hidden partial keypad_keys xkb_symbols "keypad" { key { [ braille_dot_1 ] }; key { [ braille_dot_2 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock index 928d79a3e..3f4a0cd70 100644 --- a/xorg-server/xkeyboard-config/symbols/capslock +++ b/xorg-server/xkeyboard-config/symbols/capslock @@ -1,27 +1,27 @@ -default partial hidden modifier_keys +default hidden partial modifier_keys xkb_symbols "capslock" { replace key { [ Caps_Lock ] }; modifier_map Lock { Caps_Lock }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "shiftlock" { replace key { [ Shift_Lock ] }; modifier_map Shift { Shift_Lock }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "grouplock" { replace key { [ ISO_Next_Group, Caps_Lock ] }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "swapescape" { key { [ Escape ] }; key { [ Caps_Lock ] }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "groupshift" { key { type[Group1] = "PC_ALT_LEVEL2", @@ -29,41 +29,41 @@ xkb_symbols "groupshift" { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "escape" { key { [ Escape ] }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "backspace" { key { [ BackSpace ] }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "super" { key { [ Super_L ] }; modifier_map Mod4 { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "hyper" { key { [ Hyper_L ] }; modifier_map Mod4 { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "none" { key { [ VoidSymbol ] }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "numlock" { key { [ Num_Lock ] }; }; // This changes the key to become a Control modifier, // but it will still produce the Caps_Lock keysym. -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "ctrl_modifier" { replace key { type[Group1] = "ONE_LEVEL", diff --git a/xorg-server/xkeyboard-config/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo index 1f7f3fc7c..1d4000948 100644 --- a/xorg-server/xkeyboard-config/symbols/epo +++ b/xorg-server/xkeyboard-config/symbols/epo @@ -10,9 +10,8 @@ default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Esperanto"; - include "us(basic)" + name[Group1]= "Esperanto"; key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index 1bf9ff074..6afed2106 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -98,7 +98,7 @@ xkb_symbols "classic" { name[Group1]="Finnish (classic)"; }; -partial alphanumeric_keys hidden +hidden partial alphanumeric_keys xkb_symbols "fi" { // Classic Finnish keyboard layout with dead keys diff --git a/xorg-server/xkeyboard-config/symbols/group b/xorg-server/xkeyboard-config/symbols/group index 91be4863f..8b00dff6e 100644 --- a/xorg-server/xkeyboard-config/symbols/group +++ b/xorg-server/xkeyboard-config/symbols/group @@ -410,7 +410,7 @@ xkb_symbols "alt_caps_toggle" { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "olpc" { key { [ ISO_Next_Group, ISO_Prev_Group ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet index 613488f05..33b058397 100644 --- a/xorg-server/xkeyboard-config/symbols/inet +++ b/xorg-server/xkeyboard-config/symbols/inet @@ -14,7 +14,7 @@ // setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type' // Very common set of media keys. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "media_common" { key { [ XF86AudioMedia ] }; key { [ XF86AudioPrev ] }; @@ -29,7 +29,7 @@ xkb_symbols "media_common" { }; // Popular web navigation keys. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "nav_common" { key { [ XF86Calculator ] }; key { [ XF86WWW ] }; @@ -45,7 +45,7 @@ xkb_symbols "nav_common" { }; // ACPI Standard -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "acpi_common" { key { [ XF86PowerOff ] }; key { [ XF86Standby ] }; @@ -56,26 +56,26 @@ xkb_symbols "acpi_common" { }; // Combined sections, for simplicity. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "media_nav_common" { include "inet(media_common)" include "inet(nav_common)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "media_nav_acpi_common" { include "inet(media_common)" include "inet(nav_common)" include "inet(acpi_common)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "nav_acpi_common" { include "inet(nav_common)" include "inet(acpi_common)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "media_acpi_common" { include "inet(media_common)" include "inet(acpi_common)" @@ -1001,7 +1001,7 @@ xkb_symbols "ibm_spacesaver" { // Logitech // Logitech common definitions -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "logitech_base" { include "inet(media_nav_acpi_common)" key { [ XF86HomePage ] }; @@ -1017,7 +1017,7 @@ xkb_symbols "logitech_base" { }; // Logitech second set of common keys -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "logitech_set3" { key { [ XF86AudioStop ] }; key { [ XF86AudioRaiseVolume ] }; diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir index 1be5e7a22..2305049a8 100644 --- a/xorg-server/xkeyboard-config/symbols/ir +++ b/xorg-server/xkeyboard-config/symbols/ir @@ -29,13 +29,14 @@ xkb_symbols "pes_keypad" { name[Group1]= "Persian (with Persian keypad)"; include "ir(pes_part_basic)" + include "ir(pes_part_ext)" include "ir(pes_part_keypad)" include "nbsp(zwnj2nb3nnb4)" include "level3(ralt_switch)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "pes_part_basic" { // Persian digits @@ -93,23 +94,23 @@ xkb_symbols "pes_part_basic" { key { [ backslash, bar, 0x1002010 ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "pes_part_ext" { // Persian and ASCII digits - key { [ 0x10006f1, exclam, grave, 1 ] }; - key { [ 0x10006f2, 0x100066c, at, 2 ] }; - key { [ 0x10006f3, 0x100066b, numbersign, 3 ] }; - key { [ 0x10006f4, 0x100fdfc, dollar, 4 ] }; - key { [ 0x10006f5, 0x100066a, percent, 5 ] }; - key { [ 0x10006f6, multiply, asciicircum, 6 ] }; - key { [ 0x10006f7, Arabic_comma, ampersand, 7 ] }; - key { [ 0x10006f8, asterisk, enfilledcircbullet, 8 ] }; - key { [ 0x10006f9, parenright, 0x100200e, 9 ] }; - key { [ 0x10006f0, parenleft, 0x100200f, 0 ] }; + key { [ Farsi_1, exclam, grave, 1 ] }; + key { [ Farsi_2, 0x100066c, at, 2 ] }; + key { [ Farsi_3, 0x100066b, numbersign, 3 ] }; + key { [ Farsi_4, 0x100fdfc, dollar, 4 ] }; + key { [ Farsi_5, 0x100066a, percent, 5 ] }; + key { [ Farsi_6, multiply, asciicircum, 6 ] }; + key { [ Farsi_7, Arabic_comma, ampersand, 7 ] }; + key { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] }; + key { [ Farsi_9, parenright, 0x100200e, 9 ] }; + key { [ Farsi_0, parenleft, 0x100200f, 0 ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "pes_part_keypad" { // Persian digits and Mathematical operators @@ -121,19 +122,19 @@ xkb_symbols "pes_part_keypad" { key { [ KP_Enter ] }; key { [ equal ] }; - key { [ KP_Home, 0x10006f7 ] }; - key { [ KP_Up, 0x10006f8 ] }; - key { [ KP_Prior, 0x10006f9 ] }; + key { [ KP_Home, Farsi_7 ] }; + key { [ KP_Up, Farsi_8 ] }; + key { [ KP_Prior, Farsi_9 ] }; - key { [ KP_Left, 0x10006f4 ] }; - key { [ KP_Begin, 0x10006f5 ] }; - key { [ KP_Right, 0x10006f6 ] }; + key { [ KP_Left, Farsi_4 ] }; + key { [ KP_Begin, Farsi_5 ] }; + key { [ KP_Right, Farsi_6 ] }; - key { [ KP_End, 0x10006f1 ] }; - key { [ KP_Down, 0x10006f2 ] }; - key { [ KP_Next, 0x10006f3 ] }; + key { [ KP_End, Farsi_1 ] }; + key { [ KP_Down, Farsi_2 ] }; + key { [ KP_Next, Farsi_3 ] }; - key { [ KP_Insert, 0x10006f0 ] }; + key { [ KP_Insert, Farsi_0 ] }; key { [ KP_Delete, 0x100066b ] }; }; @@ -184,16 +185,16 @@ xkb_symbols "ku_ara" { key { [ backslash, bar, ccedilla, Ccedilla ] }; // Digits - key { [ 1, exclam, 0x10006f1, grave ] }; - key { [ 2, at, 0x10006f2, at ] }; - key { [ 3, numbersign, 0x10006f3, 0x100066b ] }; - key { [ 4, dollar, 0x10006f4, 0x100fdfc ] }; - key { [ 5, percent, 0x10006f5, 0x100066a ] }; - key { [ 6, asciicircum, 0x10006f6, multiply ] }; - key { [ 7, ampersand, 0x10006f7, Arabic_comma ] }; - key { [ 8, asterisk, 0x10006f8, enfilledcircbullet ] }; - key { [ 9, parenright, 0x10006f9, 0x100200e ] }; - key { [ 0, parenleft, 0x10006f0, 0x100200f ] }; + key { [ 1, exclam, Farsi_1, grave ] }; + key { [ 2, at, Farsi_2, at ] }; + key { [ 3, numbersign, Farsi_3, 0x100066b ] }; + key { [ 4, dollar, Farsi_4, 0x100fdfc ] }; + key { [ 5, percent, Farsi_5, 0x100066a ] }; + key { [ 6, asciicircum, Farsi_6, multiply ] }; + key { [ 7, ampersand, Farsi_7, Arabic_comma ] }; + key { [ 8, asterisk, Farsi_8, enfilledcircbullet ] }; + key { [ 9, parenright, Farsi_9, 0x100200e ] }; + key { [ 0, parenleft, Farsi_0, 0x100200f ] }; key { [ minus, Arabic_tatweel, underscore ] }; key { [ equal, plus, 0x1002212 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index 26dfdf9bd..3d2d03bff 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -10,7 +10,7 @@ xkb_symbols "106" { key { [ backslash, bar ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { // "Common" keys for jp 106/109A layouts. diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index 0187ecbeb..1efc02b48 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -1,9 +1,9 @@ -partial hidden keypad_keys +hidden partial keypad_keys xkb_symbols "overlay" { include "keypad(overlay1)" }; -partial hidden keypad_keys +hidden partial keypad_keys xkb_symbols "overlay1" { key { [ KP_Home ], overlay1= }; @@ -37,7 +37,7 @@ xkb_symbols "overlay1" { key { [ KP_Decimal ] }; }; -partial hidden keypad_keys +hidden partial keypad_keys xkb_symbols "overlay2" { key { [ KP_Home ], overlay2= }; @@ -71,7 +71,7 @@ xkb_symbols "overlay2" { key { [ KP_Decimal ] }; }; -partial hidden keypad_keys +hidden partial keypad_keys xkb_symbols "operators" { // Puts some commands to control the X server on // the fifth level of the keypad's operator keys. @@ -93,7 +93,7 @@ xkb_symbols "operators" { }; }; -default partial hidden keypad_keys +default hidden partial keypad_keys xkb_symbols "x11" { include "keypad(operators)" diff --git a/xorg-server/xkeyboard-config/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr index 84c0effca..1ee560bf8 100644 --- a/xorg-server/xkeyboard-config/symbols/kr +++ b/xorg-server/xkeyboard-config/symbols/kr @@ -13,13 +13,13 @@ xkb_symbols "kr104" { include "kr(koreankeys_raltctl)" }; -partial hidden function_keys +hidden partial function_keys xkb_symbols "koreankeys" { key { [ Hangul ] }; key { [ Hangul_Hanja ] }; }; -partial hidden function_keys +hidden partial function_keys xkb_symbols "koreankeys_raltctl" { key { [ Hangul ] }; key { [ Hangul_Hanja ] }; diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz index 4f807d182..db118a0d2 100644 --- a/xorg-server/xkeyboard-config/symbols/kz +++ b/xorg-server/xkeyboard-config/symbols/kz @@ -204,8 +204,6 @@ xkb_symbols "olpc" { include "kz(basic)" - name[Group1] = "Kazakh"; - key { [ parenleft, parenright ] }; key { [ Cyrillic_io, Cyrillic_IO ] }; diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3 index b15e24d53..1aef97056 100644 --- a/xorg-server/xkeyboard-config/symbols/level3 +++ b/xorg-server/xkeyboard-config/symbols/level3 @@ -53,7 +53,7 @@ xkb_symbols "ralt_switch_multikey" { }; // A special case of the right-Alt switch -- for use with grp:alts_toggle. -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "ralt_switch_for_alts_toggle" { virtual_modifiers LAlt, AltGr; key { diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc index 996324d2c..019971323 100644 --- a/xorg-server/xkeyboard-config/symbols/pc +++ b/xorg-server/xkeyboard-config/symbols/pc @@ -62,7 +62,7 @@ xkb_symbols "pc105" { key { [ XF86KbdBrightnessUp ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "editing" { key { type= "PC_ALT_LEVEL2", diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index c39f4ed49..e164f2eee 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -45,7 +45,7 @@ xkb_symbols "yz" { key { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { // "Common" keys: keys that are the same // for both latin and cyrillic keyboards. @@ -73,7 +73,7 @@ xkb_symbols "common" { include "kpdl(comma)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyralpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -114,7 +114,7 @@ xkb_symbols "cyralpha" { }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latalpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -127,7 +127,7 @@ xkb_symbols "latalpha" { key { [ zcaron, Zcaron, any, any ] }; // \ | }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "twoletter" { // Letters which are written in latin transcription with two characters. @@ -142,7 +142,7 @@ xkb_symbols "twoletter" { key { [ zcaron, Zcaron, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latlevel3" { key { [ any, any, notsign, notsign ] }; // ` ~ key { [ any, any, dead_tilde, asciitilde ] }; // 1 ! @@ -196,7 +196,7 @@ xkb_symbols "latlevel3" { key { [ any, any, emdash, endash ] }; // / ? }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyrlevel3" { key { [ any, any, degree, notsign ] }; // ` ~ key { [ any, any, dead_circumflex, NoSymbol ] }; // 3 # diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index 64c862b26..c4f48186f 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -21,7 +21,7 @@ xkb_symbols "winkeys" { key { [ backslash, slash ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { key { [ 1, exclam ] }; -- cgit v1.2.3