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, 69 insertions, 70 deletions

diff --git a/xorg-server/hw/dmx/examples/dmxreconfig.c b/xorg-server/hw/dmx/examples/dmxreconfig.c
index 042f8a112..9587682db 100644
--- a/xorg-server/hw/dmx/examples/dmxreconfig.c
+++ b/xorg-server/hw/dmx/examples/dmxreconfig.c
@@ -36,47 +36,47 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  screen;
-    DMXScreenAttributes  attr;
-    unsigned int         mask = 0;
-    int                  status;
-    int                  errorScreen;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int screen;
+    DMXScreenAttributes attr;
+    unsigned int mask = 0;
+    int status;
+    int errorScreen;
 
     if (argc != 13) {
-	fprintf(stderr, "Usage: %s display screen scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy\n", argv[0]);
-	return -1;
+        fprintf(stderr,
+                "Usage: %s display screen scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy\n",
+                argv[0]);
+        return -1;
     }
 
     if (!(display = XOpenDisplay(argv[1]))) {
-	fprintf(stderr, "Cannot open display %s\n", argv[1]);
-	return -1;
+        fprintf(stderr, "Cannot open display %s\n", argv[1]);
+        return -1;
     }
 
-    screen  = strtol(argv[2],  NULL, 0);
+    screen = strtol(argv[2], NULL, 0);
 
     mask |= (DMXScreenWindowXoffset |
-	     DMXScreenWindowYoffset |
-	     DMXScreenWindowWidth   |
-	     DMXScreenWindowHeight);
-    attr.screenWindowXoffset = strtol(argv[3],  NULL, 0);
-    attr.screenWindowYoffset = strtol(argv[4],  NULL, 0);
-    attr.screenWindowWidth   = strtol(argv[5],  NULL, 0);
-    attr.screenWindowHeight  = strtol(argv[6],  NULL, 0);
+             DMXScreenWindowYoffset |
+             DMXScreenWindowWidth | DMXScreenWindowHeight);
+    attr.screenWindowXoffset = strtol(argv[3], NULL, 0);
+    attr.screenWindowYoffset = strtol(argv[4], NULL, 0);
+    attr.screenWindowWidth = strtol(argv[5], NULL, 0);
+    attr.screenWindowHeight = strtol(argv[6], NULL, 0);
 
     mask |= (DMXRootWindowXoffset |
-	     DMXRootWindowYoffset |
-	     DMXRootWindowWidth   |
-	     DMXRootWindowHeight);
-    attr.rootWindowXoffset = strtol(argv[7],  NULL, 0);
-    attr.rootWindowYoffset = strtol(argv[8],  NULL, 0);
-    attr.rootWindowWidth   = strtol(argv[9],  NULL, 0);
-    attr.rootWindowHeight  = strtol(argv[10], NULL, 0);
+             DMXRootWindowYoffset | DMXRootWindowWidth | DMXRootWindowHeight);
+    attr.rootWindowXoffset = strtol(argv[7], NULL, 0);
+    attr.rootWindowYoffset = strtol(argv[8], NULL, 0);
+    attr.rootWindowWidth = strtol(argv[9], NULL, 0);
+    attr.rootWindowHeight = strtol(argv[10], NULL, 0);
 
     mask |= DMXRootWindowXorigin | DMXRootWindowYorigin;
     attr.rootWindowXorigin = strtol(argv[11], NULL, 0);
