summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-03-31 18:45:28 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2013-01-16 16:49:56 +0000
commitef61f8cacc84080c9156675f9ce26a27e8a90ac1 (patch)
tree091bde4b249fcd1fa69b349f93821cf68deb8f30
parent3628559e594fcbdfcc14b1e8fa60aa841f184e19 (diff)
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 <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-rw-r--r--hw/xwin/winmultiwindowwm.c6
1 files changed, 6 insertions, 0 deletions
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);