frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jon Turney 2015-11-02 20:24:33 +00:00
parent b6bdf36842
commit c42217aa3d
4 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -404,7 +404,6 @@ typedef struct {
Bool fDecoration; Bool fDecoration;
#ifdef XWIN_MULTIWINDOWEXTWM #ifdef XWIN_MULTIWINDOWEXTWM
Bool fMWExtWM; Bool fMWExtWM;
Bool fAnotherWMRunning;
#endif #endif
Bool fRootless; Bool fRootless;
#ifdef XWIN_MULTIWINDOW #ifdef XWIN_MULTIWINDOW

8
hw/xwin/winwin32rootlesswndproc.c
View File

@ -1072,14 +1072,6 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
- wBorderWidth(pWin) * 2); - wBorderWidth(pWin) * 2);
break; break;
case WM_MANAGE:
ErrorF("winMWExtWMWindowProc - WM_MANAGE\n");
break;
case WM_UNMANAGE:
ErrorF("winMWExtWMWindowProc - WM_UNMANAGE\n");
break;
default: default:
break; break;
} }

2
hw/xwin/winwindow.h
View File

@ -112,8 +112,6 @@ typedef struct _winWMMessageRec {
#define WM_WM_MAP2 (WM_USER + 12) #define WM_WM_MAP2 (WM_USER + 12)
#define WM_WM_MAP3 (WM_USER + 13) #define WM_WM_MAP3 (WM_USER + 13)
#define WM_WM_HINTS_EVENT (WM_USER + 14) #define WM_WM_HINTS_EVENT (WM_USER + 14)
#define WM_MANAGE (WM_USER + 100)
#define WM_UNMANAGE (WM_USER + 102)
#define MwmHintsDecorations (1L << 1) #define MwmHintsDecorations (1L << 1)

14
hw/xwin/winwndproc.c
View File

@ -1192,7 +1192,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
#ifdef XWIN_MULTIWINDOWEXTWM #ifdef XWIN_MULTIWINDOWEXTWM
if (s_pScreenPriv->fActive) { if (s_pScreenPriv->fActive) {
/* Restack all window unless using built-in wm. */ /* Restack all window unless using built-in wm. */
if (s_pScreenInfo->fAnotherWMRunning) if (s_pScreenInfo->fMWExtWM)
winMWExtWMRestackWindows(s_pScreen); winMWExtWMRestackWindows(s_pScreen);
} }
#endif #endif
@ -1256,18 +1256,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
break; 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: default:
if (message == s_uTaskbarRestart) { if (message == s_uTaskbarRestart) {
winInitNotifyIcon(s_pScreenPriv); winInitNotifyIcon(s_pScreenPriv);