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, 168 insertions, 179 deletions

diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index 5a6a85287..85cf03738 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -24,7 +24,7 @@
 #include "protocol-versions.h"
 
 Bool
-RRClientKnowsRates (ClientPtr	pClient)
+RRClientKnowsRates(ClientPtr pClient)
 {
     rrClientPriv(pClient);
 
@@ -33,9 +33,9 @@ RRClientKnowsRates (ClientPtr	pClient)
 }
 
 static int
-ProcRRQueryVersion (ClientPtr client)
+ProcRRQueryVersion(ClientPtr client)
 {
-    xRRQueryVersionReply rep = {0};
+    xRRQueryVersionReply rep = { 0 };
     REQUEST(xRRQueryVersionReq);
     rrClientPriv(client);
 
@@ -47,209 +47,198 @@ ProcRRQueryVersion (ClientPtr client)
     rep.sequenceNumber = client->sequence;
 
     if (version_compare(stuff->majorVersion, stuff->minorVersion,
-                        SERVER_RANDR_MAJOR_VERSION, SERVER_RANDR_MINOR_VERSION) < 0)
-    {
-	rep.majorVersion = stuff->majorVersion;
-	rep.minorVersion = stuff->minorVersion;
-    } else
-    {
+                        SERVER_RANDR_MAJOR_VERSION,
+                        SERVER_RANDR_MINOR_VERSION) < 0) {
+        rep.majorVersion = stuff->majorVersion;
+        rep.minorVersion = stuff->minorVersion;
+    }
+    else {
         rep.majorVersion = SERVER_RANDR_MAJOR_VERSION;
         rep.minorVersion = SERVER_RANDR_MINOR_VERSION;
     }
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.majorVersion);
-	swapl(&rep.minorVersion);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.majorVersion);
+        swapl(&rep.minorVersion);
     }
