From ef61f8cacc84080c9156675f9ce26a27e8a90ac1 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sat, 31 Mar 2012 18:45:28 +0100 Subject: [PATCH] hw/xwin: Make sure that WM_WM_HINTS_EVENT does nothing for override-redirect windows Future work: It looks like this code could be rationalized quite a lot: It might make sense to pull the checking for override-redirect up out of UpdateIcon() and UpdateName() and consolidate WM_WM_MAP2 and WM_WM_MAP3 Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winmultiwindowwm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 12002430b..1dc31fd0a 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -817,6 +817,12 @@ winMultiWindowWMProc(void *pArg) { HWND zstyle = HWND_NOTOPMOST; UINT flags; + XWindowAttributes attr; + + /* Don't do anything if this is an override-redirect window */ + XGetWindowAttributes (pWMInfo->pDisplay, pNode->msg.iWindow, &attr); + if (attr.override_redirect) + break; pNode->msg.hwndWindow = getHwnd(pWMInfo, pNode->msg.iWindow);