svn merge ^/branches/released .

15 files changed, 291 insertions, 711 deletions

diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index aab64a510..7d424dbcc 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -92,95 +92,6 @@ static Bool         kdCaughtSignal = FALSE;
 KdOsFuncs	*kdOsFuncs;

 

 void

-KdSetRootClip (ScreenPtr pScreen, BOOL enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable;

-    Bool	anyMarked = FALSE;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (!pWin)

-	return;

-    WasViewable = (Bool)(pWin->viewable);

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	pWin->drawable.width = pScreen->width;

-	pWin->drawable.height = pScreen->height;

-	RegionInit(&pWin->winSize, &box, 1);

-	RegionInit(&pWin->borderSize, &box, 1);

-	RegionReset(&pWin->borderClip, &box);

-	RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-}

-

-void

 KdDisableScreen (ScreenPtr pScreen)

 {

     KdScreenPriv(pScreen);

@@ -188,7 +99,7 @@ KdDisableScreen (ScreenPtr pScreen)
     if (!pScreenPriv->enabled)

 	return;

     if (!pScreenPriv->closed)

-	KdSetRootClip (pScreen, FALSE);

+	SetRootClip (pScreen, FALSE);

     KdDisableColormap (pScreen);

     if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->disableAccel)

 	(*pScreenPriv->card->cfuncs->disableAccel) (pScreen);

@@ -271,7 +182,7 @@ KdEnableScreen (ScreenPtr pScreen)
     if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->enableAccel)

 	(*pScreenPriv->card->cfuncs->enableAccel) (pScreen);

     KdEnableColormap (pScreen);

-    KdSetRootClip (pScreen, TRUE);

+    SetRootClip (pScreen, TRUE);

     if (pScreenPriv->card->cfuncs->dpms)

 	(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);

     return TRUE;

diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 9cf44f01e..e5928aa2b 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -387,9 +387,6 @@ KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);
 extern miPointerScreenFuncRec kdPointerScreenFuncs;

 

 void

-KdSetRootClip (ScreenPtr pScreen, BOOL enable);

-

-void

 KdDisableScreen (ScreenPtr pScreen);

 

 void

diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index ee8fba65a..2ae0a201e 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -497,7 +497,6 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         free(axes_labels);

 

         if (pi->inputClass == KD_TOUCHSCREEN) {

-            InitAbsoluteClassDeviceStruct(pDevice);

             xiclass = AtomFromName(XI_TOUCHSCREEN);

         }

         else {

@@ -2229,8 +2228,6 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
 

     case DEVICE_ABS_CALIB:

     case DEVICE_ABS_AREA:

-        return Success;

-

     case DEVICE_CORE:

         return BadMatch;

     case DEVICE_ENABLE:

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 147464410..f94b24184 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -983,106 +983,6 @@ xf86SetBlackWhitePixels(ScreenPtr pScreen)
 }

 

 /*

- * xf86SetRootClip --

- *	Enable or disable rendering to the screen by

- *	setting the root clip list and revalidating

- *	all of the windows

- */

-

-static void

-xf86SetRootClip (ScreenPtr pScreen, Bool enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable = (Bool)(pWin->viewable);

-    Bool	anyMarked = FALSE;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    /*

-     * Use REGION_BREAK to avoid optimizations in ValidateTree

-     * that assume the root borderClip can't change well, normally

-     * it doesn't...)

-     */

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	RegionInit(&pWin->winSize, &box, 1);

-	RegionInit(&pWin->borderSize, &box, 1);

-	if (WasViewable)

-	    RegionReset(&pWin->borderClip, &box);

-	pWin->drawable.width = pScreen->width;

-	pWin->drawable.height = pScreen->height;

-        RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-    FlushAllOutput ();

-}

-

-/*

  * Function to enable/disable access to the frame buffer

  *

  * This is used when VT switching and when entering/leaving DGA direct mode.

@@ -1115,7 +1015,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 * Restore all of the clip lists on the screen

 	 */

 	if (!xf86Resetting)

-	    xf86SetRootClip (pScreen, TRUE);

+	    SetRootClip (pScreen, TRUE);

 

     }

     else

