From f1c2db43dcf35d2cf4715390bd2391c28e42a8c2 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:31:16 +0100 Subject: xwininfo fontconfig libX11 libXdmcp libfontenc libxcb libxcb/xcb-proto mesalib xserver xkeyboard-config mkfontscale git update 22 Feb 2015 xserver commit 3a06faf3fcdb7451125a46181f9152e8e59e9770 libxcb commit e3ec1f74637237ce500dfd0ca59f2e422da4e019 libxcb/xcb-proto commit 4c550465934164aab2449a125f75f4ca07816233 xkeyboard-config commit 26f344c93f8c6141e9233eb68088ba4fd56bc9ef libX11 commit c8e19b393defd53f046ddc2da3a16881221b3c34 libXdmcp commit 9f4cac7656b221ce2a8f97e7bd31e5e23126d001 libfontenc commit de1843aaf76015c9d99416f3122d169fe331b849 mkfontscale commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6 xwininfo commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e fontconfig commit d6d5adeb7940c0d0beb86489c2a1c2ce59e5c044 mesa commit 4359954d842caa2a9f8d4b50d70ecc789884b68b --- xorg-server/xkeyboard-config/symbols/ara | 51 ++++++++++++++++++++++++ xorg-server/xkeyboard-config/symbols/ch | 1 + xorg-server/xkeyboard-config/symbols/kr | 48 +++++++++++++++++----- xorg-server/xkeyboard-config/symbols/sun_vndr/kr | 28 ++++++++++--- 4 files changed, 111 insertions(+), 17 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') 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 { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ VoidSymbol, VoidSymbol ] }; + key { [ Arabic_theh, Arabic_kasra ] }; + key { [ Arabic_qaf, Arabic_kasratan ] }; + key { [ Arabic_feh, Arabic_damma ] }; + key { [ Arabic_ghain, Arabic_dammatan ] }; + key { [ Arabic_ain, Arabic_sukun ] }; + key { [ Arabic_ha, Arabic_shadda ] }; + key { [ Arabic_khah, bracketright ] }; + key { [ Arabic_hah, bracketleft ] }; + key { [ Arabic_jeem, braceright ] }; + key { [Arabic_tehmarbuta, braceleft ] }; + + key { [ Arabic_sheen, guillemotright ] }; + key { [ Arabic_seen, guillemotleft ] }; + key { [ Arabic_yeh, Arabic_alefmaksura] }; + key { [ Arabic_beh, VoidSymbol ] }; + key { [ Arabic_lam, VoidSymbol ] }; + key { [ Arabic_alef, Arabic_maddaonalef ] }; + key { [ Arabic_teh, VoidSymbol ] }; + key { [ Arabic_noon, VoidSymbol ] }; + key { [ Arabic_meem, VoidSymbol ] }; + key { [ Arabic_kaf, colon ] }; + key { [ Arabic_semicolon, quotedbl ] }; + + key { [ backslash, bar ] }; + + key { [ Arabic_tatweel, VoidSymbol ] }; + key { [ Arabic_zah, VoidSymbol ] }; + key { [ Arabic_tah, VoidSymbol ] }; + key { [ Arabic_thal, Arabic_hamzaonyeh ] }; + key { [ Arabic_dal, Arabic_hamza ] }; + key { [ Arabic_zain, Arabic_hamzaonalef ] }; + key { [ Arabic_ra, Arabic_hamzaunderalef ] }; + key { [ Arabic_waw, Arabic_hamzaonwaw ] }; + key { [ Arabic_comma, greater ] }; + key { [ period, less ] }; + key { [ 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 { [ e, E, EuroSign ] }; key { [ z, Z ] }; + key { [ o, O, oe, OE ] }; key { [ udiaeresis, egrave, bracketleft ] }; key { [ dead_diaeresis, exclam, bracketright ] }; 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 { [ Hangul ] }; - key { [ Hangul_Hanja ] }; +partial function_keys +xkb_symbols "hw_keys" { + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; }; -hidden partial function_keys -xkb_symbols "koreankeys_raltctl" { - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; +partial function_keys +xkb_symbols "ralt_hangul" { + replace key { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul ] + }; +}; + +partial function_keys +xkb_symbols "rctrl_hangul" { + replace key { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul ] + }; +}; + +partial function_keys +xkb_symbols "ralt_hanja" { + replace key { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul_Hanja ] + }; +}; + +partial function_keys +xkb_symbols "rctrl_hanja" { + replace key { + type[Group1] = "ONE_LEVEL", + symbols[Group1]= [ Hangul_Hanja ] + }; }; // EXTRAS: 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)" +}; + -- cgit v1.2.3