Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 141 insertions, 149 deletions

diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index 4edbf74d9..cdbc09c1a 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -66,168 +65,161 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec PointerTab[] =
-{
-	{PROTOCOL, "protocol"},
-	{EMULATE3, "emulate3buttons"},
-	{EM3TIMEOUT, "emulate3timeout"},
-	{ENDSUBSECTION, "endsubsection"},
-	{ENDSECTION, "endsection"},
-	{PDEVICE, "device"},
-	{PDEVICE, "port"},
-	{BAUDRATE, "baudrate"},
-	{SAMPLERATE, "samplerate"},
-	{CLEARDTR, "cleardtr"},
-	{CLEARRTS, "clearrts"},
-	{CHORDMIDDLE, "chordmiddle"},
-	{PRESOLUTION, "resolution"},
-	{DEVICE_NAME, "devicename"},
-	{ALWAYSCORE, "alwayscore"},
-	{PBUTTONS, "buttons"},
-	{ZAXISMAPPING, "zaxismapping"},
-	{-1, ""},
+static xf86ConfigSymTabRec PointerTab[] = {
+    {PROTOCOL, "protocol"},
+    {EMULATE3, "emulate3buttons"},
+    {EM3TIMEOUT, "emulate3timeout"},
+    {ENDSUBSECTION, "endsubsection"},
+    {ENDSECTION, "endsection"},
+    {PDEVICE, "device"},
+    {PDEVICE, "port"},
+    {BAUDRATE, "baudrate"},
+    {SAMPLERATE, "samplerate"},
+    {CLEARDTR, "cleardtr"},
+    {CLEARRTS, "clearrts"},
+    {CHORDMIDDLE, "chordmiddle"},
+    {PRESOLUTION, "resolution"},
+    {DEVICE_NAME, "devicename"},
+    {ALWAYSCORE, "alwayscore"},
+    {PBUTTONS, "buttons"},
+    {ZAXISMAPPING, "zaxismapping"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ZMapTab[] =
-{
-	{XAXIS, "x"},
-	{YAXIS, "y"},
-	{-1, ""},
+static xf86ConfigSymTabRec ZMapTab[] = {
+    {XAXIS, "x"},
+    {YAXIS, "y"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeInputList
 
 XF86ConfInputPtr
-xf86parsePointerSection (void)
+xf86parsePointerSection(void)
 {
-	char *s;
-	unsigned long val1;
-	int token;
-	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
+    char *s;
+    unsigned long val1;
+    int token;
 
-	while ((token = xf86getToken (PointerTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
-			break;
-		case PROTOCOL:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Protocol");
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Protocol"),
-												val.str);
-			break;
-		case PDEVICE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Device");
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Device"),
-												val.str);
-			break;
-		case EMULATE3:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Emulate3Buttons"),
-												NULL);
-			break;
-		case EM3TIMEOUT:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Emulate3Timeout");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Emulate3Timeout"),
-												s);
-			break;
-		case CHORDMIDDLE:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ChordMiddle"),
-												NULL);
-			break;
-		case PBUTTONS:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Buttons");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Buttons"), s);
-			break;
-		case BAUDRATE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "BaudRate");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("BaudRate"), s);
-			break;
-		case SAMPLERATE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "SampleRate");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("SampleRate"), s);
-			break;
-		case PRESOLUTION:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Resolution");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Resolution"), s);
-			break;
-		case CLEARDTR:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ClearDTR"), NULL);
-			break;
-		case CLEARRTS:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ClearRTS"), NULL);
-			break;
-		case ZAXISMAPPING:
-			switch (xf86getToken(ZMapTab)) {
-			case NUMBER:
-				if (val.num < 0)
-					Error (ZAXISMAPPING_MSG);
-				val1 = val.num;
-				if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
-					Error (ZAXISMAPPING_MSG);
-				}
-				if (asprintf(&s, "%lu %u", val1, val.num) == -1)
-				    s = NULL;
-				break;
-			case XAXIS:
-				s = strdup("x");
-				break;
-			case YAXIS:
-				s = strdup("y");
-				break;
-			default:
-				Error (ZAXISMAPPING_MSG);
-				break;
-			}
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ZAxisMapping"),
-												s);
-			break;
-		case ALWAYSCORE:
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
 
-	ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
-	ptr->inp_driver = strdup("mouse");
-	ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-										strdup("CorePointer"), NULL);
+        while ((token = xf86getToken(PointerTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
+            break;
+        case PROTOCOL:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Protocol");
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Protocol"), val.str);
+            break;
+        case PDEVICE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Device");
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Device"), val.str);
+            break;
+        case EMULATE3:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Emulate3Buttons"),
+                                                   NULL);
+            break;
+        case EM3TIMEOUT:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Emulate3Timeout");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Emulate3Timeout"),
+                                                   s);
+            break;
+        case CHORDMIDDLE:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ChordMiddle"), NULL);
+            break;
+        case PBUTTONS:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Buttons");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Buttons"), s);
+            break;
+        case BAUDRATE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "BaudRate");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("BaudRate"), s);
+            break;
+        case SAMPLERATE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "SampleRate");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("SampleRate"), s);
+            break;
+        case PRESOLUTION:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Resolution");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Resolution"), s);
+            break;
+        case CLEARDTR:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ClearDTR"), NULL);
+            break;
+        case CLEARRTS:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ClearRTS"), NULL);
+            break;
+        case ZAXISMAPPING:
+            switch (xf86getToken(ZMapTab)) {
+            case NUMBER:
+                if (val.num < 0)
+                    Error(ZAXISMAPPING_MSG);
+                val1 = val.num;
+                if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER ||
+                    val.num < 0) {
+                    Error(ZAXISMAPPING_MSG);
+                }
+                if (asprintf(&s, "%lu %u", val1, val.num) == -1)
+                    s = NULL;
+                break;
+            case XAXIS:
+                s = strdup("x");
+                break;
+            case YAXIS:
+                s = strdup("y");
+                break;
+            default:
+                Error(ZAXISMAPPING_MSG);
+                break;
+            }
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ZAxisMapping"), s);
+            break;
+        case ALWAYSCORE:
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
+
+    ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
+    ptr->inp_driver = strdup("mouse");
+    ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                           strdup("CorePointer"), NULL);
 
 #ifdef DEBUG
-	printf ("Pointer section parsed\n");
+    printf("Pointer section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
-