diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2015-11-02 20:24:33 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-03-09 16:13:07 +0000 |
| commit | c42217aa3d372acaa5ca7c64895edbfbd20c8475 (patch) | |
| tree | a9e440efb95d336ba3de3d067fc65b743a387bff | |
| parent | b6bdf368420355332e41c604c523584bd39933f9 (diff) | |
hw/xwin: Remove WM_(UN|)MANAGE messages, which are now never sent
Remove fAnotherWMRunning which tracks this message (although since it was
never initialized, I doubt this worked reliably), and the only use of that,
which was to prevent winMWExtWMRestackWindows() from being used when the
internalwm is running
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/win.h | 1 | ||||
| -rw-r--r-- | hw/xwin/winwin32rootlesswndproc.c | 8 | ||||
| -rw-r--r-- | hw/xwin/winwindow.h | 2 | ||||
| -rw-r--r-- | hw/xwin/winwndproc.c | 14 |
4 files changed, 1 insertions, 24 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h index f3d1eabb5..3b8e93dd2 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -404,7 +404,6 @@ typedef struct { Bool fDecoration; #ifdef XWIN_MULTIWINDOWEXTWM Bool fMWExtWM; - Bool fAnotherWMRunning; #endif Bool fRootless; #ifdef XWIN_MULTIWINDOW diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c index ab7d82b9a..5575f4ba8 100644 --- a/hw/xwin/winwin32rootlesswndproc.c +++ b/hw/xwin/winwin32rootlesswndproc.c @@ -1072,14 +1072,6 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) - wBorderWidth(pWin) * 2); break; - case WM_MANAGE: - ErrorF("winMWExtWMWindowProc - WM_MANAGE\n"); - break; - - case WM_UNMANAGE: - ErrorF("winMWExtWMWindowProc - WM_UNMANAGE\n"); - break; - default: break; } diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 0b2bf93ce..129a77cf9 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -112,8 +112,6 @@ typedef struct _winWMMessageRec { #define WM_WM_MAP2 (WM_USER + 12) #define WM_WM_MAP3 (WM_USER + 13) #define WM_WM_HINTS_EVENT (WM_USER + 14) -#define WM_MANAGE (WM_USER + 100) -#define WM_UNMANAGE (WM_USER + 102) #define MwmHintsDecorations (1L << 1) diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 5104c7b82..a2365a05b 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -1192,7 +1192,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) #ifdef XWIN_MULTIWINDOWEXTWM if (s_pScreenPriv->fActive) { /* Restack all window unless using built-in wm. */ - if (s_pScreenInfo->fAnotherWMRunning) + if (s_pScreenInfo->fMWExtWM) winMWExtWMRestackWindows(s_pScreen); } #endif @@ -1256,18 +1256,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) } break; -#ifdef XWIN_MULTIWINDOWEXTWM - case WM_MANAGE: - ErrorF("winWindowProc - WM_MANAGE\n"); - s_pScreenInfo->fAnotherWMRunning = FALSE; - break; - - case WM_UNMANAGE: - ErrorF("winWindowProc - WM_UNMANAGE\n"); - s_pScreenInfo->fAnotherWMRunning = TRUE; - break; -#endif - default: if (message == s_uTaskbarRestart) { winInitNotifyIcon(s_pScreenPriv); |