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

hw/xwin: Report Window XIDs in Window debug messages

Browse Source 
Report Window XIDs in Window create/destroy/reparent debug messages

It's actually quite useful if you are trying to corrolate those events
with what a client is doing...

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon TURNEY 2010-10-11 16:22:49 +01:00
parent b0b54338e2
commit 276735ef5d
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/glx/winpriv.c
View File

@ -19,7 +19,7 @@ winCreateWindowsWindow (WindowPtr pWin);
*/ */
HWND winGetWindowInfo(WindowPtr pWin) HWND winGetWindowInfo(WindowPtr pWin)
{ {
winDebug("%s: pWin=%p\n", __FUNCTION__, pWin); winTrace("%s: pWin %p XID 0x%x\n", __FUNCTION__, pWin, pWin->drawable.id);
/* a real window was requested */ /* a real window was requested */
if (pWin != NULL) if (pWin != NULL)

17
hw/xwin/winmultiwindowwindow.c
View File

@ -375,9 +375,8 @@ winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG winDebug("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
ErrorF ("winReparentMultiWindow - pWin: %08x\n", pWin); pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id, pWin->parent, pWin->parent->drawable.id);
#endif
WIN_UNWRAP(ReparentWindow); WIN_UNWRAP(ReparentWindow);
if (pScreen->ReparentWindow) if (pScreen->ReparentWindow)
@ -501,9 +500,7 @@ winCreateWindowsWindow (WindowPtr pWin)
winInitMultiWindowClass(); winInitMultiWindowClass();
#if CYGMULTIWINDOW_DEBUG winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin, pWin->drawable.id);
ErrorF ("winCreateWindowsWindow - pWin: %08x\n", pWin);
#endif
iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN); iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN); iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
@ -629,9 +626,7 @@ winDestroyWindowsWindow (WindowPtr pWin)
HICON hIcon; HICON hIcon;
HICON hIconSm; HICON hIconSm;
#if CYGMULTIWINDOW_DEBUG winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin, pWin->drawable.id);
ErrorF ("winDestroyWindowsWindow\n");
#endif
/* Bail out if the Windows window handle is invalid */ /* Bail out if the Windows window handle is invalid */
if (pWinPriv->hWnd == NULL) if (pWinPriv->hWnd == NULL)
@ -671,9 +666,7 @@ winDestroyWindowsWindow (WindowPtr pWin)
winInDestroyWindowsWindow = oldstate; winInDestroyWindowsWindow = oldstate;
#if CYGMULTIWINDOW_DEBUG winDebug("winDestroyWindowsWindow - done\n");
ErrorF ("-winDestroyWindowsWindow\n");
#endif
} }