@@ -99,62 +99,61 @@ int main(int argc, char **argv)
 
     if (major_version == 1 && minor_version < 3) {
         fprintf(stderr,
-		"ReconfigureScreen not supported in this extension version\n");
+                "ReconfigureScreen not supported in this extension version\n");
         return -1;
     }
 
     if (major_version < 2) {
         fprintf(stderr,
-		"ChangeScreensAttributes not supported in this extension "
-		"version\n");
+                "ChangeScreensAttributes not supported in this extension "
+                "version\n");
         return -1;
     }
 
     if (!(status = DMXChangeScreensAttributes(display, 1, &screen, 1, &mask,
                                               &attr, &errorScreen))) {
         printf("Reconfigured screen #%d to "
-	       "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n",
-	       screen,
-	       attr.screenWindowWidth,
-	       attr.screenWindowHeight,
-	       (attr.screenWindowXoffset < 0 ? "" : "+"),
-	       attr.screenWindowXoffset,
-	       (attr.screenWindowYoffset < 0 ? "" : "+"),
-	       attr.screenWindowYoffset,
-	       attr.rootWindowWidth,
-	       attr.rootWindowHeight,
-	       (attr.rootWindowXoffset < 0 ? "" : "+"),
-	       attr.rootWindowXoffset,
-	       (attr.rootWindowYoffset < 0 ? "" : "+"),
-	       attr.rootWindowYoffset,
-	       (attr.rootWindowXorigin < 0 ? "" : "+"),
-	       attr.rootWindowXorigin,
-	       (attr.rootWindowYorigin < 0 ? "" : "+"),
-	       attr.rootWindowYorigin);
-    } else {
+               "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n",
+               screen,
+               attr.screenWindowWidth,
+               attr.screenWindowHeight,
+               (attr.screenWindowXoffset < 0 ? "" : "+"),
+               attr.screenWindowXoffset,
+               (attr.screenWindowYoffset < 0 ? "" : "+"),
+               attr.screenWindowYoffset,
+               attr.rootWindowWidth,
+               attr.rootWindowHeight,
+               (attr.rootWindowXoffset < 0 ? "" : "+"),
+               attr.rootWindowXoffset,
+               (attr.rootWindowYoffset < 0 ? "" : "+"),
+               attr.rootWindowYoffset,
+               (attr.rootWindowXorigin < 0 ? "" : "+"),
+               attr.rootWindowXorigin,
+               (attr.rootWindowYorigin < 0 ? "" : "+"), attr.rootWindowYorigin);
+    }
+    else {
         fprintf(stderr,
                 "Could not set screen #%d to "
-		"%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n"
+                "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n"
                 "[status = %d, errorScreen=%d]\n",
                 screen,
-		attr.screenWindowWidth,
-		attr.screenWindowHeight,
-		(attr.screenWindowXoffset < 0 ? "" : "+"),
-		attr.screenWindowXoffset,
-		(attr.screenWindowYoffset < 0 ? "" : "+"),
-		attr.screenWindowYoffset,
-		attr.rootWindowWidth,
-		attr.rootWindowHeight,
-		(attr.rootWindowXoffset < 0 ? "" : "+"),
-		attr.rootWindowXoffset,
-		(attr.rootWindowYoffset < 0 ? "" : "+"),
-		attr.rootWindowYoffset,
-		(attr.rootWindowXorigin < 0 ? "" : "+"),
-		attr.rootWindowXorigin,
-		(attr.rootWindowYorigin < 0 ? "" : "+"),
-		attr.rootWindowYorigin,
-		status, errorScreen);
-	return -1;
+                attr.screenWindowWidth,
+                attr.screenWindowHeight,
+                (attr.screenWindowXoffset < 0 ? "" : "+"),
+                attr.screenWindowXoffset,
+                (attr.screenWindowYoffset < 0 ? "" : "+"),
+                attr.screenWindowYoffset,
+                attr.rootWindowWidth,
+                attr.rootWindowHeight,
+                (attr.rootWindowXoffset < 0 ? "" : "+"),
+                attr.rootWindowXoffset,
+                (attr.rootWindowYoffset < 0 ? "" : "+"),
+                attr.rootWindowYoffset,
+                (attr.rootWindowXorigin < 0 ? "" : "+"),
+                attr.rootWindowXorigin,
+                (attr.rootWindowYorigin < 0 ? "" : "+"),
+                attr.rootWindowYorigin, status, errorScreen);
+        return -1;
     }
 
     XCloseDisplay(display);