@@ -1123,7 +1023,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	/*

 	 * Empty all of the clip lists on the screen

 	 */

-	xf86SetRootClip (pScreen, FALSE);

+	SetRootClip (pScreen, FALSE);

     }

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 4166a1c38..d3af0c0c2 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -405,10 +405,10 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
   if (!pInfo->control_proc) {

       switch (control->control) {

       case DEVICE_CORE:

-          return BadMatch;

-      case DEVICE_RESOLUTION:

       case DEVICE_ABS_CALIB:

       case DEVICE_ABS_AREA:

+          return BadMatch;

+      case DEVICE_RESOLUTION:

       case DEVICE_ENABLE:

         return Success;

       default:

@@ -775,6 +775,8 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
         goto unwind;

     }

 

+    xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName, pInfo->name);

+

     if (!drv->PreInit) {

         xf86Msg(X_ERROR,

                 "Input driver `%s' has no PreInit function (ignoring)\n",

diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index 38241f904..17bf51c0e 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -1497,10 +1497,6 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 	    *stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;

 	    *X = (int)(pWin->drawable.x);

 	    *Y = (int)(pWin->drawable.y);

-#if 0

-	    *W = (int)(pWin->winSize.extents.x2 - pWin->winSize.extents.x1);

-	    *H = (int)(pWin->winSize.extents.y2 - pWin->winSize.extents.y1);

-#endif

 	    *W = (int)(pWin->drawable.width);

 	    *H = (int)(pWin->drawable.height);

 	    *numClipRects = RegionNumRects(&pWin->clipList);

diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index d81032aa9..3b8ca3094 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -437,7 +437,7 @@ ProcAppleWMSetWindowLevel(register ClientPtr client)
 				   DixReadAccess))

         return BadValue;

 

-    if (stuff->level < 0 || stuff->level >= AppleWMNumWindowLevels) {

+    if (stuff->level >= AppleWMNumWindowLevels) {

         return BadValue;

     }

 

diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 56021ed0a..5e43d2e04 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -314,7 +314,6 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
                                     (PtrCtrlProcPtr)NoopDDA,

                                     GetMotionHistorySize(), NAXES,

                                     axes_labels);

-            InitAbsoluteClassDeviceStruct(pPointer);

 //            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

 //            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

             break;

@@ -362,7 +361,6 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
                                     GetMotionHistorySize(), NAXES,

                                     axes_labels);

             InitProximityClassDeviceStruct(pPointer);

-			InitAbsoluteClassDeviceStruct(pPointer);

 

             InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

             InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

@@ -769,113 +767,3 @@ void AbortDDX( void )
     OsAbort();

 }

 

-#include "mivalidate.h" // for union _Validate used by windowstr.h

-#include "windowstr.h"  // for struct _Window

-#include "scrnintstr.h" // for struct _Screen

-

-// This is copied from Xserver/hw/xfree86/common/xf86Helper.c.

-// Quartz mode uses this when switching in and out of Quartz.

-// Quartz or IOKit can use this when waking from sleep.

-// Copyright (c) 1997-1998 by The XFree86 Project, Inc.

-

-/*

- * xf86SetRootClip --

- *	Enable or disable rendering to the screen by

- *	setting the root clip list and revalidating

- *	all of the windows

- */

-

-void

-xf86SetRootClip (ScreenPtr pScreen, int enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable = (Bool)(pWin->viewable);

-    Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    /*

-     * Use REGION_BREAK to avoid optimizations in ValidateTree

-     * that assume the root borderClip can't change well, normally

-     * it doesn't...)

-     */

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	RegionReset(&pWin->borderClip, &box);

-	RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->backStorage)

-	{

-	    pOldClip = RegionCreate(NullBox, 1);

-	    RegionCopy(pOldClip, &pWin->clipList);

-	}

-

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-    FlushAllOutput ();

-}

diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index 7cd4336cd..3a45f76e2 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -42,7 +42,6 @@
 void DarwinPrintBanner(void);

 int DarwinParseModifierList(const char *constmodifiers, int separatelr);

 void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);

