diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2015-07-02 22:21:28 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-07-21 14:44:23 +0100 |
| commit | a588e6f81b1d8dfb9076358e5039d3ee6628a50f (patch) | |
| tree | 1d19ae438173941dbbbc75071758119221dba810 /hw/xwin | |
| parent | a47e7eb247d5c61be43d31b32887dee1dc89ba67 (diff) | |
hw/xwin: Rename WM_WM_MAP{2,3} to WM_WM_MAP_{UN,}MANAGED
WM_WM_MAP was removed in 52e05b92
Rename WM_WM_MAP2 as WM_WM_MAP_UNMANAGED (meaning an override-redirect
window, which manages it's own activation)
Rename WM_WM_MAP3 as WM_WM_MAP_MANAGED (meaning a normal window, which
is activated when clicked)
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 12 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwndproc.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winwindow.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 0734006fc..69917fddd 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -222,11 +222,11 @@ MessageName(winWMMessagePtr msg) case WM_WM_CHANGE_STATE: return "WM_WM_CHANGE_STATE"; break; - case WM_WM_MAP2: - return "WM_WM_MAP2"; + case WM_WM_MAP_UNMANAGED: + return "WM_WM_MAP_UNMANAGED"; break; - case WM_WM_MAP3: - return "WM_WM_MAP3"; + case WM_WM_MAP_MANAGED: + return "WM_WM_MAP_MANAGED"; break; case WM_WM_HINTS_EVENT: return "WM_WM_HINTS_EVENT"; @@ -842,7 +842,7 @@ winMultiWindowWMProc(void *pArg) } break; - case WM_WM_MAP2: + case WM_WM_MAP_UNMANAGED: /* Put a note as to the HWND associated with this Window */ xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE, pNode->msg.iWindow, pWMInfo->atmPrivMap, @@ -851,7 +851,7 @@ winMultiWindowWMProc(void *pArg) break; - case WM_WM_MAP3: + case WM_WM_MAP_MANAGED: /* Put a note as to the HWND associated with this Window */ xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE, pNode->msg.iWindow, pWMInfo->atmPrivMap, diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 587884d11..31b5d6307 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -1005,7 +1005,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) } } } - wmMsg.msg = WM_WM_MAP3; + wmMsg.msg = WM_WM_MAP_MANAGED; } else { /* It is an overridden window so make it top of Z stack */ @@ -1025,7 +1025,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); } } - wmMsg.msg = WM_WM_MAP2; + wmMsg.msg = WM_WM_MAP_UNMANAGED; } /* Tell our Window Manager thread to map the window */ diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 402b9e63c..92a839c4d 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -107,8 +107,8 @@ typedef struct _winWMMessageRec { #define WM_WM_NAME_EVENT (WM_USER + 9) #define WM_WM_ICON_EVENT (WM_USER + 10) #define WM_WM_CHANGE_STATE (WM_USER + 11) -#define WM_WM_MAP2 (WM_USER + 12) -#define WM_WM_MAP3 (WM_USER + 13) +#define WM_WM_MAP_UNMANAGED (WM_USER + 12) +#define WM_WM_MAP_MANAGED (WM_USER + 13) #define WM_WM_HINTS_EVENT (WM_USER + 14) #define MwmHintsDecorations (1L << 1) |