summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKensuke Matsuzaki <zakki@peppermint.jp>2004-05-25 15:49:39 +0000
committerKensuke Matsuzaki <zakki@peppermint.jp>2004-05-25 15:49:39 +0000
commit291d2f8e981039eb8812ab7bfc4cb9cdbdd2c128 (patch)
tree3f8a6f1ea090e19b97aeecca68e1e56cf0bda520 /hw
parent651822270cedfd8a96ebde742a51248db3e44e38 (diff)
Replace ErrorF with winDebug in all CYGDEBUG sections. Fix compile error.
Diffstat (limited to 'hw')
-rwxr-xr-xhw/xwin/winwin32rootless.c115
-rwxr-xr-xhw/xwin/winwin32rootlesswndproc.c140
2 files changed, 127 insertions, 128 deletions
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index f65d57c8d..308411c3e 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -114,7 +114,7 @@ winMWExtWMQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEADER *p
/* Get a pointer to bitfields */
pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
- ErrorF ("winMWExtWMQueryDIBFormat - First call masks: %08x %08x %08x\n",
+ winDebug ("winMWExtWMQueryDIBFormat - First call masks: %08x %08x %08x\n",
(unsigned int)pdw[0], (unsigned int)pdw[1], (unsigned int)pdw[2]);
#endif
@@ -227,7 +227,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
static int s_iWindowID = 0;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCreateFrame %d %d - %d %d\n",
+ winDebug ("winMWExtWMCreateFrame %d %d - %d %d\n",
newX, newY, pFrame->width, pFrame->height);
#endif
@@ -247,7 +247,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
// Store the implementation private frame ID
pFrame->wid = (RootlessFrameID) pRLWinPriv;
- winSelectIcons(pWin, &hIcon, &hIconSmall);
+ winSelectIcons(pFrame->win, &hIcon, &hIconSmall);
/* Set standard class name prefix so we can identify window easily */
strncpy (pszClass, WINDOW_CLASS_X, sizeof(pszClass));
@@ -280,7 +280,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
strcat (pszClass, pszWindowID);
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winCreateWindowsWindow - Creating class: %s\n", pszClass);
+ winDebug ("winCreateWindowsWindow - Creating class: %s\n", pszClass);
#endif
/* Setup our window class */
@@ -320,7 +320,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCreateFrame - ShowWindow\n");
+ winDebug ("winMWExtWMCreateFrame - ShowWindow\n");
#endif
//ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
@@ -332,7 +332,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCreateFrame - (%08x) %08x\n",
+ winDebug ("winMWExtWMCreateFrame - (%08x) %08x\n",
(int) pFrame->wid, (int) pRLWinPriv->hWnd);
#if 0
{
@@ -344,11 +344,11 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
{
pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
}
- ErrorF ("winMWExtWMCreateFrame2 (%08x) %08x\n",
+ winDebug ("winMWExtWMCreateFrame2 (%08x) %08x\n",
pRLWinPriv2, pRLWinPriv2->hWnd);
if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
{
- ErrorF ("Error param missmatch\n");
+ winDebug ("Error param missmatch\n");
}
}
#endif
@@ -370,7 +370,7 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
char pszClass[CLASS_NAME_LENGTH];
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMDestroyFrame (%08x) %08x\n",
+ winDebug ("winMWExtWMDestroyFrame (%08x) %08x\n",
(int) pRLWinPriv, (int) pRLWinPriv->hWnd);
#if 0
{
@@ -382,11 +382,11 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
{
pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
}
- ErrorF ("winMWExtWMDestroyFrame2 (%08x) %08x\n",
+ winDebug ("winMWExtWMDestroyFrame2 (%08x) %08x\n",
pRLWinPriv2, pRLWinPriv2->hWnd);
if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
{
- ErrorF ("Error param missmatch\n");
+ winDebug ("Error param missmatch\n");
*(int*)0 = 1;//raise exseption
}
}
@@ -409,12 +409,12 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
if (iReturn)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMDestroyFrame - Unregistering %s: ", pszClass);
+ winDebug ("winMWExtWMDestroyFrame - Unregistering %s: ", pszClass);
#endif
iReturn = UnregisterClass (pszClass, hInstance);
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMDestroyFramew - %d Deleting Icon: ", iReturn);
+ winDebug ("winMWExtWMDestroyFramew - %d Deleting Icon: ", iReturn);
#endif
winDestroyIcon(hiconClass);
@@ -422,7 +422,7 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMDestroyFrame - done\n");
+ winDebug ("winMWExtWMDestroyFrame - done\n");
#endif
}
@@ -436,7 +436,7 @@ winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, int iNew
int iX, iY, iWidth, iHeight;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX, iNewY);
+ winDebug ("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX, iNewY);
#endif
/* Get the Windows window style and extended style */
@@ -480,7 +480,7 @@ winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,
int iX, iY;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n",
+ winDebug ("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n",
(int) pRLWinPriv, iNewX, iNewY, uiNewWidth, uiNewHeight);
#endif
@@ -531,7 +531,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
Bool fFirst = TRUE;
Bool fNeedRestack = TRUE;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv);
+ winDebug ("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv);
#endif
if (pScreenPriv->fRestacking) return;
@@ -545,7 +545,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
if (pRLNextWinPriv == NULL)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("Win %08x is top\n", pRLWinPriv);
+ winDebug ("Win %08x is top\n", pRLWinPriv);
#endif
pScreenPriv->widTop = wid;
SetWindowPos (pRLWinPriv->hWnd, HWND_TOP,
@@ -554,7 +554,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
else
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("Win %08x is not top\n", pRLWinPriv);
+ winDebug ("Win %08x is not top\n", pRLWinPriv);
#endif
for (hWnd = GetNextWindow (pRLWinPriv->hWnd, GW_HWNDPREV);
fNeedRestack && hWnd != NULL;
@@ -571,7 +571,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
if (!fFirst)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("raise: Insert after Win %08x\n", pRLNextWinPriv);
+ winDebug ("raise: Insert after Win %08x\n", pRLNextWinPriv);
#endif
SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
0, 0, 0, 0,
@@ -580,7 +580,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
else
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("No change\n");
+ winDebug ("No change\n");
#endif
}
fNeedRestack = FALSE;
@@ -602,7 +602,7 @@ winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
if (hWnd == pRLNextWinPriv->hWnd)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("lower: Insert after Win %08x\n", pRLNextWinPriv);
+ winDebug ("lower: Insert after Win %08x\n", pRLNextWinPriv);
#endif
SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
0, 0, 0, 0,
@@ -623,9 +623,8 @@ winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape)
win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
HRGN hRgn, hRgnWindow, hRgnClient;
RECT rcWindow, rcClient;
- POINT ptOffset;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv);
+ winDebug ("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv);
#endif
hRgn = winMWExtWMCreateRgnFromRegion (pShape);
@@ -654,7 +653,7 @@ winMWExtWMUnmapFrame (RootlessFrameID wid)
{
win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv);
+ winDebug ("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv);
#endif
g_fNoConfigureWindow = TRUE;
@@ -678,7 +677,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
HDC hdcNew;
HBITMAP hbmpNew;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed);
+ winDebug ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed);
#endif
if (!pRLWinPriv->fDestroyed)
@@ -688,8 +687,8 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("pScreenPriv %08X\n", (int) pScreenPriv);
- ErrorF ("pScreenInfo %08X\n", (int) pScreenInfo);
+ winDebug ("pScreenPriv %08X\n", (int) pScreenPriv);
+ winDebug ("pScreenInfo %08X\n", (int) pScreenInfo);
#endif
if (pRLWinPriv->hdcScreen == NULL)
{
@@ -718,7 +717,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
else
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - Shadow buffer allocated\n");
+ winDebug ("winMWExtWMStartDrawing - Shadow buffer allocated\n");
#endif
}
@@ -727,19 +726,19 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
#if CYGMULTIWINDOW_DEBUG
/* Print information about bitmap allocated */
- ErrorF ("winMWExtWMStartDrawing - Dibsection width: %d height: %d "
- "depth: %d size image: %d\n",
- (unsigned int)dibsection.dsBmih.biWidth,
- (unsigned int)dibsection.dsBmih.biHeight,
- (unsigned int)dibsection.dsBmih.biBitCount,
- (unsigned int)dibsection.dsBmih.biSizeImage);
+ winDebug ("winMWExtWMStartDrawing - Dibsection width: %d height: %d "
+ "depth: %d size image: %d\n",
+ (unsigned int)dibsection.dsBmih.biWidth,
+ (unsigned int)dibsection.dsBmih.biHeight,
+ (unsigned int)dibsection.dsBmih.biBitCount,
+ (unsigned int)dibsection.dsBmih.biSizeImage);
#endif
/* Select the shadow bitmap into the shadow DC */
SelectObject (hdcNew, hbmpNew);
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - Attempting a shadow blit\n");
+ winDebug ("winMWExtWMStartDrawing - Attempting a shadow blit\n");
#endif
/* Blit from the old shadow to the new shadow */
@@ -752,7 +751,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
if (fReturn)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - Shadow blit success\n");
+ winDebug ("winMWExtWMStartDrawing - Shadow blit success\n");
#endif
}
else
@@ -774,8 +773,8 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - bytesPerRow: %d\n",
- (unsigned int)dibsection.dsBm.bmWidthBytes);
+ winDebug ("winMWExtWMStartDrawing - bytesPerRow: %d\n",
+ (unsigned int)dibsection.dsBm.bmWidthBytes);
#endif
/* Free the old shadow bitmap */
@@ -788,8 +787,8 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
pRLWinPriv->fResized = FALSE;
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - 0x%08x %d\n",
- (unsigned int)pRLWinPriv->pfb, (unsigned int)dibsection.dsBm.bmWidthBytes);
+ winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
+ (unsigned int)pRLWinPriv->pfb, (unsigned int)dibsection.dsBm.bmWidthBytes);
#endif
}
else
@@ -797,9 +796,9 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
ErrorF ("winMWExtWMStartDrawing - Already window was destroyed \n");
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMStartDrawing - done (0x08x) 0x%08x %d\n",
- (int) pRLWinPriv,
- (unsigned int)pRLWinPriv->pfb, (unsigned int)pRLWinPriv->dwWidthBytes);
+ winDebug ("winMWExtWMStartDrawing - done (0x08x) 0x%08x %d\n",
+ (int) pRLWinPriv,
+ (unsigned int)pRLWinPriv->pfb, (unsigned int)pRLWinPriv->dwWidthBytes);
#endif
*pixelData = pRLWinPriv->pfb;
*bytesPerRow = pRLWinPriv->dwWidthBytes;
@@ -814,7 +813,7 @@ winMWExtWMStopDrawing (RootlessFrameID wid, Bool fFlush)
SIZE szWin;
POINT ptSrc;
#if CYGMULTIWINDOW_DEBUG || TRUE
- ErrorF ("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
+ winDebug ("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
#endif
szWin.cx = pRLWinPriv->dwWidth;
szWin.cy = pRLWinPriv->dwHeight;
@@ -845,7 +844,7 @@ winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
POINT ptSrc;
#endif
#if CYGMULTIWINDOW_DEBUG && 0
- ErrorF ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
+ winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
#endif
#if 0
szWin.cx = pRLWinPriv->dwWidth;
@@ -889,8 +888,8 @@ winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
const BoxRec *pEnd;
#if CYGMULTIWINDOW_DEBUG && 0
- ErrorF ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
- pRLWinPriv, nCount, pRects, shift_x, shift_y);
+ winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
+ pRLWinPriv, nCount, pRects, shift_x, shift_y);
#endif
for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
@@ -909,8 +908,8 @@ winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
{
win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
- (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
+ winDebug ("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
+ (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
#endif
pRLWinPriv->pFrame = pFrame;
pRLWinPriv->fResized = TRUE;
@@ -928,11 +927,11 @@ winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
{
pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
}
- ErrorF ("winMWExtWMSwitchFrame2 (%08x) %08x\n",
+ winDebug ("winMWExtWMSwitchFrame2 (%08x) %08x\n",
pRLWinPriv2, pRLWinPriv2->hWnd);
if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
{
- ErrorF ("Error param missmatch\n");
+ winDebug ("Error param missmatch\n");
}
}
#endif
@@ -945,7 +944,7 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height,
void *dst, unsigned int dstRowBytes)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCopyBytes - Not implemented\n");
+ winDebug ("winMWExtWMCopyBytes - Not implemented\n");
#endif
}
@@ -954,7 +953,7 @@ winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value
void *dst, unsigned int dstRowBytes)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMFillBytes - Not implemented\n");
+ winDebug ("winMWExtWMFillBytes - Not implemented\n");
#endif
}
@@ -965,7 +964,7 @@ winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int
void *dst[2], unsigned int dstRowBytes[2])
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCompositePixels - Not implemented\n");
+ winDebug ("winMWExtWMCompositePixels - Not implemented\n");
#endif
return 0;
}
@@ -979,14 +978,14 @@ winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRect
const BoxRec *pEnd;
RECT rcDmg;
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
+ winDebug ("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
(int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy);
#endif
for (pEnd = pDstRects + nDstRects; pDstRects < pEnd; pDstRects++)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
+ winDebug ("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
pDstRects->x1, pDstRects->y1,
pDstRects->x2 - pDstRects->x1,
pDstRects->y2 - pDstRects->y1,
@@ -1013,7 +1012,7 @@ winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRect
InvalidateRect (pRLWinPriv->hWnd, &rcDmg, FALSE);
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMCopyWindow - done\n");
+ winDebug ("winMWExtWMCopyWindow - done\n");
#endif
}
diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c
index ede83d055..d7fb85075 100755
--- a/hw/xwin/winwin32rootlesswndproc.c
+++ b/hw/xwin/winwin32rootlesswndproc.c
@@ -331,8 +331,8 @@ IsRaiseOnClick (WindowPtr pWin)
else
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("IsRaiseOnClick - no prop use default value:%d\n",
- RAISE_ON_CLICK_DEFAULT);
+ winDebug ("IsRaiseOnClick - no prop use default value:%d\n",
+ RAISE_ON_CLICK_DEFAULT);
#endif
return RAISE_ON_CLICK_DEFAULT;
}
@@ -384,8 +384,8 @@ IsMouseActive (WindowPtr pWin)
else
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("IsMouseActive - no prop use default value:%d\n",
- MOUSE_ACTIVATE_DEFAULT);
+ winDebug ("IsMouseActive - no prop use default value:%d\n",
+ MOUSE_ACTIVATE_DEFAULT);
#endif
return MOUSE_ACTIVATE_DEFAULT;
}
@@ -423,11 +423,11 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
if (pScreenPriv) hwndScreen = pScreenPriv->hwndScreen;
#if 0
- ErrorF ("hWnd %08X\n", hwnd);
- ErrorF ("pScreenPriv %08X\n", pScreenPriv);
- ErrorF ("pScreenInfo %08X\n", pScreenInfo);
- ErrorF ("hwndScreen %08X\n", hwndScreen);
- ErrorF ("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
+ winDebug ("hWnd %08X\n", hwnd);
+ winDebug ("pScreenPriv %08X\n", pScreenPriv);
+ winDebug ("pScreenInfo %08X\n", pScreenInfo);
+ winDebug ("hwndScreen %08X\n", hwndScreen);
+ winDebug ("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
pRLWinPriv, message, wParam, lParam);
#endif
}
@@ -436,7 +436,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
{
case WM_CREATE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_CREATE\n");
+ winDebug ("winMWExtWMWindowProc - WM_CREATE\n");
#endif
/* */
SetProp (hwnd,
@@ -446,7 +446,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_CLOSE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose);
+ winDebug ("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose);
#endif
/* Tell window-manager to close window */
if (pRLWinPriv->fClose)
@@ -466,7 +466,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_DESTROY:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_DESTROY\n");
+ winDebug ("winMWExtWMWindowProc - WM_DESTROY\n");
#endif
/* Free the shaodw DC; which allows the bitmap to be freed */
DeleteDC (pRLWinPriv->hdcShadow);
@@ -492,7 +492,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MOUSEMOVE:
#if CYGMULTIWINDOW_DEBUG && 0
- ErrorF ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
+ winDebug ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
#endif
/* Unpack the client area mouse coordinates */
ptMouse.x = GET_X_LPARAM(lParam);
@@ -549,7 +549,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_NCMOUSEMOVE:
#if CYGMULTIWINDOW_DEBUG && 0
- ErrorF ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
+ winDebug ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
#endif
/*
* We break instead of returning 0 since we need to call
@@ -577,7 +577,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MOUSELEAVE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MOUSELEAVE\n");
+ winDebug ("winMWExtWMWindowProc - WM_MOUSELEAVE\n");
#endif
/* Mouse has left our client area */
@@ -598,7 +598,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_LBUTTONDBLCLK:
case WM_LBUTTONDOWN:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_LBUTTONDBLCLK\n");
+ winDebug ("winMWExtWMWindowProc - WM_LBUTTONDBLCLK\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -607,7 +607,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_LBUTTONUP:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_LBUTTONUP\n");
+ winDebug ("winMWExtWMWindowProc - WM_LBUTTONUP\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -617,7 +617,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MBUTTONDBLCLK:
case WM_MBUTTONDOWN:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MBUTTONDBLCLK\n");
+ winDebug ("winMWExtWMWindowProc - WM_MBUTTONDBLCLK\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -626,7 +626,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MBUTTONUP:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MBUTTONUP\n");
+ winDebug ("winMWExtWMWindowProc - WM_MBUTTONUP\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -636,7 +636,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_RBUTTONDBLCLK:
case WM_RBUTTONDOWN:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_RBUTTONDBLCLK\n");
+ winDebug ("winMWExtWMWindowProc - WM_RBUTTONDBLCLK\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -645,7 +645,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_RBUTTONUP:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_RBUTTONUP\n");
+ winDebug ("winMWExtWMWindowProc - WM_RBUTTONUP\n");
#endif
if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
break;
@@ -654,7 +654,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MOUSEWHEEL:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MOUSEWHEEL\n");
+ winDebug ("winMWExtWMWindowProc - WM_MOUSEWHEEL\n");
#endif
/* Pass the message to the root window */
@@ -663,15 +663,15 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MOUSEACTIVATE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n");
+ winDebug ("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n");
#endif
#if 0
/* Check if this window needs to be made active when clicked */
if (pWin->overrideRedirect)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MOUSEACTIVATE - "
- "MA_NOACTIVATE\n");
+ winDebug ("winMWExtWMWindowProc - WM_MOUSEACTIVATE - "
+ "MA_NOACTIVATE\n");
#endif
/* */
@@ -698,7 +698,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_SYSKEYDOWN:
case WM_KEYDOWN:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_*KEYDOWN\n");
+ winDebug ("winMWExtWMWindowProc - WM_*KEYDOWN\n");
#endif
/*
@@ -726,7 +726,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_KEYUP:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_*KEYUP\n");
+ winDebug ("winMWExtWMWindowProc - WM_*KEYUP\n");
#endif
/* Pass the message to the root window */
@@ -735,7 +735,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_HOTKEY:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_HOTKEY\n");
+ winDebug ("winMWExtWMWindowProc - WM_HOTKEY\n");
#endif
/* Pass the message to the root window */
@@ -779,7 +779,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_ACTIVATE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_ACTIVATE\n");
+ winDebug ("winMWExtWMWindowProc - WM_ACTIVATE\n");
#endif
if (LOWORD(wParam) != WA_INACTIVE)
{
@@ -801,7 +801,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
if (pRLWinPriv->fRestackingNow)
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("Win %08x is now restacking.\n", (unsigned int)pRLWinPriv);
+ winDebug ("Win %08x is now restacking.\n", (unsigned int)pRLWinPriv);
#endif
break;
}
@@ -809,14 +809,14 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
if (IsRaiseOnClick (pWin))
{
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n", (unsigned int)pRLWinPriv);
+ winDebug ("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n", (unsigned int)pRLWinPriv);
#endif
break;
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("Win %08x forbid to change z order (%08x).\n",
- (unsigned int)pRLWinPriv, (unsigned int)pWinPos->hwndInsertAfter);
+ winDebug ("Win %08x forbid to change z order (%08x).\n",
+ (unsigned int)pRLWinPriv, (unsigned int)pWinPos->hwndInsertAfter);
#endif
pWinPos->flags |= SWP_NOZORDER;
}
@@ -825,8 +825,8 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_MOVE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_MOVE - %d ms\n",
- (unsigned int)GetTickCount ());
+ winDebug ("winMWExtWMWindowProc - WM_MOVE - %d ms\n",
+ (unsigned int)GetTickCount ());
#endif
if (g_fNoConfigureWindow) break;
#if 0
@@ -851,7 +851,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
#endif
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\t(%d, %d)\n", (short) LOWORD(lParam), (short) HIWORD(lParam));
+ winDebug ("\t(%d, %d)\n", (short) LOWORD(lParam), (short) HIWORD(lParam));
#endif
if (!pRLWinPriv->fMovingOrSizing)
{
@@ -865,8 +865,8 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_SHOWWINDOW:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
- (unsigned int)GetTickCount ());
+ winDebug ("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
+ (unsigned int)GetTickCount ());
#endif
break;
@@ -877,25 +877,25 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_WINDOWPOSCHANGED:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED\n");
+ winDebug ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED\n");
#endif
{
pWinPos = (LPWINDOWPOS) lParam;
#if CYGMULTIWINDOW_DEBUG
- ErrorF("flags: ");
- if (pWinPos->flags & SWP_DRAWFRAME) ErrorF("SWP_DRAWFRAME ");
- if (pWinPos->flags & SWP_FRAMECHANGED) ErrorF("SWP_FRAMECHANGED ");
- if (pWinPos->flags & SWP_HIDEWINDOW) ErrorF("SWP_HIDEWINDOW ");
- if (pWinPos->flags & SWP_NOACTIVATE) ErrorF("SWP_NOACTIVATE ");
- if (pWinPos->flags & SWP_NOCOPYBITS) ErrorF("SWP_NOCOPYBITS ");
- if (pWinPos->flags & SWP_NOMOVE) ErrorF("SWP_NOMOVE ");
- if (pWinPos->flags & SWP_NOOWNERZORDER) ErrorF("SWP_NOOWNERZORDER ");
- if (pWinPos->flags & SWP_NOSIZE) ErrorF("SWP_NOSIZE ");
- if (pWinPos->flags & SWP_NOREDRAW) ErrorF("SWP_NOREDRAW ");
- if (pWinPos->flags & SWP_NOSENDCHANGING) ErrorF("SWP_NOSENDCHANGING ");
- if (pWinPos->flags & SWP_NOZORDER) ErrorF("SWP_NOZORDER ");
- if (pWinPos->flags & SWP_SHOWWINDOW) ErrorF("SWP_SHOWWINDOW ");
- ErrorF("\n");
+ winDebug("flags: ");
+ if (pWinPos->flags & SWP_DRAWFRAME) winDebug("SWP_DRAWFRAME ");
+ if (pWinPos->flags & SWP_FRAMECHANGED) winDebug("SWP_FRAMECHANGED ");
+ if (pWinPos->flags & SWP_HIDEWINDOW) winDebug("SWP_HIDEWINDOW ");
+ if (pWinPos->flags & SWP_NOACTIVATE) winDebug("SWP_NOACTIVATE ");
+ if (pWinPos->flags & SWP_NOCOPYBITS) winDebug("SWP_NOCOPYBITS ");
+ if (pWinPos->flags & SWP_NOMOVE) winDebug("SWP_NOMOVE ");
+ if (pWinPos->flags & SWP_NOOWNERZORDER) winDebug("SWP_NOOWNERZORDER ");
+ if (pWinPos->flags & SWP_NOSIZE) winDebug("SWP_NOSIZE ");
+ if (pWinPos->flags & SWP_NOREDRAW) winDebug("SWP_NOREDRAW ");
+ if (pWinPos->flags & SWP_NOSENDCHANGING) winDebug("SWP_NOSENDCHANGING ");
+ if (pWinPos->flags & SWP_NOZORDER) winDebug("SWP_NOZORDER ");
+ if (pWinPos->flags & SWP_SHOWWINDOW) winDebug("SWP_SHOWWINDOW ");
+ winDebug("\n");
#endif
if (pWinPos->flags & SWP_HIDEWINDOW) break;
@@ -950,7 +950,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
if (!(pWinPos->flags & SWP_NOSIZE)) {
if (IsIconic(hwnd)){
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tIconic -> MINIMIZED\n");
+ winDebug ("\tIconic -> MINIMIZED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -960,7 +960,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
0, 0, 0, 0);
} else if (IsZoomed(hwnd)){
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tZoomed -> MAXIMIZED\n");
+ winDebug ("\tZoomed -> MAXIMIZED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -970,7 +970,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
0, 0, 0, 0);
} else {
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tnone -> RESTORED\n");
+ winDebug ("\tnone -> RESTORED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -990,7 +990,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
if (!(pWinPos->flags & SWP_NOMOVE)
&&!(pWinPos->flags & SWP_NOSIZE)) {
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tmove & resize\n");
+ winDebug ("\tmove & resize\n");
#endif
winMWExtWMMoveResizeXWindow (pWin,
rcClient.left - wBorderWidth (pWin)
@@ -1003,7 +1003,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
- wBorderWidth (pWin)*2);
} else if (!(pWinPos->flags & SWP_NOMOVE)) {
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tmove\n");
+ winDebug ("\tmove\n");
#endif
winMWExtWMMoveXWindow (pWin,
rcClient.left - wBorderWidth (pWin)
@@ -1012,7 +1012,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
- GetSystemMetrics (SM_YVIRTUALSCREEN));
} else if (!(pWinPos->flags & SWP_NOSIZE)) {
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tresize\n");
+ winDebug ("\tresize\n");
#endif
winMWExtWMResizeXWindow (pWin,
rcClient.right - rcClient.left
@@ -1024,7 +1024,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
}
}
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n");
+ winDebug ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n");
#endif
return 0;
@@ -1032,11 +1032,11 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
/* see dix/window.c */
/* FIXME: Maximize/Restore? */
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_SIZE - %d ms\n",
- (unsigned int)GetTickCount ());
+ winDebug ("winMWExtWMWindowProc - WM_SIZE - %d ms\n",
+ (unsigned int)GetTickCount ());
#endif
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\t(%d, %d) %d\n", (short) LOWORD(lParam), (short) HIWORD(lParam), g_fNoConfigureWindow);
+ winDebug ("\t(%d, %d) %d\n", (short) LOWORD(lParam), (short) HIWORD(lParam), g_fNoConfigureWindow);
#endif
if (g_fNoConfigureWindow) break;
@@ -1045,7 +1045,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
{
case SIZE_MINIMIZED:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tSIZE_MINIMIZED\n");
+ winDebug ("\tSIZE_MINIMIZED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -1058,7 +1058,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case SIZE_RESTORED:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tSIZE_RESTORED\n");
+ winDebug ("\tSIZE_RESTORED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -1071,7 +1071,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case SIZE_MAXIMIZED:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("\tSIZE_MAXIMIZED\n");
+ winDebug ("\tSIZE_MAXIMIZED\n");
#endif
winWindowsWMSendEvent(WindowsWMControllerNotify,
WindowsWMControllerNotifyMask,
@@ -1127,16 +1127,16 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
case WM_ENTERSIZEMOVE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n",
- (unsigned int)GetTickCount ());
+ winDebug ("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n",
+ (unsigned int)GetTickCount ());
#endif
pRLWinPriv->fMovingOrSizing = TRUE;
break;
case WM_EXITSIZEMOVE:
#if CYGMULTIWINDOW_DEBUG
- ErrorF ("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n",
- (unsigned int)GetTickCount ());
+ winDebug ("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n",
+ (unsigned int)GetTickCount ());
#endif
pRLWinPriv->fMovingOrSizing = FALSE;