-void xf86SetRootClip (ScreenPtr pScreen, int enable);

 

 #define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \

     dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))

diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 527c5bcff..0989412d2 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -117,17 +117,7 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
 {

 

   DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);

-    switch (control->control) {

-    case DEVICE_RESOLUTION:

-	return BadMatch;

-    case DEVICE_ABS_CALIB:

-    case DEVICE_ABS_AREA:

-        return BadMatch;

-    case DEVICE_CORE:

-        return BadMatch;

-    default:

-	return BadMatch;

-    }

+  return BadMatch;

 }

 

 

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 9e9f6be14..158656b6a 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -442,7 +442,7 @@ void QuartzSetRootClip(
 

     for (i = 0; i < screenInfo.numScreens; i++) {

         if (screenInfo.screens[i]) {

-            xf86SetRootClip(screenInfo.screens[i], enable);

+            SetRootClip(screenInfo.screens[i], enable);

         }

     }

 }

diff --git a/xorg-server/hw/xquartz/threadSafety.h b/xorg-server/hw/xquartz/threadSafety.h
index 7b009103a..48602567b 100644
--- a/xorg-server/hw/xquartz/threadSafety.h
+++ b/xorg-server/hw/xquartz/threadSafety.h
@@ -1,56 +1,56 @@
-/*
- * Copyright (C) 2008 Apple, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifndef _XQ_THREAD_SAFETY_H_
-#define _XQ_THREAD_SAFETY_H_
-
-#define DEBUG_THREADS 1
-
-#include <pthread.h>
-
-extern pthread_t APPKIT_THREAD_ID;
-extern pthread_t SERVER_THREAD_ID;
-
-/* Dump the call stack */
-void spewCallStack(void);
-
-/* Print message to ErrorF if we're in the wrong thread */
-void _threadSafetyAssert(pthread_t tid, const char *file, const char *fun, int line);
-
-/* Get a string that identifies our thread nicely */
-const char *threadSafetyID(pthread_t tid);
-
-#define threadSafetyAssert(tid) _threadSafetyAssert(tid, __FILE__, __FUNCTION__, __LINE__)
-
-#ifdef DEBUG_THREADS
-#define TA_APPKIT() threadSafetyAssert(APPKIT_THREAD_ID)
-#define TA_SERVER() threadSafetyAssert(SERVER_THREAD_ID)
-#else
-#define TA_SERVER() 
-#define TA_APPKIT() 
-#endif
-
-#endif _XQ_THREAD_SAFETY_H_
+/*

+ * Copyright (C) 2008 Apple, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

+ * holders shall not be used in advertising or otherwise to promote the sale,

+ * use or other dealings in this Software without prior written authorization.

+ */

+

+#ifndef _XQ_THREAD_SAFETY_H_

+#define _XQ_THREAD_SAFETY_H_

+

+#define DEBUG_THREADS 1

+

+#include <pthread.h>

+

+extern pthread_t APPKIT_THREAD_ID;

+extern pthread_t SERVER_THREAD_ID;

+

+/* Dump the call stack */

+void spewCallStack(void);

+

+/* Print message to ErrorF if we're in the wrong thread */

+void _threadSafetyAssert(pthread_t tid, const char *file, const char *fun, int line);

+

+/* Get a string that identifies our thread nicely */

+const char *threadSafetyID(pthread_t tid);

+

+#define threadSafetyAssert(tid) _threadSafetyAssert(tid, __FILE__, __FUNCTION__, __LINE__)

+

+#ifdef DEBUG_THREADS

+#define TA_APPKIT() threadSafetyAssert(APPKIT_THREAD_ID)

+#define TA_SERVER() threadSafetyAssert(SERVER_THREAD_ID)

+#else

+#define TA_SERVER() 

+#define TA_APPKIT() 

+#endif

+

+#endif /* _XQ_THREAD_SAFETY_H_ */

diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 338440a39..c8b1e45bd 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -326,7 +326,9 @@ xprAddScreen(int index, ScreenPtr pScreen)
 #endif

     }

     

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

 have_depth:

