andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Removed NewCurrentScreen debugging spew.

Browse Source
This commit is contained in:
Jeremy Huddleston 2008-09-03 03:14:22 -07:00
parent 6932d0d19e
commit 8b8e0aea6f
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/events.c
View File

@ -2385,13 +2385,6 @@ NewCurrentScreen(ScreenPtr newScreen, int x, int y)
{
sprite.hotPhys.x = x;
sprite.hotPhys.y = y;
#ifdef XQUARTZ
/* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
snprintf(__crashreporter_info__, __crashreporter_info__len, "%s\n\nNewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
__crashreporter_info__base, noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
ErrorF("NewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
#endif
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x -
@ -2623,11 +2616,6 @@ ProcWarpPointer(ClientPtr client)
}
else if (!PointerConfinedToScreen())
{
#ifdef XQUARTZ
/* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
if(newScreen == NULL)
ErrorF("ProcWarpPointer: newScreen=%p dest=%p\n", newScreen, dest);
#endif
NewCurrentScreen(newScreen, x, y);
}
return Success;

6
mi/mieq.c
View File

@ -214,12 +214,6 @@ mieqProcessInputEvents(void)
e = &miEventQueue.events[miEventQueue.head];
miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
#ifdef XQUARTZ
/* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
if(miEventQueue.pDequeueScreen==NULL || e->pScreen == NULL)
ErrorF("miPointerSetScreen: miEventQueue.pDequeueScreen=%p, e->pScreen=%p, event type=%d\n", miEventQueue.pDequeueScreen, e->pScreen, e->event->u.u.type);
#endif
/* Assumption - screen switching can only occur on motion events. */
if (e->pScreen != miEventQueue.pDequeueScreen) {
miEventQueue.pDequeueScreen = e->pScreen;

5
mi/mipointer.c
View File

@ -378,11 +378,6 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
pScreen = screenInfo.screens[screen_no];
pScreenPriv = GetScreenPrivate (pScreen);
(*pScreenPriv->screenFuncs->NewEventScreen) (pScreen, FALSE);
#ifdef XQUARTZ
/* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
if(pScreen == NULL)
ErrorF("miPointerSetScreen: NewCurrentScreen(%p, %d, %d)\n", pScreen, x, y);
#endif
NewCurrentScreen (pScreen, x, y);
miPointer.limits.x2 = pScreen->width;
miPointer.limits.y2 = pScreen->height;