From 1556815d34cecb4b4b62d2a4ce813b1435a937ec Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 2 Nov 2008 18:27:18 +0000 Subject: [PATCH] Cygwin/X: Initialize native HWND atom when built !XWIN_MULTIWINDOWEXTWM Fix the native HWND atom identifier to be initialized correctly, when built without external WM support This is neccessary for native window naming to work correctly in multiwindow internal WM mode. Signed-off-by: Jon TURNEY --- hw/xwin/winmultiwindowwm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 126ecc641..7e00fb894 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -58,6 +58,10 @@ #include "winwindow.h" #ifdef XWIN_MULTIWINDOWEXTWM #include "windowswmstr.h" +#else +/* We need the native HWND atom for intWM, so for consistency use the + same name as extWM would if we were building with enabled... */ +#define WINDOWSWM_NATIVE_HWND "_WINDOWSWM_NATIVE_HWND" #endif extern void winDebug(const char *format, ...); @@ -1256,11 +1260,10 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) pWMInfo->atmWmDelete = XInternAtom (pWMInfo->pDisplay, "WM_DELETE_WINDOW", False); -#ifdef XWIN_MULTIWINDOWEXTWM + pWMInfo->atmPrivMap = XInternAtom (pWMInfo->pDisplay, WINDOWSWM_NATIVE_HWND, False); -#endif if (1) {