aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winwindow.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.c')
-rw-r--r--xorg-server/hw/xwin/winwindow.c75
1 files changed, 16 insertions, 59 deletions
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 759aa5eee..c67a1a610 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -61,9 +61,7 @@ winCreateWindowNativeGDI(WindowPtr pWin)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winCreateWindowNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);
WIN_UNWRAP(CreateWindow);
fResult = (*pScreen->CreateWindow) (pWin);
@@ -83,9 +81,7 @@ winDestroyWindowNativeGDI(WindowPtr pWin)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winDestroyWindowNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);
WIN_UNWRAP(DestroyWindow);
fResult = (*pScreen->DestroyWindow) (pWin);
@@ -105,9 +101,7 @@ winPositionWindowNativeGDI(WindowPtr pWin, int x, int y)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winPositionWindowNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);
WIN_UNWRAP(PositionWindow);
fResult = (*pScreen->PositionWindow) (pWin, x, y);
@@ -133,9 +127,6 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
winScreenPriv(pScreen);
-#if 0
- ErrorF("winCopyWindow\n");
-#endif
/* Create a region for the destination */
prgnDst = RegionCreate(NULL, 1);
@@ -171,18 +162,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,
@@ -205,9 +186,7 @@ winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
WIN_UNWRAP(ChangeWindowAttributes);
fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -232,9 +211,7 @@ winUnmapWindowNativeGDI(WindowPtr pWin)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winUnmapWindowNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);
WIN_UNWRAP(UnrealizeWindow);
fResult = (*pScreen->UnrealizeWindow) (pWin);
@@ -255,9 +232,7 @@ winMapWindowNativeGDI(WindowPtr pWin)
winScreenPriv(pScreen);
-#if CYGDEBUG
- winTrace("winMapWindowNativeGDI (%p)\n", pWin);
-#endif
+ winDebug ("winMapWindowNativeGDI (%p)\n", pWin);
WIN_UNWRAP(RealizeWindow);
fResult = (*pScreen->RealizeWindow) (pWin);
@@ -280,9 +255,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);
@@ -305,9 +278,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);
@@ -334,9 +305,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);
@@ -358,9 +327,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);
@@ -384,9 +351,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);
@@ -414,9 +379,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);
@@ -436,9 +399,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);
@@ -466,9 +427,7 @@ winAddRgn(WindowPtr pWin, void *data)
/* If pWin is not Root */
if (pWin->parent != NULL) {
-#if CYGDEBUG
winDebug("winAddRgn ()\n");
-#endif
if (pWin->mapped) {
iBorder = wBorderWidth(pWin);
@@ -481,9 +440,9 @@ winAddRgn(WindowPtr pWin, void *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) {
@@ -539,9 +498,7 @@ winReshapeRootless(WindowPtr pWin)
winWindowPriv(pWin);
-#if CYGDEBUG
winDebug("winReshapeRootless ()\n");
-#endif
/* Bail if the window is the root window */
if (pWin->parent == NULL)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:50:27 +0000