+#endif

     switch(depth) {

         case 8: // pseudo-working

             dfb->visuals = PseudoColorMask;

diff --git a/xorg-server/hw/xwin/winrandr.c b/xorg-server/hw/xwin/winrandr.c
index 680817e9d..7b7ec0c60 100644
--- a/xorg-server/hw/xwin/winrandr.c
+++ b/xorg-server/hw/xwin/winrandr.c
@@ -1,321 +1,221 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *Copyright (C) 2009-2010 Jon TURNEY
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- *a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *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 HAROLD L HUNT II 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 author(s)
- *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 author(s)
- *
- * Authors:	Harold L Hunt II
- *              Jon TURNEY
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include "mivalidate.h" // for union _Validate used by windowstr.h
-
-#ifndef RANDR_12_INTERFACE
-#error X server must have RandR 1.2 interface
-#endif
-
-
-/*
- * Answer queries about the RandR features supported.
- */
-
-static Bool
-winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
-{
-  winDebug ("winRandRGetInfo ()\n");
-
-  /* Don't support rotations */
-  *pRotations = RR_Rotate_0;
-
-  /*
-    The screen doesn't have to be limited to the actual
-    monitor size (we can have scrollbars :-), so what is
-    the upper limit?
-  */
-  RRScreenSetSizeRange(pScreen, 0, 0, 4096, 4096);
-
-  return TRUE;
-}
-
-
-/*
-  Copied from the xfree86 DDX
-
-  Why can't this be in DIX?
-  Does union _Validate vary depending on DDX??
- */
-void
-xf86SetRootClip (ScreenPtr pScreen, Bool enable)
-{
-    WindowPtr	pWin = pScreen->root;
-    WindowPtr	pChild;
-    Bool	WasViewable = (Bool)(pWin->viewable);
-    Bool	anyMarked = FALSE;
-    WindowPtr   pLayerWin;
-    BoxRec	box;
-
-    if (WasViewable)
-    {
-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
-	{
-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
-						     pChild,
-						     &pLayerWin);
-	}
-	(*pScreen->MarkWindow) (pWin);
-	anyMarked = TRUE;
-	if (pWin->valdata)
-	{
-	    if (HasBorder (pWin))
-	    {
-		RegionPtr	borderVisible;
-
-		borderVisible = RegionCreate(NullBox, 1);
-		RegionSubtract(borderVisible,
-				&pWin->borderClip, &pWin->winSize);
-		pWin->valdata->before.borderVisible = borderVisible;
-	    }
-	    pWin->valdata->before.resized = TRUE;
-	}
-    }
-
-    /*
-     * Use REGION_BREAK to avoid optimizations in ValidateTree
-     * that assume the root borderClip can't change well, normally
-     * it doesn't...)
-     */
-    if (enable)
-    {
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pScreen->width;
-	box.y2 = pScreen->height;
-	RegionInit(&pWin->winSize, &box, 1);
-	RegionInit(&pWin->borderSize, &box, 1);
-	if (WasViewable)
-	    RegionReset(&pWin->borderClip, &box);
-	pWin->drawable.width = pScreen->width;
-	pWin->drawable.height = pScreen->height;
-        RegionBreak(&pWin->clipList);
-    }
-    else
-    {
-	RegionEmpty(&pWin->borderClip);
-	RegionBreak(&pWin->clipList);
-    }
-
-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
-
-    if (WasViewable)
-    {
-	if (pWin->firstChild)
-	{
-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
-							   pWin->firstChild,
-							   (WindowPtr *)NULL);
-	}
-	else
-	{
-	    (*pScreen->MarkWindow) (pWin);
-	    anyMarked = TRUE;
-	}
-
-
-	if (anyMarked)
-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
-    }
-
-    if (WasViewable)
-    {
-	if (anyMarked)
-	    (*pScreen->HandleExposures)(pWin);
-	if (anyMarked && pScreen->PostValidateTree)
-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
-    }
-    if (pWin->realized)
-	WindowsRestructured ();
-    FlushAllOutput ();
-}
-
-/*
-
-*/
-void
-winDoRandRScreenSetSize (ScreenPtr  pScreen,
-                         CARD16	    width,
-                         CARD16	    height,
-                         CARD32	    mmWidth,
-                         CARD32	    mmHeight)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-  WindowPtr pRoot = pScreen->root;
-
-  // Prevent screen updates while we change things around
-  xf86SetRootClip(pScreen, FALSE);
-
-  /* Update the screen size as requested */
-  pScreenInfo->dwWidth = width;
-  pScreenInfo->dwHeight = height;
-
-  /* Reallocate the framebuffer used by the drawing engine */
-  (*pScreenPriv->pwinFreeFB)(pScreen);
-  if (!(*pScreenPriv->pwinAllocateFB)(pScreen))
-    {
-      ErrorF ("winDoRandRScreenSetSize - Could not reallocate framebuffer\n");
-    }
-
-  pScreen->width = width;
-  pScreen->height = height;
-  pScreen->mmWidth = mmWidth;
-  pScreen->mmHeight = mmHeight;
-
-  /* Update the screen pixmap to point to the new framebuffer */
-  winUpdateFBPointer(pScreen, pScreenInfo->pfb);
-
-  // pScreen->devPrivate == pScreen->GetScreenPixmap(screen) ?
-  // resize the root window
-  //pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);
-  // does this emit a ConfigureNotify??
-
-  // Restore the ability to update screen, now with new dimensions
-  xf86SetRootClip(pScreen, TRUE);
-
-  // and arrange for it to be repainted
-  miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
-
-  /* Indicate that a screen size change took place */
-  RRScreenSizeNotify(pScreen);
-}
-
-/*
- * Respond to resize request
- */
-static
-Bool
-winRandRScreenSetSize (ScreenPtr  pScreen,
-		       CARD16	    width,
-		       CARD16	    height,
-		       CARD32	    mmWidth,
-		       CARD32	    mmHeight)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-  winDebug ("winRandRScreenSetSize ()\n");
-
-  /*
-    It doesn't currently make sense to allow resize in fullscreen mode
-    (we'd actually have to list the supported resolutions)
-  */
-  if (pScreenInfo->fFullScreen)
-    {
-      ErrorF ("winRandRScreenSetSize - resize not supported in fullscreen mode\n");
-      return FALSE;
-    }
-
-  /*
-    Client resize requests aren't allowed in rootless modes, even if
-    the X screen is monitor or virtual desktop size, we'd need to
-    resize the native display size
-  */
-  if (FALSE
-#ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fMWExtWM
-#endif
-      || pScreenInfo->fRootless
-#ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
-#endif
-      )
-    {
-      ErrorF ("winRandRScreenSetSize - resize not supported in rootless modes\n");
-      return FALSE;
-    }
-
-  winDoRandRScreenSetSize(pScreen, width, height, mmWidth, mmHeight);
-
-  /* Cause the native window for the screen to resize itself */
-  {
-    DWORD dwStyle, dwExStyle;
-    RECT rcClient;
-
-    rcClient.left = 0;
-    rcClient.top = 0;
-    rcClient.right = width;
-    rcClient.bottom = height;
-
-    ErrorF ("winRandRScreenSetSize new client area w: %d h: %d\n", width, height);
-
-    /* Get the Windows window style and extended style */
-    dwExStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_EXSTYLE);
-    dwStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_STYLE);
-
-    /*
-     * Calculate the window size needed for the given client area
-     * adjusting for any decorations it will have
-     */
-    AdjustWindowRectEx(&rcClient, dwStyle, FALSE, dwExStyle);
-
-    ErrorF ("winRandRScreenSetSize new window area w: %ld h: %ld\n", rcClient.right-rcClient.left, rcClient.bottom-rcClient.top);
-
-    SetWindowPos(pScreenPriv->hwndScreen, NULL,
-                 0, 0, rcClient.right-rcClient.left, rcClient.bottom-rcClient.top,
-                 SWP_NOZORDER | SWP_NOMOVE);
-  }
-
-  return TRUE;
-}
-
-/*
- * Initialize the RandR layer.
- */
-
-Bool
-winRandRInit (ScreenPtr pScreen)
-{
-  rrScrPrivPtr pRRScrPriv;
-  winDebug ("winRandRInit ()\n");
-
-  if (!RRScreenInit (pScreen))
-    {
-      ErrorF ("winRandRInit () - RRScreenInit () failed\n");
-      return FALSE;
-    }
-
-  /* Set some RandR function pointers */
-  pRRScrPriv = rrGetScrPriv (pScreen);
-  pRRScrPriv->rrGetInfo = winRandRGetInfo;
-  pRRScrPriv->rrSetConfig = NULL;
-  pRRScrPriv->rrScreenSetSize = winRandRScreenSetSize;
-  pRRScrPriv->rrCrtcSet = NULL;
-  pRRScrPriv->rrCrtcSetGamma = NULL;
-
-  return TRUE;
-}
+/*

+ *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.

+ *Copyright (C) 2009-2010 Jon TURNEY

+ *

+ *Permission is hereby granted, free of charge, to any person obtaining

+ *a copy of this software and associated documentation files (the

+ *"Software"), to deal in the Software without restriction, including

+ *without limitation the rights to use, copy, modify, merge, publish,

+ *distribute, sublicense, and/or sell copies of the Software, and to

+ *permit persons to whom the Software is furnished to do so, subject to

+ *the following conditions:

+ *

+ *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 HAROLD L HUNT II 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 author(s)

+ *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 author(s)

+ *

+ * Authors:	Harold L Hunt II

+ *              Jon TURNEY

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+#include "mivalidate.h" // for union _Validate used by windowstr.h

+

+#ifndef RANDR_12_INTERFACE

+#error X server must have RandR 1.2 interface

+#endif

+

+

+/*

+ * Answer queries about the RandR features supported.

+ */

