Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa xkeyboard-config mesa git update 1 Oct 2013

3 files changed, 71 insertions, 73 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index 8f3da0da8..fc08985ce 100644
--- a/xorg-server/xkeyboard-config/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
@@ -1,16 +1,6 @@
 // These partial variants assign ISO_Level3_Shift to various XKB keycodes
 // so that the third shift level can be reached.
 
-// Ensure a mapping to a real modifier for LevelThree.
-partial modifier_keys
-xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
-  replace key <LVL3> {
-    symbols[Group1] = [ ISO_Level3_Shift ]
-  };
-  modifier_map Mod5 { <LVL3> };
-};
-
 // The default behaviour:
 // the right Alt key (AltGr) chooses the third symbol engraved on a key.
 default partial modifier_keys
@@ -18,26 +8,36 @@ xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
+// Ensure a mapping to a real modifier for LevelThree.
+partial modifier_keys
+xkb_symbols "modifier_mapping" {
+  replace key <LVL3> {
+    type[Group1] = "ONE_LEVEL";
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5 { <LVL3> };
+};
+
 // The right Alt key never chooses the third level.
 // This option attempts to undo the effect of a layout's inclusion of
 // 'ralt_switch'.  You may want to also select another level3 option
 // to map the level3 shift to some other key.
 partial modifier_keys
 xkb_symbols "ralt_alt" {
-  key <RALT> { 
+  key <RALT> {
     type[Group1]="TWO_LEVEL",
     type[Group2]="TWO_LEVEL",
     type[Group3]="TWO_LEVEL",
     type[Group4]="TWO_LEVEL",
-    symbols[Group1] = [ Alt_R, Meta_R ], 
-    symbols[Group2] = [ Alt_R, Meta_R ], 
-    symbols[Group3] = [ Alt_R, Meta_R ], 
+    symbols[Group1] = [ Alt_R, Meta_R ],
+    symbols[Group2] = [ Alt_R, Meta_R ],
+    symbols[Group3] = [ Alt_R, Meta_R ],
     symbols[Group4] = [ Alt_R, Meta_R ]
-    };
+  };
   modifier_map Mod1 { <RALT> };
 };
 
@@ -48,7 +48,7 @@ xkb_symbols "ralt_switch_multikey" {
   key <RALT> {
     type[Group1]="TWO_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -83,7 +83,7 @@ xkb_symbols "lalt_switch" {
   key <LALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -93,7 +93,7 @@ xkb_symbols "switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -103,7 +103,7 @@ xkb_symbols "menu_switch" {
   key <MENU> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -120,7 +120,7 @@ xkb_symbols "lwin_switch" {
   key <LWIN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -132,7 +132,7 @@ xkb_symbols "rwin_switch" {
   key <RWIN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -143,7 +143,7 @@ xkb_symbols "enter_switch" {
   key <KPEN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 84507e5b3..c4c760fcf 100644
--- a/xorg-server/xkeyboard-config/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
@@ -1,23 +1,13 @@
 // These partial variants assign ISO_Level5_Shift to various XKB keycodes
 // so that the fifth shift level can be reached.
 
-// Ensure a mapping to a real modifier for LevelFive.
-partial modifier_keys
-xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
-  replace key <MDSW> {
-    symbols[Group1] = [ ISO_Level5_Shift ]
-  };
-  modifier_map Mod3 { <MDSW> };
-};
-
 // The right Ctrl key (while pressed) chooses the fifth shift level.
 partial modifier_keys
 xkb_symbols "rctrl_switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -27,7 +17,7 @@ xkb_symbols "lsgt_switch" {
   key <LSGT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -37,10 +27,20 @@ xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
+// Ensure a mapping to a real modifier for LevelFive.
+partial modifier_keys
+xkb_symbols "modifier_mapping" {
+  replace key <MDSW> {
+    type[Group1] = "ONE_LEVEL";
+    symbols[Group1] = [ ISO_Level5_Shift ]
+  };
+  modifier_map Mod3 { <MDSW> };
+};
+
 
 // This adds the definitions needed to create a level5-lock behaviour, using
 // the real modifier NumLock as a lock indicator.
diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy
index aa6ce82f4..a7d2fbc4e 100644
--- a/xorg-server/xkeyboard-config/symbols/sy
+++ b/xorg-server/xkeyboard-config/symbols/sy
@@ -8,20 +8,20 @@ partial alphanumeric_keys
 xkb_symbols "syc" {
     name[Group1]= "Syriac";
 
-    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <TLDE> {  [  	0x100070F,	0x100032E,	Arabic_shadda		]     };
     key <AE01> {  [  	1,		exclam,		0x1000701		]     };
     key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
     key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
     key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
-    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
-    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
-    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE05> {  [  	5,		0x1002670,	0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,	0x1000709		]     };
     key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
     key <AE09> {  [  	9,		parenright,	0x100070C		]     };
     key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
     key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
     key <AE12> {  [  	equal,		plus,		0x1002510		]     };
-						
+
     key <AD01> {  [  	0x1000714,	0x1000730,	Arabic_fatha		]     };
     key <AD02> {  [  	0x1000728,	0x1000733,	Arabic_fathatan		]     };
     key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
@@ -30,29 +30,29 @@ xkb_symbols "syc" {
     key <AD06> {  [  	0x100071C,	0x1000740,	Arabic_hamza_above	]     };
     key <AD07> {  [  	0x1000725,	0x1000741,	0x1000747		]     };
     key <AD08> {  [  	0x1000717,	0x1000308,	0x1000743		]     };
-    key <AD09> {  [  	0x100071E,      0x1000304,	0x1000745		]     };
-    key <AD10> {  [  	0x100071A,      0x1000307,	0x100032D		]     };
-    key <AD11> {  [ 	0x1000713,      0x1000303				]     };
+    key <AD09> {  [  	0x100071E,	0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x100071A,	0x1000307,	0x100032D		]     };
+    key <AD11> {  [  	0x1000713,	0x1000303				]     };
     key <AD12> {  [  	0x1000715,	0x100074A				]     };
     key <BKSL> {  [  	0x1000706,	colon					]     };
 
     key <AC01> {  [  	0x100072B,	0x1000731,	Arabic_kasra		]     };
     key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
-    key <AC03> {  [	0x100071D,	0x1000737				]     };
+    key <AC03> {  [  	0x100071D,	0x1000737				]     };
     key <AC04> {  [  	0x1000712,	0x100073B,	Arabic_hamza		]     };
     key <AC05> {  [  	0x1000720,	0x100073E,	Arabic_hamza_below	]     };
-    key <AC06> {  [  	0x1000710,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC06> {  [  	0x1000710,	0x1000711,	Arabic_superscript_alef	]     };
     key <AC07> {  [  	0x100072C,	Arabic_tatweel,	0x1000748		]     };
-    key <AC08> {  [  	0x1000722,	0x1000324, 	0x1000744		]     };
-    key <AC09> {  [	0x1000721,	0x1000331,	0x1000746		]     };
-    key <AC10> {  [  	0x100071F,      0x1000323				]     };
+    key <AC08> {  [  	0x1000722,	0x1000324,	0x1000744		]     };
+    key <AC09> {  [  	0x1000721,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071F,	0x1000323				]     };
     key <AC11> {  [  	0x100071B,	0x1000330				]     };
 
     key <AB01> {  [  	bracketright,	0x1000732,	Arabic_sukun		]     };
     key <AB02> {  [  	bracketleft,	0x1000735				]     };
-    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
-    key <AB04> {  [  	0x100072A,	0x100073C, 	0x100200C		]     };
-    key <AB05> {  [  	0x1000727,      0x100073F,      0x100200E		]     };
+    key <AB03> {  [  	0x1000724,	0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072A,	0x100073C,	0x100200C		]     };
+    key <AB05> {  [  	0x1000727,	0x100073F,	0x100200E		]     };
     key <AB06> {  [  	0x1000700,	0x1000739,	0x100200F		]     };
     key <AB07> {  [  	0x100002E,	0x1000742				]     };
     key <AB08> {  [  	0x1000718,	Arabic_comma				]     };
@@ -61,33 +61,32 @@ xkb_symbols "syc" {
 
     // Space plus zero-width non-joiner:
     include "nbsp(zwnj2)"
-    
+
     modifier_map Shift  { Shift_L, Shift_R };
     modifier_map Lock   { Caps_Lock };
     modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod1   { Alt_L, Alt_R };
     modifier_map Mod2   { Mode_switch };
-
 };
 
 partial alphanumeric_keys
 xkb_symbols "syc_phonetic" {
     name[Group1]= "Syriac (phonetic)";
 
-    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <TLDE> {  [  	0x100070F,	0x100032E,	Arabic_shadda		]     };
     key <AE01> {  [  	1,		exclam,		0x1000701		]     };
     key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
     key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
     key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
-    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
-    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
-    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE05> {  [  	5,		0x1002670,	0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,	0x1000709		]     };
     key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
     key <AE09> {  [  	9,		parenright,	0x100070C		]     };
     key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
     key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
     key <AE12> {  [  	equal,		plus,		0x1002510		]     };
-						
+
     key <AD01> {  [  	0x1000729,	0x1000730,	Arabic_fatha		]     };
     key <AD02> {  [  	0x1000718,	0x1000733,	Arabic_fathatan		]     };
     key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
@@ -96,30 +95,30 @@ xkb_symbols "syc_phonetic" {
     key <AD06> {  [  	0x100071D,	0x1000740,	Arabic_hamza_above	]     };
     key <AD07> {  [  	0x100071C,	0x1000741,	0x1000747		]     };
     key <AD08> {  [  	0x1000725,	0x1000308,	0x1000743		]     };
-    key <AD09> {  [  	0x1000727,      0x1000304,	0x1000745		]     };
-    key <AD10> {  [  	0x1000726,      0x1000307,	0x100032D		]     };
-    key <AD11> {  [ 	bracketright,   0x1000303				]     };
+    key <AD09> {  [  	0x1000727,	0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x1000726,	0x1000307,	0x100032D		]     };
+    key <AD11> {  [  	bracketright,	0x1000303				]     };
     key <AD12> {  [  	bracketleft,	0x100074A				]     };
     key <BKSL> {  [  	0x1000706,	colon					]     };
 
     key <AC01> {  [  	0x1000710,	0x1000731,	Arabic_kasra		]     };
     key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
-    key <AC03> {  [	0x1000715,	0x1000737				]     };
+    key <AC03> {  [  	0x1000715,	0x1000737				]     };
     key <AC04> {  [  	0x1000714,	0x100073B,	Arabic_hamza		]     };
     key <AC05> {  [  	0x1000713,	0x100073E,	Arabic_hamza_below	]     };
-    key <AC06> {  [  	0x1000717,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC06> {  [  	0x1000717,	0x1000711,	Arabic_superscript_alef	]     };
     key <AC07> {  [  	0x100071B,	Arabic_tatweel,	0x1000748		]     };
-    key <AC08> {  [  	0x100071F,	0x1000324, 	0x1000744		]     };
-    key <AC09> {  [	0x1000720,	0x1000331,	0x1000746		]     };
-    key <AC10> {  [  	0x100071A,      0x1000323				]     };
+    key <AC08> {  [  	0x100071F,	0x1000324,	0x1000744		]     };
+    key <AC09> {  [  	0x1000720,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071A,	0x1000323				]     };
     key <AC11> {  [  	0x100071E,	0x1000330				]     };
 
     key <SPCE> {  [  	space,		0x100200c				]     };
     key <AB01> {  [  	0x1000719,	0x1000732,	Arabic_sukun		]     };
     key <AB02> {  [  	0x1000728,	0x1000735				]     };
-    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
-    key <AB04> {  [  	0x100072B,	0x100073C, 	0x100200C		]     };
-    key <AB05> {  [  	0x1000712,      0x100073F,      0x100200E		]     };
+    key <AB03> {  [  	0x1000724,	0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072B,	0x100073C,	0x100200C		]     };
+    key <AB05> {  [  	0x1000712,	0x100073F,	0x100200E		]     };
     key <AB06> {  [  	0x1000722,	0x1000739,	0x100200F		]     };
     key <AB07> {  [  	0x1000721,	0x1000742				]     };
     key <AB08> {  [  	0x1000700,	Arabic_comma				]     };
@@ -129,9 +128,8 @@ xkb_symbols "syc_phonetic" {
     modifier_map Shift  { Shift_L, Shift_R };
     modifier_map Lock   { Caps_Lock };
     modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod1   { Alt_L, Alt_R };
     modifier_map Mod2   { Mode_switch };
-
 };
 
 partial alphanumeric_keys