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, 209 insertions, 225 deletions

diff --git a/xorg-server/Xext/sleepuntil.c b/xorg-server/Xext/sleepuntil.c
index 69945585d..52e22b4a6 100644
--- a/xorg-server/Xext/sleepuntil.c
+++ b/xorg-server/Xext/sleepuntil.c
@@ -1,225 +1,209 @@
-/*

- *

-Copyright 1992, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

- *

- * Author:  Keith Packard, MIT X Consortium

- */

-

-/* dixsleep.c - implement millisecond timeouts for X clients */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "sleepuntil.h"

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include "misc.h"

-#include "windowstr.h"

-#include "dixstruct.h"

-#include "pixmapstr.h"

-#include "scrnintstr.h"

-

-typedef struct _Sertafied {

-    struct _Sertafied	*next;

-    TimeStamp		revive;

-    ClientPtr		pClient;

-    XID			id;

-    void		(*notifyFunc)(

-			ClientPtr /* client */,

-			pointer /* closure */

-			);

-

-    pointer		closure;

-} SertafiedRec, *SertafiedPtr;

-

-static SertafiedPtr pPending;

-static RESTYPE	    SertafiedResType;

-static Bool	    BlockHandlerRegistered;

-static int	    SertafiedGeneration;

-

-static void	    ClientAwaken(

-    ClientPtr /* client */,

-    pointer /* closure */

-);

-static int	    SertafiedDelete(

-    pointer /* value */,

-    XID /* id */

-);

-static void	    SertafiedBlockHandler(

-    pointer /* data */,

-    OSTimePtr /* wt */,

-    pointer /* LastSelectMask */

-);

-static void	    SertafiedWakeupHandler(

-    pointer /* data */,

-    int /* i */,

-    pointer /* LastSelectMask */

-);

-

-int

-ClientSleepUntil (ClientPtr client,

-                  TimeStamp *revive,

-                  void (*notifyFunc)(ClientPtr, pointer),

-                  pointer closure)

-{

-    SertafiedPtr	pRequest, pReq, pPrev;

-

-    if (SertafiedGeneration != serverGeneration)

-    {

-	SertafiedResType = CreateNewResourceType (SertafiedDelete,

-						  "ClientSleep");

-	if (!SertafiedResType)

-	    return FALSE;

-	SertafiedGeneration = serverGeneration;

-	BlockHandlerRegistered = FALSE;

-    }

-    pRequest = malloc(sizeof (SertafiedRec));

-    if (!pRequest)

-	return FALSE;

-    pRequest->pClient = client;

-    pRequest->revive = *revive;

-    pRequest->id = FakeClientID (client->index);

-    pRequest->closure = closure;

-    if (!BlockHandlerRegistered)

-    {

-	if (!RegisterBlockAndWakeupHandlers (SertafiedBlockHandler,

-					     SertafiedWakeupHandler,

-					     (pointer) 0))

-	{

-	    free(pRequest);

-	    return FALSE;

-	}

-	BlockHandlerRegistered = TRUE;

-    }

-    pRequest->notifyFunc = 0;

-    if (!AddResource (pRequest->id, SertafiedResType, (pointer) pRequest))

-	return FALSE;

-    if (!notifyFunc)

-	notifyFunc = ClientAwaken;

-    pRequest->notifyFunc = notifyFunc;

-    /* Insert into time-ordered queue, with earliest activation time coming first. */

-    pPrev = 0;

-    for (pReq = pPending; pReq; pReq = pReq->next)

-    {

-	if (CompareTimeStamps (pReq->revive, *revive) == LATER)

-	    break;

-	pPrev = pReq;

-    }

-    if (pPrev)

-	pPrev->next = pRequest;

-    else

-	pPending = pRequest;

-    pRequest->next = pReq;

-    IgnoreClient (client);

-    return TRUE;

-}

-

-static void

-ClientAwaken (ClientPtr client, pointer closure)

-{

-    if (!client->clientGone)

-	AttendClient (client);

-}

-

-

-static int

-SertafiedDelete (pointer value, XID id)