+

+static Bool

+winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)

+{

+  winDebug ("winRandRGetInfo ()\n");

+

+  /* Don't support rotations */

+  *pRotations = RR_Rotate_0;

+

+  /*

+    The screen doesn't have to be limited to the actual

+    monitor size (we can have scrollbars :-), so what is

+    the upper limit?

+  */

+  RRScreenSetSizeRange(pScreen, 0, 0, 4096, 4096);

+

+  return TRUE;

+}

+

+/*

+

+*/

+void

+winDoRandRScreenSetSize (ScreenPtr  pScreen,

+                         CARD16	    width,

+                         CARD16	    height,

+                         CARD32	    mmWidth,

+                         CARD32	    mmHeight)

+{

+  winScreenPriv(pScreen);

+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;

+  WindowPtr pRoot = pScreen->root;

+

+  // Prevent screen updates while we change things around

+  SetRootClip(pScreen, FALSE);

+

+  /* Update the screen size as requested */

+  pScreenInfo->dwWidth = width;

+  pScreenInfo->dwHeight = height;

+

+  /* Reallocate the framebuffer used by the drawing engine */

+  (*pScreenPriv->pwinFreeFB)(pScreen);

+  if (!(*pScreenPriv->pwinAllocateFB)(pScreen))

+    {

+      ErrorF ("winDoRandRScreenSetSize - Could not reallocate framebuffer\n");

+    }

+

+  pScreen->width = width;

+  pScreen->height = height;

+  pScreen->mmWidth = mmWidth;

+  pScreen->mmHeight = mmHeight;

+

+  /* Update the screen pixmap to point to the new framebuffer */

+  winUpdateFBPointer(pScreen, pScreenInfo->pfb);

+

+  // pScreen->devPrivate == pScreen->GetScreenPixmap(screen) ?

+  // resize the root window

+  //pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);

+  // does this emit a ConfigureNotify??

+

+  // Restore the ability to update screen, now with new dimensions

+  SetRootClip(pScreen, TRUE);

+

+  // and arrange for it to be repainted

+  miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);

