diff options
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwindow.c | 76 |
1 files changed, 16 insertions, 60 deletions
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c index 594791789..a847561f8 100644 --- a/xorg-server/hw/xwin/winwindow.c +++ b/xorg-server/hw/xwin/winwindow.c @@ -62,9 +62,7 @@ winCreateWindowNativeGDI(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winCreateWindowNativeGDI (%p)\n", pWin); -#endif + winDebug ("winCreateWindowNativeGDI (%p)\n", pWin); WIN_UNWRAP(CreateWindow); fResult = (*pScreen->CreateWindow) (pWin); @@ -85,9 +83,7 @@ winDestroyWindowNativeGDI(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winDestroyWindowNativeGDI (%p)\n", pWin); -#endif + winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin); WIN_UNWRAP(DestroyWindow); fResult = (*pScreen->DestroyWindow) (pWin); @@ -108,9 +104,7 @@ winPositionWindowNativeGDI(WindowPtr pWin, int x, int y) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winPositionWindowNativeGDI (%p)\n", pWin); -#endif + winDebug ("winPositionWindowNativeGDI (%p)\n", pWin); WIN_UNWRAP(PositionWindow); fResult = (*pScreen->PositionWindow) (pWin, x, y); @@ -137,10 +131,6 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) winScreenPriv(pScreen); -#if 0 - ErrorF("winCopyWindow\n"); -#endif - /* Get a pointer to the root window */ pwinRoot = pWin->drawable.pScreen->root; @@ -178,18 +168,8 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) pBoxDst = RegionRects(prgnDst); ppt = pptSrc; -#if 0 - ErrorF("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n"); -#endif - /* BitBlt each source to the destination point */ for (i = nbox; --i >= 0; pBoxDst++, ppt++) { -#if 0 - ErrorF("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n", - pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2, - ppt->x, ppt->y); -#endif - BitBlt(pScreenPriv->hdcScreen, pBoxDst->x1, pBoxDst->y1, pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1, @@ -213,9 +193,7 @@ winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winChangeWindowAttributesNativeGDI (%p)\n", pWin); -#endif + winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin); WIN_UNWRAP(ChangeWindowAttributes); fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask); @@ -241,9 +219,7 @@ winUnmapWindowNativeGDI(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winUnmapWindowNativeGDI (%p)\n", pWin); -#endif + winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin); WIN_UNWRAP(UnrealizeWindow); fResult = (*pScreen->UnrealizeWindow) (pWin); @@ -265,9 +241,7 @@ winMapWindowNativeGDI(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winMapWindowNativeGDI (%p)\n", pWin); -#endif + winDebug ("winMapWindowNativeGDI (%p)\n", pWin); WIN_UNWRAP(RealizeWindow); fResult = (*pScreen->RealizeWindow) (pWin); @@ -290,9 +264,7 @@ winCreateWindowRootless(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winCreateWindowRootless (%p)\n", pWin); -#endif + winDebug ("winCreateWindowRootless (%p)\n", pWin); WIN_UNWRAP(CreateWindow); fResult = (*pScreen->CreateWindow) (pWin); @@ -315,9 +287,7 @@ winDestroyWindowRootless(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winDestroyWindowRootless (%p)\n", pWin); -#endif + winDebug ("winDestroyWindowRootless (%p)\n", pWin); WIN_UNWRAP(DestroyWindow); fResult = (*pScreen->DestroyWindow) (pWin); @@ -344,9 +314,7 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y) winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winPositionWindowRootless (%p)\n", pWin); -#endif + winDebug ("winPositionWindowRootless (%p)\n", pWin); WIN_UNWRAP(PositionWindow); fResult = (*pScreen->PositionWindow) (pWin, x, y); @@ -368,9 +336,7 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask) winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winChangeWindowAttributesRootless (%p)\n", pWin); -#endif + winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin); WIN_UNWRAP(ChangeWindowAttributes); fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask); @@ -394,9 +360,7 @@ winUnmapWindowRootless(WindowPtr pWin) winWindowPriv(pWin); winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winUnmapWindowRootless (%p)\n", pWin); -#endif + winDebug ("winUnmapWindowRootless (%p)\n", pWin); WIN_UNWRAP(UnrealizeWindow); fResult = (*pScreen->UnrealizeWindow) (pWin); @@ -424,9 +388,7 @@ winMapWindowRootless(WindowPtr pWin) winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winMapWindowRootless (%p)\n", pWin); -#endif + winDebug ("winMapWindowRootless (%p)\n", pWin); WIN_UNWRAP(RealizeWindow); fResult = (*pScreen->RealizeWindow) (pWin); @@ -446,9 +408,7 @@ winSetShapeRootless(WindowPtr pWin, int kind) winScreenPriv(pScreen); -#if CYGDEBUG - winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind); -#endif + winDebug ("winSetShapeRootless (%p, %i)\n", pWin, kind); WIN_UNWRAP(SetShape); (*pScreen->SetShape) (pWin, kind); @@ -476,9 +436,7 @@ winAddRgn(WindowPtr pWin, pointer data) /* If pWin is not Root */ if (pWin->parent != NULL) { -#if CYGDEBUG winDebug("winAddRgn ()\n"); -#endif if (pWin->mapped) { iBorder = wBorderWidth(pWin); @@ -491,9 +449,9 @@ winAddRgn(WindowPtr pWin, pointer data) hRgnWin = CreateRectRgn(0, 0, iWidth, iHeight); if (hRgnWin == NULL) { - ErrorF("winAddRgn - CreateRectRgn () failed\n"); - ErrorF(" Rect %d %d %d %d\n", - iX, iY, iX + iWidth, iY + iHeight); + winDebug ("winAddRgn - CreateRectRgn () failed\n"); + winDebug (" Rect %d %d %d %d\n", + iX, iY, iX + iWidth, iY + iHeight); } if (pWinPriv->hRgn) { @@ -549,9 +507,7 @@ winReshapeRootless(WindowPtr pWin) winWindowPriv(pWin); -#if CYGDEBUG winDebug("winReshapeRootless ()\n"); -#endif /* Bail if the window is the root window */ if (pWin->parent == NULL) |