Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

2 files changed, 72 insertions, 65 deletions

diff --git a/xorg-server/xkeyboard-config/compat/xfree86 b/xorg-server/xkeyboard-config/compat/xfree86
index c511ae264..cf4a8b22b 100644
--- a/xorg-server/xkeyboard-config/compat/xfree86
+++ b/xorg-server/xkeyboard-config/compat/xfree86
@@ -1,56 +1,63 @@
-//  XFree86 special keysyms

-

-default partial xkb_compatibility "basic"  {

-

-    interpret.repeat= True;

-

-    interpret  XF86_Switch_VT_1 {

-        action = SwitchScreen(Screen=1, !SameServer);

-    };

-    interpret  XF86_Switch_VT_2 {

-        action = SwitchScreen(Screen=2, !SameServer);

-    };

-    interpret  XF86_Switch_VT_3 {

-        action = SwitchScreen(Screen=3, !SameServer);

-    };

-    interpret  XF86_Switch_VT_4 {

-        action = SwitchScreen(Screen=4, !SameServer);

-    };

-    interpret  XF86_Switch_VT_5 {

-        action = SwitchScreen(Screen=5, !SameServer);

-    };

-    interpret  XF86_Switch_VT_6 {

-        action = SwitchScreen(Screen=6, !SameServer);

-    };

-    interpret  XF86_Switch_VT_7 {

-        action = SwitchScreen(Screen=7, !SameServer);

-    };

-    interpret  XF86_Switch_VT_8 {

-        action = SwitchScreen(Screen=8, !SameServer);

-    };

-    interpret  XF86_Switch_VT_9 {

-        action = SwitchScreen(Screen=9, !SameServer);

-    };

-    interpret  XF86_Switch_VT_10 {

-        action = SwitchScreen(Screen=10, !SameServer);

-    };

-    interpret  XF86_Switch_VT_11 {

-        action = SwitchScreen(Screen=11, !SameServer);

-    };

-    interpret  XF86_Switch_VT_12 {

-        action = SwitchScreen(Screen=12, !SameServer);

-    };

-

-    interpret XF86_Ungrab {

-        action = Private(type=0x86, data="Ungrab");

-    };

-    interpret XF86_ClearGrab {

-        action = Private(type=0x86, data="ClsGrb");

-    };

-    interpret XF86_Next_VMode {

-        action = Private(type=0x86, data="+VMode");

-    };

-    interpret XF86_Prev_VMode {

-        action = Private(type=0x86, data="-VMode");

-    };

-};

+//  XFree86 special keysyms
+
+default partial xkb_compatibility "basic"  {
+
+    interpret.repeat= True;
+
+    interpret  XF86_Switch_VT_1 {
+        action = SwitchScreen(Screen=1, !SameServer);
+    };
+    interpret  XF86_Switch_VT_2 {
+        action = SwitchScreen(Screen=2, !SameServer);
+    };
+    interpret  XF86_Switch_VT_3 {
+        action = SwitchScreen(Screen=3, !SameServer);
+    };
+    interpret  XF86_Switch_VT_4 {
+        action = SwitchScreen(Screen=4, !SameServer);
+    };
+    interpret  XF86_Switch_VT_5 {
+        action = SwitchScreen(Screen=5, !SameServer);
+    };
+    interpret  XF86_Switch_VT_6 {
+        action = SwitchScreen(Screen=6, !SameServer);
+    };
+    interpret  XF86_Switch_VT_7 {
+        action = SwitchScreen(Screen=7, !SameServer);
+    };
+    interpret  XF86_Switch_VT_8 {
+        action = SwitchScreen(Screen=8, !SameServer);
+    };
+    interpret  XF86_Switch_VT_9 {
+        action = SwitchScreen(Screen=9, !SameServer);
+    };
+    interpret  XF86_Switch_VT_10 {
+        action = SwitchScreen(Screen=10, !SameServer);
+    };
+    interpret  XF86_Switch_VT_11 {
+        action = SwitchScreen(Screen=11, !SameServer);
+    };
+    interpret  XF86_Switch_VT_12 {
+        action = SwitchScreen(Screen=12, !SameServer);
+    };
+
+    interpret XF86_Ungrab {
+        action = Private(type=0x86, data="Ungrab");
+    };
+    interpret XF86_ClearGrab {
+        action = Private(type=0x86, data="ClsGrb");
+    };
+    interpret XF86LogGrabInfo {
+        action = Private(type=0x86, data="PrGrbs");
+    };
+    interpret XF86LogWindowTree {
+        action = Private(type=0x86, data="PrWins");
+    };
+
+    interpret XF86_Next_VMode {
+        action = Private(type=0x86, data="+VMode");
+    };
+    interpret XF86_Prev_VMode {
+        action = Private(type=0x86, data="-VMode");
+    };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index 971ed394e..b0a40b4db 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -26,23 +26,23 @@ xkb_symbols "tifinagh" {
 

     name[Group1]="Berber (Morocco, Tifinagh)";

 

-    key <TLDE>	{ [ twosuperior, NoAction ]	};

+    key <TLDE>	{ [ twosuperior, NoSymbol ]	};

     key <AE01>	{ [ ampersand,          1 ]	};

-    key <AE02>	{ [ NoAction,          2, asciitilde	]	};

+    key <AE02>	{ [ NoSymbol,          2, asciitilde	]	};

     key <AE03>	{ [  quotedbl,          3, numbersign	]	};

     key <AE04>	{ [apostrophe,          4, braceleft	]	};

     key <AE05>	{ [ parenleft,          5, bracketleft	]	};

     key <AE06>	{ [     minus,          6, bar	]	};

-    key <AE07>	{ [         NoAction ,  7 ]	};

+    key <AE07>	{ [         NoSymbol ,  7 ]	};

     key <AE08>	{ [underscore,          8, backslash	]	};

-    key <AE09>	{ [NoAction,         9, asciicircum	]	};

-    key <AE10>	{ [       NoAction ,          0, at		]	};

+    key <AE09>	{ [NoSymbol,         9, asciicircum	]	};

+    key <AE10>	{ [       NoSymbol ,          0, at		]	};

     key <AE11>	{ [parenright,     degree, bracketright	]	};

     key <AE12>	{ [     equal,       plus, braceright	]	};

 

     key <AD01>	{ [ 0x1002d30 ]	};

     key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <AD03>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

+    key <AD03>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};

     key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};

     key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};

     key <AD06>	{ [ 0x1002d62 ]	};

@@ -63,7 +63,7 @@ xkb_symbols "tifinagh" {
     key <AC08>	{ [ 0x1002d3d,  0x1002d3d  ]	};

     key <AC09>	{ [ 0x1002d4d ]	};

     key <AC10>	{ [ 0x1002d4e ]	};

-    key <AC11>	{ [    NoAction ,   percent ]	};

+    key <AC11>	{ [    NoSymbol ,   percent ]	};

     key <BKSL>	{ [  asterisk,         mu ]	};

 

     key <AB01>	{ [ 0x1002d61 ]	};

@@ -88,7 +88,7 @@ xkb_symbols "tifinagh-phonetic" {
 

     key <LatA>	{ [ 0x1002d30 ]	};

     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

+    key <LatE>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};

     key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};

     key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};

     key <LatY>	{ [ 0x1002d62 ]	};

@@ -192,7 +192,7 @@ xkb_symbols "tifinagh-extended-phonetic" {
 

     key <LatA>	{ [ 0x1002d30 ]	};

     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

+    key <LatE>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};

     key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};

     key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};

     key <LatY>	{ [ 0x1002d62 ]	};