+

+  /* Indicate that a screen size change took place */

+  RRScreenSizeNotify(pScreen);

+}

+

+/*

+ * Respond to resize request

+ */

+static

+Bool

+winRandRScreenSetSize (ScreenPtr  pScreen,

+		       CARD16	    width,

+		       CARD16	    height,

+		       CARD32	    mmWidth,

+		       CARD32	    mmHeight)

+{

+  winScreenPriv(pScreen);

+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;

+

+  winDebug ("winRandRScreenSetSize ()\n");

+

+  /*

+    It doesn't currently make sense to allow resize in fullscreen mode

+    (we'd actually have to list the supported resolutions)

+  */

+  if (pScreenInfo->fFullScreen)

+    {

+      ErrorF ("winRandRScreenSetSize - resize not supported in fullscreen mode\n");

+      return FALSE;

+    }

+

+  /*

+    Client resize requests aren't allowed in rootless modes, even if

+    the X screen is monitor or virtual desktop size, we'd need to

+    resize the native display size

+  */

+  if (FALSE

+#ifdef XWIN_MULTIWINDOWEXTWM

+      || pScreenInfo->fMWExtWM

+#endif

+      || pScreenInfo->fRootless

+#ifdef XWIN_MULTIWINDOW

+      || pScreenInfo->fMultiWindow

+#endif

+      )

+    {

+      ErrorF ("winRandRScreenSetSize - resize not supported in rootless modes\n");

+      return FALSE;

+    }

+

+  winDoRandRScreenSetSize(pScreen, width, height, mmWidth, mmHeight);

+

+  /* Cause the native window for the screen to resize itself */

+  {

+    DWORD dwStyle, dwExStyle;

+    RECT rcClient;

+

+    rcClient.left = 0;

+    rcClient.top = 0;

+    rcClient.right = width;

+    rcClient.bottom = height;

+

+    ErrorF ("winRandRScreenSetSize new client area w: %d h: %d\n", width, height);

+

+    /* Get the Windows window style and extended style */

+    dwExStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_EXSTYLE);

+    dwStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_STYLE);

