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

4 files changed, 111 insertions, 17 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/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/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)"
+};
+