-{

-    SertafiedPtr	pRequest = (SertafiedPtr)value;

-    SertafiedPtr	pReq, pPrev;

-

-    pPrev = 0;

-    for (pReq = pPending; pReq; pPrev = pReq, pReq = pReq->next)

-	if (pReq == pRequest)

-	{

-	    if (pPrev)

-		pPrev->next = pReq->next;

-	    else

-		pPending = pReq->next;

-	    break;

-	}

-    if (pRequest->notifyFunc)

-	(*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure);

-    free(pRequest);

-    return TRUE;

-}

-

-static void

-SertafiedBlockHandler (pointer data, OSTimePtr wt, pointer LastSelectMask)

-{

-    SertafiedPtr	    pReq, pNext;

-    unsigned long	    delay;

-    TimeStamp		    now;

-

-    if (!pPending)

-	return;

-    now.milliseconds = GetTimeInMillis ();

-    now.months = currentTime.months;

-    if ((int) (now.milliseconds - currentTime.milliseconds) < 0)

-	now.months++;

-    for (pReq = pPending; pReq; pReq = pNext)

-    {

-	pNext = pReq->next;

-	if (CompareTimeStamps (pReq->revive, now) == LATER)

-	    break;

-	FreeResource (pReq->id, RT_NONE);

-

- 	/* AttendClient() may have been called via the resource delete

- 	 * function so a client may have input to be processed and so

- 	 *  set delay to 0 to prevent blocking in WaitForSomething().

- 	 */

- 	AdjustWaitForDelay (wt, 0);

-    }

-    pReq = pPending;

-    if (!pReq)

-	return;

-    delay = pReq->revive.milliseconds - now.milliseconds;

-    AdjustWaitForDelay (wt, delay);

-}

-

-static void

-SertafiedWakeupHandler (pointer data, int i, pointer LastSelectMask)

-{

-    SertafiedPtr	pReq, pNext;

-    TimeStamp		now;

-

-    now.milliseconds = GetTimeInMillis ();

-    now.months = currentTime.months;

-    if ((int) (now.milliseconds - currentTime.milliseconds) < 0)

-	now.months++;

-    for (pReq = pPending; pReq; pReq = pNext)

-    {

-	pNext = pReq->next;

-	if (CompareTimeStamps (pReq->revive, now) == LATER)

-	    break;

-	FreeResource (pReq->id, RT_NONE);

-    }

-    if (!pPending)

-    {

-	RemoveBlockAndWakeupHandlers (SertafiedBlockHandler,

-				      SertafiedWakeupHandler,

-				      (pointer) 0);

-	BlockHandlerRegistered = FALSE;

-    }

-}