+

+    /*

+     * Calculate the window size needed for the given client area

+     * adjusting for any decorations it will have

+     */

+    AdjustWindowRectEx(&rcClient, dwStyle, FALSE, dwExStyle);

+

+    ErrorF ("winRandRScreenSetSize new window area w: %ld h: %ld\n", rcClient.right-rcClient.left, rcClient.bottom-rcClient.top);

+

+    SetWindowPos(pScreenPriv->hwndScreen, NULL,

+                 0, 0, rcClient.right-rcClient.left, rcClient.bottom-rcClient.top,

+                 SWP_NOZORDER | SWP_NOMOVE);

+  }

+

+  return TRUE;

+}

+

+/*

+ * Initialize the RandR layer.

+ */

+

+Bool

+winRandRInit (ScreenPtr pScreen)

+{

+  rrScrPrivPtr pRRScrPriv;

+  winDebug ("winRandRInit ()\n");

+

+  if (!RRScreenInit (pScreen))

+    {

+      ErrorF ("winRandRInit () - RRScreenInit () failed\n");

+      return FALSE;

+    }

+

+  /* Set some RandR function pointers */

+  pRRScrPriv = rrGetScrPriv (pScreen);

+  pRRScrPriv->rrGetInfo = winRandRGetInfo;

+  pRRScrPriv->rrSetConfig = NULL;

+  pRRScrPriv->rrScreenSetSize = winRandRScreenSetSize;

+  pRRScrPriv->rrCrtcSet = NULL;

+  pRRScrPriv->rrCrtcSetGamma = NULL;

+

+  return TRUE;

+}

diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 649de4368..e1cb77508 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -48,8 +48,6 @@
 #endif
 #include <xkbsrv.h>
 
-void xf86SetRootClip (ScreenPtr pScreen, Bool enable);
-
 /*
  * Global variables
  */
@@ -325,7 +323,7 @@ winWindowProc (HWND hwnd, UINT message,
               /* Update the screen pixmap to point to the new framebuffer */
               winUpdateFBPointer(s_pScreen, s_pScreenPriv->pScreenInfo->pfb);
               // Restore the ability to update screen, now with new dimensions
-              xf86SetRootClip(s_pScreen, TRUE);
+              SetRootClip(s_pScreen, TRUE);
 
               // and arrange for it to be repainted
               miPaintWindow(s_pScreen->root, &s_pScreen->root->borderClip,  PW_BACKGROUND);