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, 245 insertions, 282 deletions

diff --git a/xorg-server/randr/rroutput.c b/xorg-server/randr/rroutput.c
index b57be198f..0890c55b5 100644
--- a/xorg-server/randr/rroutput.c
+++ b/xorg-server/randr/rroutput.c
@@ -23,23 +23,22 @@
 
 #include "randrstr.h"
 
-RESTYPE	RROutputType;
+RESTYPE RROutputType;
 
 /*
  * Notify the output of some change
  */
 void
-RROutputChanged (RROutputPtr output, Bool configChanged)
+RROutputChanged(RROutputPtr output, Bool configChanged)
 {
-    ScreenPtr	pScreen = output->pScreen;
-    
+    ScreenPtr pScreen = output->pScreen;
+
     output->changed = TRUE;
-    if (pScreen)
-    {
-	rrScrPriv (pScreen);
-	pScrPriv->changed = TRUE;
-	if (configChanged)
-	    pScrPriv->configChanged = TRUE;
+    if (pScreen) {
+        rrScrPriv(pScreen);
+        pScrPriv->changed = TRUE;
+        if (configChanged)
+            pScrPriv->configChanged = TRUE;
     }
 }
 
@@ -48,38 +47,36 @@ RROutputChanged (RROutputPtr output, Bool configChanged)
  */
 
 RROutputPtr
-RROutputCreate (ScreenPtr   pScreen,
-		const char  *name,
-		int	    nameLength,
-		void	    *devPrivate)
+RROutputCreate(ScreenPtr pScreen,
+               const char *name, int nameLength, void *devPrivate)
 {
-    RROutputPtr	    output;
-    RROutputPtr	    *outputs;
-    rrScrPrivPtr    pScrPriv;
+    RROutputPtr output;
+    RROutputPtr *outputs;
+    rrScrPrivPtr pScrPriv;
 
     if (!RRInit())
-	return NULL;
-    
+        return NULL;
+
     pScrPriv = rrGetScrPriv(pScreen);
 
     if (pScrPriv->numOutputs)
-	outputs = realloc(pScrPriv->outputs,
-			    (pScrPriv->numOutputs + 1) * sizeof (RROutputPtr));
+        outputs = realloc(pScrPriv->outputs,
+                          (pScrPriv->numOutputs + 1) * sizeof(RROutputPtr));
     else
-	outputs = malloc(sizeof (RROutputPtr));
+        outputs = malloc(sizeof(RROutputPtr));
     if (!outputs)
-	return FALSE;
+        return FALSE;
 
     pScrPriv->outputs = outputs;
-    
-    output = malloc(sizeof (RROutputRec) + nameLength + 1);
+
+    output = malloc(sizeof(RROutputRec) + nameLength + 1);
     if (!output)
-	return NULL;
-    output->id = FakeClientID (0);
+        return NULL;
+    output->id = FakeClientID(0);
     output->pScreen = pScreen;
     output->name = (char *) (output + 1);
     output->nameLength = nameLength;
-    memcpy (output->name, name, nameLength);
+    memcpy(output->name, name, nameLength);
     output->name[nameLength] = '\0';
     output->connection = RR_UnknownConnection;
     output->subpixelOrder = SubPixelUnknown;
@@ -99,9 +96,9 @@ RROutputCreate (ScreenPtr   pScreen,
     output->pendingProperties = FALSE;
     output->changed = FALSE;
     output->devPrivate = devPrivate;
-    
-    if (!AddResource (output->id, RROutputType, (pointer) output))
-	return NULL;
+
+    if (!AddResource(output->id, RROutputType, (pointer) output))
+        return NULL;
 
     pScrPriv->outputs[pScrPriv->numOutputs++] = output;
     return output;
@@ -111,300 +108,273 @@ RROutputCreate (ScreenPtr   pScreen,
  * Notify extension that output parameters have been changed
  */
 Bool
-RROutputSetClones (RROutputPtr  output,
-		   RROutputPtr  *clones,
-		   int		numClones)
+RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones)
 {
-    RROutputPtr	*newClones;
-    int		i;
-
-    if (numClones == output->numClones)
-    {
-	for (i = 0; i < numClones; i++)
-	    if (output->clones[i] != clones[i])
-		break;
-	if (i == numClones)
-	    return TRUE;
+    RROutputPtr *newClones;
+    int i;
+
+    if (numClones == output->numClones) {
+        for (i = 0; i < numClones; i++)
+            if (output->clones[i] != clones[i])
+                break;
+        if (i == numClones)
+            return TRUE;
     }
-    if (numClones)
-    {
-	newClones = malloc(numClones * sizeof (RROutputPtr));
-	if (!newClones)
-	    return FALSE;
+    if (numClones) {
+        newClones = malloc(numClones * sizeof(RROutputPtr));
+        if (!newClones)
+            return FALSE;
     }
     else
-	newClones = NULL;
+        newClones = NULL;
     free(output->clones);
-    memcpy (newClones, clones, numClones * sizeof (RROutputPtr));
+    memcpy(newClones, clones, numClones * sizeof(RROutputPtr));
     output->clones = newClones;
     output->numClones = numClones;
-    RROutputChanged (output, TRUE);
+    RROutputChanged(output, TRUE);
     return TRUE;
 }
 
 Bool
-RROutputSetModes (RROutputPtr	output,
-		  RRModePtr	*modes,
-		  int		numModes,
-		  int		numPreferred)
+RROutputSetModes(RROutputPtr output,
+                 RRModePtr * modes, int numModes, int numPreferred)
 {
-    RRModePtr	*newModes;
-    int		i;
-
-    if (numModes == output->numModes && numPreferred == output->numPreferred)
-    {
-	for (i = 0; i < numModes; i++)
-	    if (output->modes[i] != modes[i])
-		break;
-	if (i == numModes)
-	{
-	    for (i = 0; i < numModes; i++)
-		RRModeDestroy (modes[i]);
-	    return TRUE;
-	}
+    RRModePtr *newModes;
+    int i;
+
+    if (numModes == output->numModes && numPreferred == output->numPreferred) {
+        for (i = 0; i < numModes; i++)
+            if (output->modes[i] != modes[i])
+                break;
+        if (i == numModes) {
+            for (i = 0; i < numModes; i++)
+                RRModeDestroy(modes[i]);
+            return TRUE;
+        }
     }
 
-    if (numModes)
-    {
-	newModes = malloc(numModes * sizeof (RRModePtr));
-	if (!newModes)
-	    return FALSE;
+    if (numModes) {
+        newModes = malloc(numModes * sizeof(RRModePtr));
+        if (!newModes)
+            return FALSE;
     }
     else
-	newModes = NULL;
-    if (output->modes)
-    {
-	for (i = 0; i < output->numModes; i++)
-	    RRModeDestroy (output->modes[i]);
-	free(output->modes);
+        newModes = NULL;
+    if (output->modes) {
+        for (i = 0; i < output->numModes; i++)
+            RRModeDestroy(output->modes[i]);
+        free(output->modes);
     }
-    memcpy (newModes, modes, numModes * sizeof (RRModePtr));
+    memcpy(newModes, modes, numModes * sizeof(RRModePtr));
     output->modes = newModes;
     output->numModes = numModes;
     output->numPreferred = numPreferred;
-    RROutputChanged (output, TRUE);
+    RROutputChanged(output, TRUE);
     return TRUE;
 }
 
 int
-RROutputAddUserMode (RROutputPtr    output,
-		     RRModePtr	    mode)
+RROutputAddUserMode(RROutputPtr output, RRModePtr mode)
 {
-    int		m;
-    ScreenPtr	pScreen = output->pScreen;
+    int m;
+    ScreenPtr pScreen = output->pScreen;
+
     rrScrPriv(pScreen);
-    RRModePtr	*newModes;
+    RRModePtr *newModes;
 
     /* Check to see if this mode is already listed for this output */
-    for (m = 0; m < output->numModes + output->numUserModes; m++)
-    {
-	RRModePtr   e = (m < output->numModes ?
-			 output->modes[m] :
-			 output->userModes[m - output->numModes]);
-	if (mode == e)
-	    return Success;
+    for (m = 0; m < output->numModes + output->numUserModes; m++) {
+        RRModePtr e = (m < output->numModes ?
+                       output->modes[m] :
+                       output->userModes[m - output->numModes]);
+        if (mode == e)
+            return Success;
     }
 
     /* Check with the DDX to see if this mode is OK */
     if (pScrPriv->rrOutputValidateMode)
-	if (!pScrPriv->rrOutputValidateMode (pScreen, output, mode))
-	    return BadMatch;
+        if (!pScrPriv->rrOutputValidateMode(pScreen, output, mode))
+            return BadMatch;
 
     if (output->userModes)
-	newModes = realloc(output->userModes,
-			     (output->numUserModes + 1) * sizeof (RRModePtr));
+        newModes = realloc(output->userModes,
+                           (output->numUserModes + 1) * sizeof(RRModePtr));
     else
-	newModes = malloc(sizeof (RRModePtr));
+        newModes = malloc(sizeof(RRModePtr));
     if (!newModes)
-	return BadAlloc;
+        return BadAlloc;
 
     output->userModes = newModes;
     output->userModes[output->numUserModes++] = mode;
     ++mode->refcnt;
-    RROutputChanged (output, TRUE);
-    RRTellChanged (pScreen);
+    RROutputChanged(output, TRUE);
+    RRTellChanged(pScreen);
     return Success;
 }
 
 int
-RROutputDeleteUserMode (RROutputPtr output,
-			RRModePtr   mode)
+RROutputDeleteUserMode(RROutputPtr output, RRModePtr mode)
 {
-    int		m;
-    
+    int m;
+
     /* Find this mode in the user mode list */
-    for (m = 0; m < output->numUserModes; m++)
-    {
-	RRModePtr   e = output->userModes[m];
+    for (m = 0; m < output->numUserModes; m++) {
+        RRModePtr e = output->userModes[m];
 
-	if (mode == e)
-	    break;
+        if (mode == e)
+            break;
     }
     /* Not there, access error */
     if (m == output->numUserModes)
-	return BadAccess;
+        return BadAccess;
 
     /* make sure the mode isn't active for this output */
     if (output->crtc && output->crtc->mode == mode)
-	return BadMatch;
+        return BadMatch;
 
-    memmove (output->userModes + m, output->userModes + m + 1,
-	     (output->numUserModes - m - 1) * sizeof (RRModePtr));
+    memmove(output->userModes + m, output->userModes + m + 1,
+            (output->numUserModes - m - 1) * sizeof(RRModePtr));
     output->numUserModes--;
-    RRModeDestroy (mode);
+    RRModeDestroy(mode);
     return Success;
 }
 
 Bool
-RROutputSetCrtcs (RROutputPtr	output,
-		  RRCrtcPtr	*crtcs,
-		  int		numCrtcs)
+RROutputSetCrtcs(RROutputPtr output, RRCrtcPtr * crtcs, int numCrtcs)
 {
-    RRCrtcPtr	*newCrtcs;
-    int		i;
-
-    if (numCrtcs == output->numCrtcs)
-    {
-	for (i = 0; i < numCrtcs; i++)
-	    if (output->crtcs[i] != crtcs[i])
-		break;
-	if (i == numCrtcs)
-	    return TRUE;
+    RRCrtcPtr *newCrtcs;
+    int i;
+
+    if (numCrtcs == output->numCrtcs) {
+        for (i = 0; i < numCrtcs; i++)
+            if (output->crtcs[i] != crtcs[i])
+                break;
+        if (i == numCrtcs)
+            return TRUE;
     }
-    if (numCrtcs)
-    {
-	newCrtcs = malloc(numCrtcs * sizeof (RRCrtcPtr));
-	if (!newCrtcs)
-	    return FALSE;
+    if (numCrtcs) {
+        newCrtcs = malloc(numCrtcs * sizeof(RRCrtcPtr));
+        if (!newCrtcs)
+            return FALSE;
     }
     else
-	newCrtcs = NULL;
+        newCrtcs = NULL;
     free(output->crtcs);
-    memcpy (newCrtcs, crtcs, numCrtcs * sizeof (RRCrtcPtr));
+    memcpy(newCrtcs, crtcs, numCrtcs * sizeof(RRCrtcPtr));
     output->crtcs = newCrtcs;
     output->numCrtcs = numCrtcs;
-    RROutputChanged (output, TRUE);
+    RROutputChanged(output, TRUE);
     return TRUE;
 }
 
 Bool
-RROutputSetConnection (RROutputPtr  output,
-		       CARD8	    connection)
+RROutputSetConnection(RROutputPtr output, CARD8 connection)
 {
     if (output->connection == connection)
-	return TRUE;
+        return TRUE;
     output->connection = connection;
-    RROutputChanged (output, TRUE);
+    RROutputChanged(output, TRUE);
     return TRUE;
 }
 
 Bool
-RROutputSetSubpixelOrder (RROutputPtr output,
-			  int	      subpixelOrder)
+RROutputSetSubpixelOrder(RROutputPtr output, int subpixelOrder)
 {
     if (output->subpixelOrder == subpixelOrder)
-	return TRUE;
+        return TRUE;
 
     output->subpixelOrder = subpixelOrder;
-    RROutputChanged (output, FALSE);
+    RROutputChanged(output, FALSE);
     return TRUE;
 }
 
 Bool
-RROutputSetPhysicalSize (RROutputPtr	output,
-			 int		mmWidth,
-			 int		mmHeight)
+RROutputSetPhysicalSize(RROutputPtr output, int mmWidth, int mmHeight)
 {
     if (output->mmWidth == mmWidth && output->mmHeight == mmHeight)
-	return TRUE;
+        return TRUE;
     output->mmWidth = mmWidth;
     output->mmHeight = mmHeight;
-    RROutputChanged (output, FALSE);
+    RROutputChanged(output, FALSE);
     return TRUE;
 }
 
-
 void
 RRDeliverOutputEvent(ClientPtr client, WindowPtr pWin, RROutputPtr output)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
-    rrScrPriv (pScreen);
-    xRROutputChangeNotifyEvent	oe;
-    RRCrtcPtr	crtc = output->crtc;
-    RRModePtr	mode = crtc ? crtc->mode : 0;
-    
+
+    rrScrPriv(pScreen);
+    xRROutputChangeNotifyEvent oe;
+    RRCrtcPtr crtc = output->crtc;
+    RRModePtr mode = crtc ? crtc->mode : 0;
+
     oe.type = RRNotify + RREventBase;
     oe.subCode = RRNotify_OutputChange;
     oe.timestamp = pScrPriv->lastSetTime.milliseconds;
     oe.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
     oe.window = pWin->drawable.id;
     oe.output = output->id;
-    if (crtc)
-    {
-	oe.crtc = crtc->id;
-	oe.mode = mode ? mode->mode.id : None;
-	oe.rotation = crtc->rotation;
+    if (crtc) {
+        oe.crtc = crtc->id;
+        oe.mode = mode ? mode->mode.id : None;
+        oe.rotation = crtc->rotation;
     }
-    else
-    {
-	oe.crtc = None;
-	oe.mode = None;
-	oe.rotation = RR_Rotate_0;
+    else {
+        oe.crtc = None;
+        oe.mode = None;
+        oe.rotation = RR_Rotate_0;
     }
     oe.connection = output->connection;
     oe.subpixelOrder = output->subpixelOrder;
-    WriteEventsToClient (client, 1, (xEvent *) &oe);
+    WriteEventsToClient(client, 1, (xEvent *) &oe);
 }
 
 /*
  * Destroy a Output at shutdown
  */
 void
-RROutputDestroy (RROutputPtr output)
+RROutputDestroy(RROutputPtr output)
 {
-    FreeResource (output->id, 0);
+    FreeResource(output->id, 0);
 }
 
 static int
-RROutputDestroyResource (pointer value, XID pid)
+RROutputDestroyResource(pointer value, XID pid)
 {
-    RROutputPtr	output = (RROutputPtr) value;
-    ScreenPtr	pScreen = output->pScreen;
-    int		m;
-
-    if (pScreen)
-    {
-	rrScrPriv(pScreen);
-	int		i;
-
-	if (pScrPriv->primaryOutput == output)
-	    pScrPriv->primaryOutput = NULL;
-    
-	for (i = 0; i < pScrPriv->numOutputs; i++)
-	{
-	    if (pScrPriv->outputs[i] == output)
-	    {
-		memmove (pScrPriv->outputs + i, pScrPriv->outputs + i + 1,
-			 (pScrPriv->numOutputs - (i + 1)) * sizeof (RROutputPtr));
-		--pScrPriv->numOutputs;
-		break;
-	    }
-	}
+    RROutputPtr output = (RROutputPtr) value;
+    ScreenPtr pScreen = output->pScreen;
+    int m;
+
+    if (pScreen) {
+        rrScrPriv(pScreen);
+        int i;
+
+        if (pScrPriv->primaryOutput == output)
+            pScrPriv->primaryOutput = NULL;
+
+        for (i = 0; i < pScrPriv->numOutputs; i++) {
+            if (pScrPriv->outputs[i] == output) {
+                memmove(pScrPriv->outputs + i, pScrPriv->outputs + i + 1,
+                        (pScrPriv->numOutputs - (i + 1)) * sizeof(RROutputPtr));
+                --pScrPriv->numOutputs;
+                break;
+            }
+        }
     }
-    if (output->modes)
-    {
-	for (m = 0; m < output->numModes; m++)
-	    RRModeDestroy (output->modes[m]);
-	free(output->modes);
+    if (output->modes) {
+        for (m = 0; m < output->numModes; m++)
+            RRModeDestroy(output->modes[m]);
+        free(output->modes);
     }
-    
+
     for (m = 0; m < output->numUserModes; m++)
-	RRModeDestroy (output->userModes[m]);
+        RRModeDestroy(output->userModes[m]);
     free(output->userModes);
 
     free(output->crtcs);
     free(output->clones);
-    RRDeleteAllOutputProperties (output);
+    RRDeleteAllOutputProperties(output);
     free(output);
     return 1;
 }
@@ -413,11 +383,11 @@ RROutputDestroyResource (pointer value, XID pid)
  * Initialize output type
  */
 Bool
-RROutputInit (void)
+RROutputInit(void)
 {
-    RROutputType = CreateNewResourceType (RROutputDestroyResource, "OUTPUT");
+    RROutputType = CreateNewResourceType(RROutputDestroyResource, "OUTPUT");
     if (!RROutputType)
-	return FALSE;
+        return FALSE;
 
     return TRUE;
 }
@@ -434,21 +404,21 @@ RROutputInitErrorValue(void)
 #define OutputInfoExtra	(SIZEOF(xRRGetOutputInfoReply) - 32)
 
 int
-ProcRRGetOutputInfo (ClientPtr client)
+ProcRRGetOutputInfo(ClientPtr client)
 {
     REQUEST(xRRGetOutputInfoReq);
-    xRRGetOutputInfoReply	rep;
-    RROutputPtr			output;
-    CARD8			*extra;
-    unsigned long		extraLen;
-    ScreenPtr			pScreen;
-    rrScrPrivPtr		pScrPriv;
-    RRCrtc			*crtcs;
-    RRMode			*modes;
-    RROutput			*clones;
-    char			*name;
-    int				i;
-    
+    xRRGetOutputInfoReply rep;
+    RROutputPtr output;
+    CARD8 *extra;
+    unsigned long extraLen;
+    ScreenPtr pScreen;
+    rrScrPrivPtr pScrPriv;
+    RRCrtc *crtcs;
+    RRMode *modes;
+    RROutput *clones;
+    char *name;
+    int i;
+
     REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);
     VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
 
@@ -469,88 +439,81 @@ ProcRRGetOutputInfo (ClientPtr client)
     rep.nPreferred = output->numPreferred;
     rep.nClones = output->numClones;
     rep.nameLength = output->nameLength;
-    
+
     extraLen = ((output->numCrtcs +
-		 output->numModes + output->numUserModes +
-		 output->numClones +
-		 bytes_to_int32(rep.nameLength)) << 2);
-
-    if (extraLen)
-    {
-	rep.length += bytes_to_int32(extraLen);
-	extra = malloc(extraLen);
-	if (!extra)
-	    return BadAlloc;
+                 output->numModes + output->numUserModes +
+                 output->numClones + bytes_to_int32(rep.nameLength)) << 2);
+
+    if (extraLen) {
+        rep.length += bytes_to_int32(extraLen);
+        extra = malloc(extraLen);
+        if (!extra)
+            return BadAlloc;
     }
     else
-	extra = NULL;
+        extra = NULL;
 
     crtcs = (RRCrtc *) extra;
     modes = (RRMode *) (crtcs + output->numCrtcs);
     clones = (RROutput *) (modes + output->numModes + output->numUserModes);
     name = (char *) (clones + output->numClones);
-    
-    for (i = 0; i < output->numCrtcs; i++)
-    {
-	crtcs[i] = output->crtcs[i]->id;
-	if (client->swapped)
-	    swapl(&crtcs[i]);
+
+    for (i = 0; i < output->numCrtcs; i++) {
+        crtcs[i] = output->crtcs[i]->id;
+        if (client->swapped)
+            swapl(&crtcs[i]);
     }
-    for (i = 0; i < output->numModes + output->numUserModes; i++)
-    {
-	if (i < output->numModes)
-	    modes[i] = output->modes[i]->mode.id;
-	else
-	    modes[i] = output->userModes[i - output->numModes]->mode.id;
-	if (client->swapped)
-	    swapl(&modes[i]);
+    for (i = 0; i < output->numModes + output->numUserModes; i++) {
+        if (i < output->numModes)
+            modes[i] = output->modes[i]->mode.id;
+        else
+            modes[i] = output->userModes[i - output->numModes]->mode.id;
+        if (client->swapped)
+            swapl(&modes[i]);
     }
-    for (i = 0; i < output->numClones; i++)
-    {
-	clones[i] = output->clones[i]->id;
-	if (client->swapped)
-	    swapl(&clones[i]);
+    for (i = 0; i < output->numClones; i++) {
+        clones[i] = output->clones[i]->id;
+        if (client->swapped)
+            swapl(&clones[i]);
     }
-    memcpy (name, output->name, output->nameLength);
+    memcpy(name, output->name, output->nameLength);
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.timestamp);
-	swapl(&rep.crtc);
-	swapl(&rep.mmWidth);
-	swapl(&rep.mmHeight);
-	swaps(&rep.nCrtcs);
-	swaps(&rep.nModes);
-	swaps(&rep.nClones);
-	swaps(&rep.nameLength);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.timestamp);
+        swapl(&rep.crtc);
+        swapl(&rep.mmWidth);
+        swapl(&rep.mmHeight);
+        swaps(&rep.nCrtcs);
+        swaps(&rep.nModes);
+        swaps(&rep.nClones);
+        swaps(&rep.nameLength);
     }
-    WriteToClient(client, sizeof(xRRGetOutputInfoReply), (char *)&rep);
-    if (extraLen)
-    {
-	WriteToClient (client, extraLen, (char *) extra);
-	free(extra);
+    WriteToClient(client, sizeof(xRRGetOutputInfoReply), (char *) &rep);
+    if (extraLen) {
+        WriteToClient(client, extraLen, (char *) extra);
+        free(extra);
     }
-    
+
     return Success;
 }
 
 static void
-RRSetPrimaryOutput(ScreenPtr pScreen, rrScrPrivPtr pScrPriv,
-		   RROutputPtr output)
+RRSetPrimaryOutput(ScreenPtr pScreen, rrScrPrivPtr pScrPriv, RROutputPtr output)
 {
     if (pScrPriv->primaryOutput == output)
-	return;
+        return;
 
     /* clear the old primary */
     if (pScrPriv->primaryOutput) {
-	RROutputChanged(pScrPriv->primaryOutput, 0);
-	pScrPriv->primaryOutput = NULL;
+        RROutputChanged(pScrPriv->primaryOutput, 0);
+        pScrPriv->primaryOutput = NULL;
     }
 
     /* set the new primary */
     if (output) {
-	pScrPriv->primaryOutput = output;
-	RROutputChanged(output, 0);
+        pScrPriv->primaryOutput = output;
+        RROutputChanged(output, 0);
     }
 
     pScrPriv->layoutChanged = TRUE;
@@ -571,15 +534,15 @@ ProcRRSetOutputPrimary(ClientPtr client)
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     if (stuff->output) {
-	VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
+        VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
 
-	if (output->pScreen != pWin->drawable.pScreen) {
-	    client->errorValue = stuff->window;
-	    return BadMatch;
-	}
+        if (output->pScreen != pWin->drawable.pScreen) {
+            client->errorValue = stuff->window;
+            return BadMatch;
+        }
     }
 
     pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
@@ -602,11 +565,11 @@ ProcRRGetOutputPrimary(ClientPtr client)
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
     if (pScrPriv)
-	primary = pScrPriv->primaryOutput;
+        primary = pScrPriv->primaryOutput;
 
     memset(&rep, 0, sizeof(rep));
     rep.type = X_Reply;
@@ -614,8 +577,8 @@ ProcRRGetOutputPrimary(ClientPtr client)
     rep.output = primary ? primary->id : None;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.output);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.output);
     }
 
     WriteToClient(client, sizeof(xRRGetOutputPrimaryReply), &rep);