diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/ara | 51 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/ch | 1 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/de | 34 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/fi | 1 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/il | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/kr | 48 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/ru | 9 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sun_vndr/kr | 28 |
10 files changed, 152 insertions, 26 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index 9c1d57e09..a79a84ab6 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -283,6 +283,57 @@ xkb_symbols "olpc" { include "group(olpc)" }; +partial alphanumeric_keys +xkb_symbols "mac" { + + //This is a layout that is compatible with macbooks + + include "ara(digits)" + name[Group1]= "Arabic (Macintosh)"; + + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + + key <TLDE> { [ VoidSymbol, VoidSymbol ] }; + key <AD03> { [ Arabic_theh, Arabic_kasra ] }; + key <AD04> { [ Arabic_qaf, Arabic_kasratan ] }; + key <AD05> { [ Arabic_feh, Arabic_damma ] }; + key <AD06> { [ Arabic_ghain, Arabic_dammatan ] }; + key <AD07> { [ Arabic_ain, Arabic_sukun ] }; + key <AD08> { [ Arabic_ha, Arabic_shadda ] }; + key <AD09> { [ Arabic_khah, bracketright ] }; + key <AD10> { [ Arabic_hah, bracketleft ] }; + key <AD11> { [ Arabic_jeem, braceright ] }; + key <AD12> { [Arabic_tehmarbuta, braceleft ] }; + + key <AC01> { [ Arabic_sheen, guillemotright ] }; + key <AC02> { [ Arabic_seen, guillemotleft ] }; + key <AC03> { [ Arabic_yeh, Arabic_alefmaksura] }; + key <AC04> { [ Arabic_beh, VoidSymbol ] }; + key <AC05> { [ Arabic_lam, VoidSymbol ] }; + key <AC06> { [ Arabic_alef, Arabic_maddaonalef ] }; + key <AC07> { [ Arabic_teh, VoidSymbol ] }; + key <AC08> { [ Arabic_noon, VoidSymbol ] }; + key <AC09> { [ Arabic_meem, VoidSymbol ] }; + key <AC10> { [ Arabic_kaf, colon ] }; + key <AC11> { [ Arabic_semicolon, quotedbl ] }; + + key <BKSL> { [ backslash, bar ] }; + + key <LSGT> { [ Arabic_tatweel, VoidSymbol ] }; + key <AB01> { [ Arabic_zah, VoidSymbol ] }; + key <AB02> { [ Arabic_tah, VoidSymbol ] }; + key <AB03> { [ Arabic_thal, Arabic_hamzaonyeh ] }; + key <AB04> { [ Arabic_dal, Arabic_hamza ] }; + key <AB05> { [ Arabic_zain, Arabic_hamzaonalef ] }; + key <AB06> { [ Arabic_ra, Arabic_hamzaunderalef ] }; + key <AB07> { [ Arabic_waw, Arabic_hamzaonwaw ] }; + key <AB08> { [ Arabic_comma, greater ] }; + key <AB09> { [ period, less ] }; + key <AB10> { [ slash, Arabic_question_mark ] }; + +}; + // EXTRAS: partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch index 62c69f958..245a36a13 100644 --- a/xorg-server/xkeyboard-config/symbols/ch +++ b/xorg-server/xkeyboard-config/symbols/ch @@ -20,6 +20,7 @@ xkb_symbols "basic" { key <AD03> { [ e, E, EuroSign ] }; key <AD06> { [ z, Z ] }; + key <AD09> { [ o, O, oe, OE ] }; key <AD11> { [ udiaeresis, egrave, bracketleft ] }; key <AD12> { [ dead_diaeresis, exclam, bracketright ] }; diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 944732e51..fa3c7ec97 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -637,6 +637,40 @@ xkb_symbols "ru" { }; partial alphanumeric_keys +xkb_symbols "pl" { + + // Combined layout for entering both German and Polish symbols on a German physical + // keyboard. Based on German (eliminate dead keys) and Polish (basic). Polish diacritics + // on AltGr+"acelnosxz". EuroSign moved to AE04 (AltGr+dollar key) to avoid conflict + // with Polish eogonek. + // + // https://github.com/kontextify/xkeyboard-config + + include "latin(type4)" + + name[Group1]= "Polish (Germany, eliminate dead keys)"; + + include "de(nodeadkeys)" + key <AE04> { [ 4, dollar, EuroSign, currency ] }; + + key <AD01> { [ q, Q ] }; + key <AD02> { [ w, W ] }; + key <AD03> { [ e, E, eogonek, Eogonek ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AC01> { [ a, A, aogonek, Aogonek ] }; + key <AC02> { [ s, S, sacute, Sacute ] }; + key <AC04> { [ f, F ] }; + key <AD06> { [ z, Z, zabovedot, Zabovedot ] }; + key <AB02> { [ x, X, zacute, Zacute ] }; + key <AB03> { [ c, C, cacute, Cacute ] }; + key <AB06> { [ n, N, nacute, Nacute ] }; + + include "kpdl(comma)" + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys xkb_symbols "htcdream" { include "inet(htcdream)" diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index 6afed2106..47bc24f13 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -79,7 +79,6 @@ xkb_symbols "kotoistus" { include "nbsp(level3)" include "kpdl(comma)" include "level3(ralt_switch)" - include "compose(rwin)" }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp index 63bf56aca..26ae26768 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp @@ -25,7 +25,7 @@ // // Japanese layout for a Fujitsu 140 key keyboard -xkb_symbols { +xkb_symbols "basic" { override "fujitsu_vndr/us" augment key <AE01> { [], [ kana_NU ] }; key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us index 30661dbb2..f62b5c832 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us @@ -24,7 +24,7 @@ //from The Open Group. // // US/ASCII layout for a Fujitsu 138 key keyboard -xkb_symbols { +xkb_symbols "basic" { include "us(basic)" // A few alphanumeric keys are different diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index 48452d620..67487c111 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -205,7 +205,7 @@ xkb_symbols "biblical" { key <AE02> { [ 2, U0599, VoidSymbol, at ] }; key <AE03> { [ 3, U0592, VoidSymbol, numbersign ] }; key <AE04> { [ 4, U05AF, NewSheqelSign, dollar ] }; - key <AE05> { [ 5, VoidSymbol, U200D, percent ] }; + key <AE05> { [ 5, U05BA, U200D, percent ] }; key <AE06> { [ 6, U05B9, U200C, asciicircum ] }; key <AE07> { [ 7, U05BF, U034F, ampersand ] }; key <AE08> { [ 8, U05C2, U200E, asterisk ] }; diff --git a/xorg-server/xkeyboard-config/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr index 1ee560bf8..e554af0c6 100644 --- a/xorg-server/xkeyboard-config/symbols/kr +++ b/xorg-server/xkeyboard-config/symbols/kr @@ -2,27 +2,53 @@ default alphanumeric_keys xkb_symbols "kr106" { include "us" name[Group1]= "Korean"; - include "kr(koreankeys)" + include "kr(hw_keys)" }; alphanumeric_keys xkb_symbols "kr104" { include "us" name[Group1]= "Korean (101/104 key compatible)"; - include "kr(koreankeys)" - include "kr(koreankeys_raltctl)" + include "kr(ralt_hangul)" + include "kr(rctrl_hanja)" }; -hidden partial function_keys -xkb_symbols "koreankeys" { - key <K71> { [ Hangul ] }; - key <K72> { [ Hangul_Hanja ] }; +partial function_keys +xkb_symbols "hw_keys" { + key <HNGL> { [ Hangul ] }; + key <HJCV> { [ Hangul_Hanja ] }; }; -hidden partial function_keys -xkb_symbols "koreankeys_raltctl" { - key <RALT> { [ Hangul ] }; - key <RCTL> { [ Hangul_Hanja ] }; +partial function_keys +xkb_symbols "ralt_hangul" { + replace key <RALT> { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul ] + }; +}; + +partial function_keys +xkb_symbols "rctrl_hangul" { + replace key <RCTL> { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul ] + }; +}; + +partial function_keys +xkb_symbols "ralt_hanja" { + replace key <RALT> { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul_Hanja ] + }; +}; + +partial function_keys +xkb_symbols "rctrl_hanja" { + replace key <RCTL> { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul_Hanja ] + }; }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index 37b61a7dc..0ba987067 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -478,11 +478,12 @@ xkb_symbols "srp" { }; // Mari language layout -// http://www.marlamuter.ru/ +// http://www.marlamuter.com/ +// Last edit by Viatcheslav Kileev (slavakileev@yandex.ru) partial alphanumeric_keys xkb_symbols "chm" { - include "ru(common)" + include "ru(winkeys)" name[Group1]= "Mari"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; @@ -491,9 +492,7 @@ xkb_symbols "chm" { key <AD03> { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] }; key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU, U04F9, U04F8 ] }; key <AD06> { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] }; - key <AC11> { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; - key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] }; - key <AC01> { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] }; + key <AC07> { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] }; include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr index cc6d29e9a..0cd6a8665 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr @@ -58,12 +58,28 @@ partial alphanumeric_keys include "kr(kr104)" }; -partial alphanumeric_keys - xkb_symbols "koreankeys" { - include "kr(koreankeys)" +partial function_keys + xkb_symbols "hw_keys" { + include "kr(hw_keys)" }; -partial alphanumeric_keys - xkb_symbols "koreankeys_raltctl" { - include "kr(koreankeys_raltctl)" +partial function_keys + xkb_symbols "ralt_hangul" { + include "kr(ralt_hangul)" }; + +partial function_keys + xkb_symbols "rctrl_hangul" { + include "kr(rctrl_hangul)" +}; + +partial function_keys + xkb_symbols "ralt_hanja" { + include "kr(ralt_hanja)" +}; + +partial function_keys + xkb_symbols "rctrl_hanja" { + include "kr(rctrl_hanja)" +}; + |