-    WriteToClient(client, sizeof(xRRQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xRRQueryVersionReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcRRSelectInput (ClientPtr client)
+ProcRRSelectInput(ClientPtr client)
 {
     REQUEST(xRRSelectInputReq);
     rrClientPriv(client);
-    RRTimesPtr	pTimes;
-    WindowPtr	pWin;
-    RREventPtr	pRREvent, *pHead;
-    XID		clientResource;
-    int		rc;
+    RRTimesPtr pTimes;
+    WindowPtr pWin;
+    RREventPtr pRREvent, *pHead;
+    XID clientResource;
+    int rc;
 
     REQUEST_SIZE_MATCH(xRRSelectInputReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
     if (rc != Success)
-	return rc;
-    rc = dixLookupResourceByType((pointer *)&pHead, pWin->drawable.id,
-				 RREventType, client, DixWriteAccess);
+        return rc;
+    rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+                                 RREventType, client, DixWriteAccess);
     if (rc != Success && rc != BadValue)
-	return rc;
-
-    if (stuff->enable & (RRScreenChangeNotifyMask|
-			 RRCrtcChangeNotifyMask|
-			 RROutputChangeNotifyMask|
-			 RROutputPropertyNotifyMask)) 
-    {
-	ScreenPtr	pScreen = pWin->drawable.pScreen;
-	rrScrPriv	(pScreen);
-
-	pRREvent = NULL;
-	if (pHead) 
-	{
-	    /* check for existing entry. */
-	    for (pRREvent = *pHead; pRREvent; pRREvent = pRREvent->next)
-		if (pRREvent->client == client)
-		    break;
-	}
-
-	if (!pRREvent)
-	{
-	    /* build the entry */
-	    pRREvent = (RREventPtr) malloc(sizeof (RREventRec));
-	    if (!pRREvent)
-		return BadAlloc;
-	    pRREvent->next = 0;
-	    pRREvent->client = client;
-	    pRREvent->window = pWin;
-	    pRREvent->mask = stuff->enable;
-	    /*
-	     * add a resource that will be deleted when
-	     * the client goes away
-	     */
-	    clientResource = FakeClientID (client->index);
-	    pRREvent->clientResource = clientResource;
-	    if (!AddResource (clientResource, RRClientType, (pointer)pRREvent))
-		return BadAlloc;
-	    /*
-	     * create a resource to contain a pointer to the list
-	     * of clients selecting input.  This must be indirect as
-	     * the list may be arbitrarily rearranged which cannot be
-	     * done through the resource database.
-	     */
-	    if (!pHead)
-	    {
-		pHead = (RREventPtr *) malloc(sizeof (RREventPtr));
-		if (!pHead ||
-		    !AddResource (pWin->drawable.id, RREventType, (pointer)pHead))
-		{
-		    FreeResource (clientResource, RT_NONE);
-		    return BadAlloc;
-		}
-		*pHead = 0;
-	    }
-	    pRREvent->next = *pHead;
-	    *pHead = pRREvent;
-	}
-	/*
-	 * Now see if the client needs an event
-	 */
-	if (pScrPriv)
-	{
-	    pTimes = &((RRTimesPtr) (pRRClient + 1))[pScreen->myNum];
-	    if (CompareTimeStamps (pTimes->setTime, 
-				   pScrPriv->lastSetTime) != 0 ||
-		CompareTimeStamps (pTimes->configTime, 
-				   pScrPriv->lastConfigTime) != 0)
-	    {
-		if (pRREvent->mask & RRScreenChangeNotifyMask)
-		{
-		    RRDeliverScreenEvent (client, pWin, pScreen);
-		}
-
-		if (pRREvent->mask & RRCrtcChangeNotifyMask)
-		{
-		    int i;
-
-		    for (i = 0; i < pScrPriv->numCrtcs; i++)
-		    {
-			RRDeliverCrtcEvent (client, pWin, pScrPriv->crtcs[i]);
-		    }
-		}
-
-		if (pRREvent->mask & RROutputChangeNotifyMask)
-		{
-		    int i;
-
-		    for (i = 0; i < pScrPriv->numOutputs; i++)
-		    {
-			RRDeliverOutputEvent (client, pWin, pScrPriv->outputs[i]);
-		    }
-		}
-
-		/* We don't check for RROutputPropertyNotifyMask, as randrproto.txt doesn't
-		 * say if there ought to be notifications of changes to output properties
-		 * if those changes occurred before the time RRSelectInput is called.
-		 */
-	    }
-	}
+        return rc;
+
+    if (stuff->enable & (RRScreenChangeNotifyMask |
+                         RRCrtcChangeNotifyMask |
+                         RROutputChangeNotifyMask |
+                         RROutputPropertyNotifyMask)) {
+        ScreenPtr pScreen = pWin->drawable.pScreen;
+
+        rrScrPriv(pScreen);
+
+        pRREvent = NULL;
+        if (pHead) {
+            /* check for existing entry. */
+            for (pRREvent = *pHead; pRREvent; pRREvent = pRREvent->next)
+                if (pRREvent->client == client)
+                    break;
+        }
+
+        if (!pRREvent) {
+            /* build the entry */
+            pRREvent = (RREventPtr) malloc(sizeof(RREventRec));
+            if (!pRREvent)
+                return BadAlloc;
+            pRREvent->next = 0;
+            pRREvent->client = client;
+            pRREvent->window = pWin;
+            pRREvent->mask = stuff->enable;
+            /*
+             * add a resource that will be deleted when
+             * the client goes away
+             */
+            clientResource = FakeClientID(client->index);
+            pRREvent->clientResource = clientResource;
+            if (!AddResource(clientResource, RRClientType, (pointer) pRREvent))
+                return BadAlloc;
+            /*
+             * create a resource to contain a pointer to the list
+             * of clients selecting input.  This must be indirect as
+             * the list may be arbitrarily rearranged which cannot be
+             * done through the resource database.
+             */
+            if (!pHead) {
+                pHead = (RREventPtr *) malloc(sizeof(RREventPtr));
+                if (!pHead ||
+                    !AddResource(pWin->drawable.id, RREventType,
+                                 (pointer) pHead)) {
+                    FreeResource(clientResource, RT_NONE);
+                    return BadAlloc;
+                }
+                *pHead = 0;
+            }
+            pRREvent->next = *pHead;
+            *pHead = pRREvent;
+        }
+        /*
+         * Now see if the client needs an event
+         */
+        if (pScrPriv) {
+            pTimes = &((RRTimesPtr) (pRRClient + 1))[pScreen->myNum];
+            if (CompareTimeStamps(pTimes->setTime,
+                                  pScrPriv->lastSetTime) != 0 ||
+                CompareTimeStamps(pTimes->configTime,
+                                  pScrPriv->lastConfigTime) != 0) {
+                if (pRREvent->mask & RRScreenChangeNotifyMask) {
+                    RRDeliverScreenEvent(client, pWin, pScreen);
+                }
+
+                if (pRREvent->mask & RRCrtcChangeNotifyMask) {
+                    int i;
+
+                    for (i = 0; i < pScrPriv->numCrtcs; i++) {
+                        RRDeliverCrtcEvent(client, pWin, pScrPriv->crtcs[i]);
+                    }
+                }
+
+                if (pRREvent->mask & RROutputChangeNotifyMask) {
+                    int i;
+
+                    for (i = 0; i < pScrPriv->numOutputs; i++) {
+                        RRDeliverOutputEvent(client, pWin,
+                                             pScrPriv->outputs[i]);
+                    }
+                }
+
+                /* We don't check for RROutputPropertyNotifyMask, as randrproto.txt doesn't
+                 * say if there ought to be notifications of changes to output properties
+                 * if those changes occurred before the time RRSelectInput is called.
+                 */
+            }
+        }
     }
-    else if (stuff->enable == 0) 
-    {
-	/* delete the interest */
-	if (pHead) {
-	    RREventPtr pNewRREvent = 0;
-	    for (pRREvent = *pHead; pRREvent; pRREvent = pRREvent->next) {
-		if (pRREvent->client == client)
-		    break;
-		pNewRREvent = pRREvent;
-	    }
-	    if (pRREvent) {
-		FreeResource (pRREvent->clientResource, RRClientType);
-		if (pNewRREvent)
-		    pNewRREvent->next = pRREvent->next;
-		else
-		    *pHead = pRREvent->next;
-		free(pRREvent);
-	    }
-	}
+    else if (stuff->enable == 0) {
+        /* delete the interest */
+        if (pHead) {
+            RREventPtr pNewRREvent = 0;
+
+            for (pRREvent = *pHead; pRREvent; pRREvent = pRREvent->next) {
+                if (pRREvent->client == client)
+                    break;
+                pNewRREvent = pRREvent;
+            }
+            if (pRREvent) {
+                FreeResource(pRREvent->clientResource, RRClientType);
+                if (pNewRREvent)
+                    pNewRREvent->next = pRREvent->next;
+                else
+                    *pHead = pRREvent->next;
+                free(pRREvent);
+            }
+        }
     }
-    else 
-    {
-	client->errorValue = stuff->enable;
-	return BadValue;
+    else {
+        client->errorValue = stuff->enable;
+        return BadValue;
     }
     return Success;
 }
 
-int (*ProcRandrVector[RRNumberRequests])(ClientPtr) = {
-    ProcRRQueryVersion,	/* 0 */
+int (*ProcRandrVector[RRNumberRequests]) (ClientPtr) = {
+    ProcRRQueryVersion,         /* 0 */
 /* we skip 1 to make old clients fail pretty immediately */
-    NULL,			/* 1 ProcRandrOldGetScreenInfo */
+        NULL,                   /* 1 ProcRandrOldGetScreenInfo */
 /* V1.0 apps share the same set screen config request id */
-    ProcRRSetScreenConfig,	/* 2 */
-    NULL,			/* 3 ProcRandrOldScreenChangeSelectInput */
+        ProcRRSetScreenConfig,  /* 2 */
+        NULL,                   /* 3 ProcRandrOldScreenChangeSelectInput */
 /* 3 used to be ScreenChangeSelectInput; deprecated */
-    ProcRRSelectInput,		/* 4 */
-    ProcRRGetScreenInfo,    	/* 5 */
+        ProcRRSelectInput,      /* 4 */
+        ProcRRGetScreenInfo,    /* 5 */
 /* V1.2 additions */
-    ProcRRGetScreenSizeRange,	/* 6 */
-    ProcRRSetScreenSize,	/* 7 */
-    ProcRRGetScreenResources,	/* 8 */
-    ProcRRGetOutputInfo,	/* 9 */
-    ProcRRListOutputProperties,	/* 10 */
-    ProcRRQueryOutputProperty,	/* 11 */
-    ProcRRConfigureOutputProperty,  /* 12 */
-    ProcRRChangeOutputProperty,	/* 13 */
-    ProcRRDeleteOutputProperty,	/* 14 */
-    ProcRRGetOutputProperty,	/* 15 */
-    ProcRRCreateMode,		/* 16 */
-    ProcRRDestroyMode,		/* 17 */
-    ProcRRAddOutputMode,	/* 18 */
-    ProcRRDeleteOutputMode,	/* 19 */
-    ProcRRGetCrtcInfo,		/* 20 */
-    ProcRRSetCrtcConfig,	/* 21 */
-    ProcRRGetCrtcGammaSize,	/* 22 */
-    ProcRRGetCrtcGamma,		/* 23 */
-    ProcRRSetCrtcGamma,		/* 24 */
+        ProcRRGetScreenSizeRange,       /* 6 */
+        ProcRRSetScreenSize,    /* 7 */
+        ProcRRGetScreenResources,       /* 8 */
+        ProcRRGetOutputInfo,    /* 9 */
+        ProcRRListOutputProperties,     /* 10 */
+        ProcRRQueryOutputProperty,      /* 11 */
+        ProcRRConfigureOutputProperty,  /* 12 */
+        ProcRRChangeOutputProperty,     /* 13 */
+        ProcRRDeleteOutputProperty,     /* 14 */
+        ProcRRGetOutputProperty,        /* 15 */
+        ProcRRCreateMode,       /* 16 */
+        ProcRRDestroyMode,      /* 17 */
+        ProcRRAddOutputMode,    /* 18 */
+        ProcRRDeleteOutputMode, /* 19 */
+        ProcRRGetCrtcInfo,      /* 20 */
+        ProcRRSetCrtcConfig,    /* 21 */
+        ProcRRGetCrtcGammaSize, /* 22 */
+        ProcRRGetCrtcGamma,     /* 23 */
+        ProcRRSetCrtcGamma,     /* 24 */
 /* V1.3 additions */
-    ProcRRGetScreenResourcesCurrent, /* 25 */
-    ProcRRSetCrtcTransform,	/* 26 */
-    ProcRRGetCrtcTransform,	/* 27 */
-    ProcRRGetPanning,		/* 28 */
-    ProcRRSetPanning,		/* 29 */
-    ProcRRSetOutputPrimary,	/* 30 */
-    ProcRRGetOutputPrimary,	/* 31 */
+        ProcRRGetScreenResourcesCurrent,        /* 25 */
+        ProcRRSetCrtcTransform, /* 26 */
+        ProcRRGetCrtcTransform, /* 27 */
+        ProcRRGetPanning,       /* 28 */
+        ProcRRSetPanning,       /* 29 */
+        ProcRRSetOutputPrimary, /* 30 */
+        ProcRRGetOutputPrimary, /* 31 */
 };
-