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> | 2016-11-17 13:15:44 +0000 |
| commit | 6d9eb18358710d0c2567b2534faa46ad19b58239 (patch) | |
| tree | 0425ccaea21a24bcbd8c06b4ede4dc546099f222 | |
| parent | bbb9e746bbad80035c3a7f05cd8859ba504c790b (diff) | |
Rename WM_WM_MAP[23]
Rename WM_WM_MAP2 as WM_WM_MAP_UNMANAGED
Rename WM_WM_MAP3 as WM_WM_MAP_MANAGED
| -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 104df4618..b8bdd39c3 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -239,11 +239,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"; @@ -990,7 +990,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, @@ -999,7 +999,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 e8dec5892..73fc31dab 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -945,7 +945,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 */ @@ -965,7 +965,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 78aead36b..d4eeb0027 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -110,8 +110,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) |