+/*
+ *
+Copyright 1992, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+ *
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+/* dixsleep.c - implement millisecond timeouts for X clients */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "sleepuntil.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include "misc.h"
+#include "windowstr.h"
+#include "dixstruct.h"
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+typedef struct _Sertafied {
+    struct _Sertafied *next;
+    TimeStamp revive;
+    ClientPtr pClient;
+    XID id;
+    void (*notifyFunc) (ClientPtr /* client */ ,
+                        pointer /* closure */
+        );
+
+    pointer closure;
+} SertafiedRec, *SertafiedPtr;
+
+static SertafiedPtr pPending;
+static RESTYPE SertafiedResType;
+static Bool BlockHandlerRegistered;
+static int SertafiedGeneration;
+
+static void ClientAwaken(ClientPtr /* client */ ,
+                         pointer        /* closure */
+    );
+static int SertafiedDelete(pointer /* value */ ,
+                           XID  /* id */
+    );
+static void SertafiedBlockHandler(pointer /* data */ ,
+                                  OSTimePtr /* wt */ ,
+                                  pointer       /* LastSelectMask */
+    );
+static void SertafiedWakeupHandler(pointer /* data */ ,
+                                   int /* i */ ,
+                                   pointer      /* LastSelectMask */
+    );
+
+int
+ClientSleepUntil(ClientPtr client,
+                 TimeStamp *revive,
+                 void (*notifyFunc) (ClientPtr, pointer), pointer closure)
+{
+    SertafiedPtr pRequest, pReq, pPrev;
+
+    if (SertafiedGeneration != serverGeneration) {
+        SertafiedResType = CreateNewResourceType(SertafiedDelete,
+                                                 "ClientSleep");
+        if (!SertafiedResType)
+            return FALSE;
+        SertafiedGeneration = serverGeneration;
+        BlockHandlerRegistered = FALSE;
+    }
+    pRequest = malloc(sizeof(SertafiedRec));
+    if (!pRequest)
+        return FALSE;
+    pRequest->pClient = client;
+    pRequest->revive = *revive;
+    pRequest->id = FakeClientID(client->index);
+    pRequest->closure = closure;
+    if (!BlockHandlerRegistered) {
+        if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler,
+                                            SertafiedWakeupHandler,
+                                            (pointer) 0)) {
+            free(pRequest);
+            return FALSE;
+        }
+        BlockHandlerRegistered = TRUE;
+    }
+    pRequest->notifyFunc = 0;
+    if (!AddResource(pRequest->id, SertafiedResType, (pointer) pRequest))
+        return FALSE;
+    if (!notifyFunc)
+        notifyFunc = ClientAwaken;
+    pRequest->notifyFunc = notifyFunc;
+    /* Insert into time-ordered queue, with earliest activation time coming first. */
+    pPrev = 0;
+    for (pReq = pPending; pReq; pReq = pReq->next) {
+        if (CompareTimeStamps(pReq->revive, *revive) == LATER)
+            break;
+        pPrev = pReq;
+    }
+    if (pPrev)
+        pPrev->next = pRequest;
+    else
+        pPending = pRequest;
+    pRequest->next = pReq;
+    IgnoreClient(client);
+    return TRUE;
+}
+
+static void
+ClientAwaken(ClientPtr client, pointer closure)
+{
+    if (!client->clientGone)
+        AttendClient(client);
+}
+
+static int
+SertafiedDelete(pointer value, XID id)
+{
+    SertafiedPtr pRequest = (SertafiedPtr) value;
+    SertafiedPtr pReq, pPrev;
+
+    pPrev = 0;
+    for (pReq = pPending; pReq; pPrev = pReq, pReq = pReq->next)
+        if (pReq == pRequest) {
+            if (pPrev)
+                pPrev->next = pReq->next;
+            else
+                pPending = pReq->next;
+            break;
+        }
+    if (pRequest->notifyFunc)
+        (*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure);
+    free(pRequest);
+    return TRUE;
+}
+
+static void
+SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
+{
+    SertafiedPtr pReq, pNext;
+    unsigned long delay;
+    TimeStamp now;
+
+    if (!pPending)
+        return;
+    now.milliseconds = GetTimeInMillis();
+    now.months = currentTime.months;
+    if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
+        now.months++;
+    for (pReq = pPending; pReq; pReq = pNext) {
+        pNext = pReq->next;
+        if (CompareTimeStamps(pReq->revive, now) == LATER)
+            break;
+        FreeResource(pReq->id, RT_NONE);
+
+        /* AttendClient() may have been called via the resource delete
+         * function so a client may have input to be processed and so
+         *  set delay to 0 to prevent blocking in WaitForSomething().
+         */
+        AdjustWaitForDelay(wt, 0);
+    }
+    pReq = pPending;
+    if (!pReq)
+        return;
+    delay = pReq->revive.milliseconds - now.milliseconds;
+    AdjustWaitForDelay(wt, delay);
+}
+
+static void
+SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask)
+{
+    SertafiedPtr pReq, pNext;
+    TimeStamp now;
+
+    now.milliseconds = GetTimeInMillis();
+    now.months = currentTime.months;
+    if ((int) (now.milliseconds - currentTime.milliseconds) < 0)
+        now.months++;
+    for (pReq = pPending; pReq; pReq = pNext) {
+        pNext = pReq->next;
+        if (CompareTimeStamps(pReq->revive, now) == LATER)
+            break;
+        FreeResource(pReq->id, RT_NONE);
+    }
+    if (!pPending) {
+        RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,
+                                     SertafiedWakeupHandler, (pointer) 0);
+        BlockHandlerRegistered = FALSE;
+    }
+}