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, 73 insertions, 78 deletions

diff --git a/xorg-server/randr/rrpointer.c b/xorg-server/randr/rrpointer.c
index 6b934c0c6..ec803e9d1 100644
--- a/xorg-server/randr/rrpointer.c
+++ b/xorg-server/randr/rrpointer.c
@@ -32,19 +32,19 @@
  */
 
 static Bool
-RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y)
+RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y)
 {
-    RRModePtr   mode = crtc->mode;
-    int		scan_width, scan_height;
+    RRModePtr mode = crtc->mode;
+    int scan_width, scan_height;
 
     if (!mode)
-	return FALSE;
+        return FALSE;
 
-    RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
+    RRCrtcGetScanoutSize(crtc, &scan_width, &scan_height);
 
     if (crtc->x <= x && x < crtc->x + scan_width &&
-	crtc->y <= y && y < crtc->y + scan_height)
-	return TRUE;
+        crtc->y <= y && y < crtc->y + scan_height)
+        return TRUE;
     return FALSE;
 }
 
@@ -52,81 +52,79 @@ RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y)
  * Find the CRTC nearest the specified position, ignoring 'skip'
  */
 static void
-RRPointerToNearestCrtc (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y, RRCrtcPtr skip)
+RRPointerToNearestCrtc(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
+                       RRCrtcPtr skip)
 {
-    rrScrPriv (pScreen);
-    int		c;
-    RRCrtcPtr	nearest = NULL;
-    int		best = 0;
-    int		best_dx = 0, best_dy = 0;
-
-    for (c = 0; c < pScrPriv->numCrtcs; c++)
-    {
-	RRCrtcPtr   crtc = pScrPriv->crtcs[c];
-	RRModePtr   mode = crtc->mode;
-	int	    dx, dy;
-	int	    dist;
-	int	    scan_width, scan_height;
-
-	if (!mode)
-	    continue;
-	if (crtc == skip)
-	    continue;
-
-	RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
-
-	if (x < crtc->x)
-	    dx = crtc->x - x;
-	else if (x > crtc->x + scan_width)
-	    dx = x - (crtc->x + scan_width);
-	else
-	    dx = 0;
-	if (y < crtc->y)
-	    dy = crtc->y - x;
-	else if (y > crtc->y + scan_height)
-	    dy = y - (crtc->y + scan_height);
-	else
-	    dy = 0;
-	dist = dx + dy;
-	if (!nearest || dist < best)
-	{
-	    nearest = crtc;
-	    best_dx = dx;
-	    best_dy = dy;
-	}
+    rrScrPriv(pScreen);
+    int c;
+    RRCrtcPtr nearest = NULL;
+    int best = 0;
+    int best_dx = 0, best_dy = 0;
+
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+        RRModePtr mode = crtc->mode;
+        int dx, dy;
+        int dist;
+        int scan_width, scan_height;
+
+        if (!mode)
+            continue;
+        if (crtc == skip)
+            continue;
+
+        RRCrtcGetScanoutSize(crtc, &scan_width, &scan_height);
+
+        if (x < crtc->x)
+            dx = crtc->x - x;
+        else if (x > crtc->x + scan_width)
+            dx = x - (crtc->x + scan_width);
+        else
+            dx = 0;
+        if (y < crtc->y)
+            dy = crtc->y - x;
+        else if (y > crtc->y + scan_height)
+            dy = y - (crtc->y + scan_height);
+        else
+            dy = 0;
+        dist = dx + dy;
+        if (!nearest || dist < best) {
+            nearest = crtc;
+            best_dx = dx;
+            best_dy = dy;
+        }
     }
     if (best_dx || best_dy)
-	(*pScreen->SetCursorPosition) (pDev, pScreen, x + best_dx, y + best_dy, TRUE);
+        (*pScreen->SetCursorPosition) (pDev, pScreen, x + best_dx, y + best_dy,
+                                       TRUE);
     pScrPriv->pointerCrtc = nearest;
 }
 
 void
-RRPointerMoved (ScreenPtr pScreen, int x, int y)
+RRPointerMoved(ScreenPtr pScreen, int x, int y)
 {
-    rrScrPriv (pScreen);
-    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;
-    int	c;
+    rrScrPriv(pScreen);
+    RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;
+    int c;
 
     /* Check last known CRTC */
-    if (pointerCrtc && RRCrtcContainsPosition (pointerCrtc, x, y))
-	return;
-    
+    if (pointerCrtc && RRCrtcContainsPosition(pointerCrtc, x, y))
+        return;
+
     /* Check all CRTCs */
-    for (c = 0; c < pScrPriv->numCrtcs; c++)
-    {
-	RRCrtcPtr   crtc = pScrPriv->crtcs[c];
-	
-	if (RRCrtcContainsPosition (crtc, x, y))
-	{
-	    /* Remember containing CRTC */
-	    pScrPriv->pointerCrtc = crtc;
-	    return;
-	}
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+
+        if (RRCrtcContainsPosition(crtc, x, y)) {
+            /* Remember containing CRTC */
+            pScrPriv->pointerCrtc = crtc;
+            return;
+        }
     }
 
     /* None contain pointer, find nearest */
     ErrorF("RRPointerMoved: Untested, may cause \"bogus pointer event\"\n");
-    RRPointerToNearestCrtc (inputInfo.pointer, pScreen, x, y, pointerCrtc);
+    RRPointerToNearestCrtc(inputInfo.pointer, pScreen, x, y, pointerCrtc);
 }
 
 /*
@@ -134,24 +132,21 @@ RRPointerMoved (ScreenPtr pScreen, int x, int y)
  * CRTC
  */
 void
-RRPointerScreenConfigured (ScreenPtr pScreen)
+RRPointerScreenConfigured(ScreenPtr pScreen)
 {
-    WindowPtr	pRoot;
-    ScreenPtr	pCurrentScreen;
-    int		x, y;
+    WindowPtr pRoot;
+    ScreenPtr pCurrentScreen;
+    int x, y;
     DeviceIntPtr pDev;
 
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
-    {
-        if (IsPointerDevice(pDev))
-        {
+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+        if (IsPointerDevice(pDev)) {
             pRoot = GetCurrentRootWindow(pDev);
             pCurrentScreen = pRoot ? pRoot->drawable.pScreen : NULL;
 
-            if (pScreen == pCurrentScreen)
-            {
+            if (pScreen == pCurrentScreen) {
                 GetSpritePosition(pDev, &x, &y);
-                RRPointerToNearestCrtc (pDev, pScreen, x, y, NULL);
+                RRPointerToNearestCrtc(pDev, pScreen, x, y, NULL);
             }
         }
     }