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, 146 insertions, 164 deletions

diff --git a/xorg-server/randr/rrinfo.c b/xorg-server/randr/rrinfo.c
index 02aea5245..114ec3471 100644
--- a/xorg-server/randr/rrinfo.c
+++ b/xorg-server/randr/rrinfo.c
@@ -24,46 +24,45 @@
 
 #ifdef RANDR_10_INTERFACE
 static RRModePtr
-RROldModeAdd (RROutputPtr output, RRScreenSizePtr size, int refresh)
+RROldModeAdd(RROutputPtr output, RRScreenSizePtr size, int refresh)
 {
-    ScreenPtr	pScreen = output->pScreen;
+    ScreenPtr pScreen = output->pScreen;
+
     rrScrPriv(pScreen);
-    xRRModeInfo	modeInfo;
-    char	name[100];
-    RRModePtr	mode;
-    int		i;
-    RRModePtr   *modes;
-    
-    memset (&modeInfo, '\0', sizeof (modeInfo));
-    snprintf (name, sizeof(name), "%dx%d", size->width, size->height);
-    
+    xRRModeInfo modeInfo;
+    char name[100];
+    RRModePtr mode;
+    int i;
+    RRModePtr *modes;
+
+    memset(&modeInfo, '\0', sizeof(modeInfo));
+    snprintf(name, sizeof(name), "%dx%d", size->width, size->height);
+
     modeInfo.width = size->width;
     modeInfo.height = size->height;
     modeInfo.hTotal = size->width;
     modeInfo.vTotal = size->height;
     modeInfo.dotClock = ((CARD32) size->width * (CARD32) size->height *
-			 (CARD32) refresh);
-    modeInfo.nameLength = strlen (name);
-    mode = RRModeGet (&modeInfo, name);
+                         (CARD32) refresh);
+    modeInfo.nameLength = strlen(name);
+    mode = RRModeGet(&modeInfo, name);
     if (!mode)
-	return NULL;
+        return NULL;
     for (i = 0; i < output->numModes; i++)
-	if (output->modes[i] == mode)
-	{
-	    RRModeDestroy (mode);
-	    return mode;
-	}
-    
+        if (output->modes[i] == mode) {
+            RRModeDestroy(mode);
+            return mode;
+        }
+
     if (output->numModes)
-	modes = realloc(output->modes,
-			  (output->numModes + 1) * sizeof (RRModePtr));
+        modes = realloc(output->modes,
+                        (output->numModes + 1) * sizeof(RRModePtr));
     else
-	modes = malloc(sizeof (RRModePtr));
-    if (!modes)
-    {
-	RRModeDestroy (mode);
-	FreeResource (mode->mode.id, 0);
-	return NULL;
+        modes = malloc(sizeof(RRModePtr));
+    if (!modes) {
+        RRModeDestroy(mode);
+        FreeResource(mode->mode.id, 0);
+        return NULL;
     }
     modes[output->numModes++] = mode;
     output->modes = modes;
@@ -74,101 +73,95 @@ RROldModeAdd (RROutputPtr output, RRScreenSizePtr size, int refresh)
 }
 
 static void
-RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
+RRScanOldConfig(ScreenPtr pScreen, Rotation rotations)
 {
     rrScrPriv(pScreen);
-    RROutputPtr	output;
-    RRCrtcPtr	crtc;
-    RRModePtr	mode, newMode = NULL;
-    int		i;
-    CARD16	minWidth = MAXSHORT, minHeight = MAXSHORT;
-    CARD16	maxWidth = 0, maxHeight = 0;
-    
+    RROutputPtr output;
+    RRCrtcPtr crtc;
+    RRModePtr mode, newMode = NULL;
+    int i;
+    CARD16 minWidth = MAXSHORT, minHeight = MAXSHORT;
+    CARD16 maxWidth = 0, maxHeight = 0;
+
     /*
      * First time through, create a crtc and output and hook
      * them together
      */
-    if (pScrPriv->numOutputs == 0 &&
-	pScrPriv->numCrtcs == 0)
-    {
-	crtc = RRCrtcCreate (pScreen, NULL);
-	if (!crtc)
-	    return;
-	output = RROutputCreate (pScreen, "default", 7, NULL);
-	if (!output)
-	    return;
-	RROutputSetCrtcs (output, &crtc, 1);
-	RROutputSetConnection (output, RR_Connected);
-	RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
+    if (pScrPriv->numOutputs == 0 && pScrPriv->numCrtcs == 0) {
+        crtc = RRCrtcCreate(pScreen, NULL);
+        if (!crtc)
+            return;
+        output = RROutputCreate(pScreen, "default", 7, NULL);
+        if (!output)
+            return;
+        RROutputSetCrtcs(output, &crtc, 1);
+        RROutputSetConnection(output, RR_Connected);
+        RROutputSetSubpixelOrder(output, PictureGetSubpixelOrder(pScreen));
     }
 
     output = pScrPriv->outputs[0];
     if (!output)
-	return;
+        return;
     crtc = pScrPriv->crtcs[0];
     if (!crtc)
-	return;
+        return;
 
     /* check rotations */
-    if (rotations != crtc->rotations)
-    {
+    if (rotations != crtc->rotations) {
         crtc->rotations = rotations;
-	crtc->changed = TRUE;
-	pScrPriv->changed = TRUE;
+        crtc->changed = TRUE;
+        pScrPriv->changed = TRUE;
     }
-	
+
     /* regenerate mode list */
-    for (i = 0; i < pScrPriv->nSizes; i++)
-    {
-	RRScreenSizePtr	size = &pScrPriv->pSizes[i];
-	int		r;
-
-	if (size->nRates)
-	{
-	    for (r = 0; r < size->nRates; r++)
-	    {
-		mode = RROldModeAdd (output, size, size->pRates[r].rate);
-		if (i == pScrPriv->size && 
-		    size->pRates[r].rate == pScrPriv->rate)
-		{
-		    newMode = mode;
-		}
-	    }
-	    free(size->pRates);
-	}
-	else
-	{
-	    mode = RROldModeAdd (output, size, 0);
-	    if (i == pScrPriv->size)
-		newMode = mode;
-	}
+    for (i = 0; i < pScrPriv->nSizes; i++) {
+        RRScreenSizePtr size = &pScrPriv->pSizes[i];
+        int r;
+
+        if (size->nRates) {
+            for (r = 0; r < size->nRates; r++) {
+                mode = RROldModeAdd(output, size, size->pRates[r].rate);
+                if (i == pScrPriv->size &&
+                    size->pRates[r].rate == pScrPriv->rate) {
+                    newMode = mode;
+                }
+            }
+            free(size->pRates);
+        }
+        else {
+            mode = RROldModeAdd(output, size, 0);
+            if (i == pScrPriv->size)
+                newMode = mode;
+        }
     }
     if (pScrPriv->nSizes)
-	free(pScrPriv->pSizes);
+        free(pScrPriv->pSizes);
     pScrPriv->pSizes = NULL;
     pScrPriv->nSizes = 0;
-	    
+
     /* find size bounds */
-    for (i = 0; i < output->numModes + output->numUserModes; i++) 
-    {
-	RRModePtr   mode = (i < output->numModes ? 
-			    output->modes[i] : 
-			    output->userModes[i-output->numModes]);
-        CARD16	    width = mode->mode.width;
-        CARD16	    height = mode->mode.height;
-	
-	if (width < minWidth) minWidth = width;
-	if (width > maxWidth) maxWidth = width;
-	if (height < minHeight) minHeight = height;
-	if (height > maxHeight) maxHeight = height;
+    for (i = 0; i < output->numModes + output->numUserModes; i++) {
+        RRModePtr mode = (i < output->numModes ?
+                          output->modes[i] :
+                          output->userModes[i - output->numModes]);
+        CARD16 width = mode->mode.width;
+        CARD16 height = mode->mode.height;
+
+        if (width < minWidth)
+            minWidth = width;
+        if (width > maxWidth)
+            maxWidth = width;
+        if (height < minHeight)
+            minHeight = height;
+        if (height > maxHeight)
+            maxHeight = height;
     }
 
-    RRScreenSetSizeRange (pScreen, minWidth, minHeight, maxWidth, maxHeight);
+    RRScreenSetSizeRange(pScreen, minWidth, minHeight, maxWidth, maxHeight);
 
     /* notice current mode */
     if (newMode)
-	RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,
-		      NULL, 1, &output);
+        RRCrtcNotify(crtc, newMode, 0, 0, pScrPriv->rotation, NULL, 1, &output);
 }
 #endif
 
@@ -176,37 +169,37 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
  * Poll the driver for changed information
  */
 Bool
-RRGetInfo (ScreenPtr pScreen, Bool force_query)
+RRGetInfo(ScreenPtr pScreen, Bool force_query)
 {
-    rrScrPriv (pScreen);
-    Rotation	    rotations;
-    int		    i;
+    rrScrPriv(pScreen);
+    Rotation rotations;
+    int i;
 
     /* Return immediately if we don't need to re-query and we already have the
      * information.
      */
     if (!force_query) {
-	if (pScrPriv->numCrtcs != 0 || pScrPriv->numOutputs != 0)
-	    return TRUE;
+        if (pScrPriv->numCrtcs != 0 || pScrPriv->numOutputs != 0)
+            return TRUE;
     }
 
     for (i = 0; i < pScrPriv->numOutputs; i++)
-	pScrPriv->outputs[i]->changed = FALSE;
+        pScrPriv->outputs[i]->changed = FALSE;
     for (i = 0; i < pScrPriv->numCrtcs; i++)
-	pScrPriv->crtcs[i]->changed = FALSE;
-    
+        pScrPriv->crtcs[i]->changed = FALSE;
+
     rotations = 0;
     pScrPriv->changed = FALSE;
     pScrPriv->configChanged = FALSE;
-    
+
     if (!(*pScrPriv->rrGetInfo) (pScreen, &rotations))
-	return FALSE;
+        return FALSE;
 
 #if RANDR_10_INTERFACE
     if (pScrPriv->nSizes)
-	RRScanOldConfig (pScreen, rotations);
+        RRScanOldConfig(pScreen, rotations);
 #endif
-    RRTellChanged (pScreen);
+    RRTellChanged(pScreen);
     return TRUE;
 }
 
@@ -214,25 +207,22 @@ RRGetInfo (ScreenPtr pScreen, Bool force_query)
  * Register the range of sizes for the screen
  */
 void
-RRScreenSetSizeRange (ScreenPtr	pScreen,
-		      CARD16	minWidth,
-		      CARD16	minHeight,
-		      CARD16	maxWidth,
-		      CARD16	maxHeight)
+RRScreenSetSizeRange(ScreenPtr pScreen,
+                     CARD16 minWidth,
+                     CARD16 minHeight, CARD16 maxWidth, CARD16 maxHeight)
 {
-    rrScrPriv (pScreen);
+    rrScrPriv(pScreen);
 
     if (!pScrPriv)
-	return;
+        return;
     if (pScrPriv->minWidth == minWidth && pScrPriv->minHeight == minHeight &&
-	pScrPriv->maxWidth == maxWidth && pScrPriv->maxHeight == maxHeight)
-    {
-	return;
+        pScrPriv->maxWidth == maxWidth && pScrPriv->maxHeight == maxHeight) {
+        return;
     }
-	
-    pScrPriv->minWidth  = minWidth;
+
+    pScrPriv->minWidth = minWidth;
     pScrPriv->minHeight = minHeight;
-    pScrPriv->maxWidth  = maxWidth;
+    pScrPriv->maxWidth = maxWidth;
     pScrPriv->maxHeight = maxHeight;
     pScrPriv->changed = TRUE;
     pScrPriv->configChanged = TRUE;
@@ -240,73 +230,67 @@ RRScreenSetSizeRange (ScreenPtr	pScreen,
 
 #ifdef RANDR_10_INTERFACE
 static Bool
-RRScreenSizeMatches (RRScreenSizePtr  a,
-		   RRScreenSizePtr  b)
+RRScreenSizeMatches(RRScreenSizePtr a, RRScreenSizePtr b)
 {
     if (a->width != b->width)
-	return FALSE;
+        return FALSE;
     if (a->height != b->height)
-	return FALSE;
+        return FALSE;
     if (a->mmWidth != b->mmWidth)
-	return FALSE;
+        return FALSE;
     if (a->mmHeight != b->mmHeight)
-	return FALSE;
+        return FALSE;
     return TRUE;
 }
 
 RRScreenSizePtr
-RRRegisterSize (ScreenPtr	    pScreen,
-		short		    width, 
-		short		    height,
-		short		    mmWidth,
-		short		    mmHeight)
+RRRegisterSize(ScreenPtr pScreen,
+               short width, short height, short mmWidth, short mmHeight)
 {
-    rrScrPriv (pScreen);
-    int		    i;
-    RRScreenSize    tmp;
+    rrScrPriv(pScreen);
+    int i;
+    RRScreenSize tmp;
     RRScreenSizePtr pNew;
 
     if (!pScrPriv)
-	return 0;
-    
+        return 0;
+
     tmp.id = 0;
     tmp.width = width;
-    tmp.height= height;
+    tmp.height = height;
     tmp.mmWidth = mmWidth;
     tmp.mmHeight = mmHeight;
     tmp.pRates = 0;
     tmp.nRates = 0;
     for (i = 0; i < pScrPriv->nSizes; i++)
-	if (RRScreenSizeMatches (&tmp, &pScrPriv->pSizes[i]))
-	    return &pScrPriv->pSizes[i];
+        if (RRScreenSizeMatches(&tmp, &pScrPriv->pSizes[i]))
+            return &pScrPriv->pSizes[i];
     pNew = realloc(pScrPriv->pSizes,
-		     (pScrPriv->nSizes + 1) * sizeof (RRScreenSize));
+                   (pScrPriv->nSizes + 1) * sizeof(RRScreenSize));
     if (!pNew)
-	return 0;
+        return 0;
     pNew[pScrPriv->nSizes++] = tmp;
     pScrPriv->pSizes = pNew;
-    return &pNew[pScrPriv->nSizes-1];
+    return &pNew[pScrPriv->nSizes - 1];
 }
 
-Bool RRRegisterRate (ScreenPtr		pScreen,
-		     RRScreenSizePtr	pSize,
-		     int		rate)
+Bool
+RRRegisterRate(ScreenPtr pScreen, RRScreenSizePtr pSize, int rate)
 {
     rrScrPriv(pScreen);
-    int		    i;
+    int i;
     RRScreenRatePtr pNew, pRate;
 
     if (!pScrPriv)
-	return FALSE;
-    
+        return FALSE;
+
     for (i = 0; i < pSize->nRates; i++)
-	if (pSize->pRates[i].rate == rate)
-	    return TRUE;
+        if (pSize->pRates[i].rate == rate)
+            return TRUE;
 
-    pNew = realloc(pSize->pRates,
-		     (pSize->nRates + 1) * sizeof (RRScreenRate));
+    pNew = realloc(pSize->pRates, (pSize->nRates + 1) * sizeof(RRScreenRate));
     if (!pNew)
-	return FALSE;
+        return FALSE;
     pRate = &pNew[pSize->nRates++];
     pRate->rate = rate;
     pSize->pRates = pNew;
@@ -316,24 +300,22 @@ Bool RRRegisterRate (ScreenPtr		pScreen,
 Rotation
 RRGetRotation(ScreenPtr pScreen)
 {
-    RROutputPtr	output = RRFirstOutput (pScreen);
+    RROutputPtr output = RRFirstOutput(pScreen);
 
     if (!output)
-	return RR_Rotate_0;
+        return RR_Rotate_0;
 
     return output->crtc->rotation;
 }
 
 void
-RRSetCurrentConfig (ScreenPtr		pScreen,
-		    Rotation		rotation,
-		    int			rate,
-		    RRScreenSizePtr	pSize)
+RRSetCurrentConfig(ScreenPtr pScreen,
+                   Rotation rotation, int rate, RRScreenSizePtr pSize)
 {
-    rrScrPriv (pScreen);
+    rrScrPriv(pScreen);
 
     if (!pScrPriv)
-	return;
+        return;
     pScrPriv->size = pSize - pScrPriv->pSizes;
     pScrPriv->rotation = rotation;
     pScrPriv->rate = rate;