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

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)
This commit is contained in:
Jon Turney 2015-07-02 22:21:28 +01:00
parent a47e7eb247
commit a588e6f81b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xwin/winmultiwindowwm.c
View File

@ -222,11 +222,11 @@ MessageName(winWMMessagePtr msg)
case WM_WM_CHANGE_STATE: case WM_WM_CHANGE_STATE:
return "WM_WM_CHANGE_STATE"; return "WM_WM_CHANGE_STATE";
break; break;
case WM_WM_MAP2: case WM_WM_MAP_UNMANAGED:
return "WM_WM_MAP2"; return "WM_WM_MAP_UNMANAGED";
break; break;
case WM_WM_MAP3: case WM_WM_MAP_MANAGED:
return "WM_WM_MAP3"; return "WM_WM_MAP_MANAGED";
break; break;
case WM_WM_HINTS_EVENT: case WM_WM_HINTS_EVENT:
return "WM_WM_HINTS_EVENT"; return "WM_WM_HINTS_EVENT";
@ -842,7 +842,7 @@ winMultiWindowWMProc(void *pArg)
} }
break; break;
case WM_WM_MAP2: case WM_WM_MAP_UNMANAGED:
/* Put a note as to the HWND associated with this Window */ /* Put a note as to the HWND associated with this Window */
xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE, xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE,
pNode->msg.iWindow, pWMInfo->atmPrivMap, pNode->msg.iWindow, pWMInfo->atmPrivMap,
@ -851,7 +851,7 @@ winMultiWindowWMProc(void *pArg)
break; break;
case WM_WM_MAP3: case WM_WM_MAP_MANAGED:
/* Put a note as to the HWND associated with this Window */ /* Put a note as to the HWND associated with this Window */
xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE, xcb_change_property(pWMInfo->conn, XCB_PROP_MODE_REPLACE,
pNode->msg.iWindow, pWMInfo->atmPrivMap, pNode->msg.iWindow, pWMInfo->atmPrivMap,

4
hw/xwin/winmultiwindowwndproc.c
View File

@ -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 */ 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); 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 */ /* Tell our Window Manager thread to map the window */

4
hw/xwin/winwindow.h
View File

@ -107,8 +107,8 @@ typedef struct _winWMMessageRec {
#define WM_WM_NAME_EVENT (WM_USER + 9) #define WM_WM_NAME_EVENT (WM_USER + 9)
#define WM_WM_ICON_EVENT (WM_USER + 10) #define WM_WM_ICON_EVENT (WM_USER + 10)
#define WM_WM_CHANGE_STATE (WM_USER + 11) #define WM_WM_CHANGE_STATE (WM_USER + 11)
#define WM_WM_MAP2 (WM_USER + 12) #define WM_WM_MAP_UNMANAGED (WM_USER + 12)
#define WM_WM_MAP3 (WM_USER + 13) #define WM_WM_MAP_MANAGED (WM_USER + 13)
#define WM_WM_HINTS_EVENT (WM_USER + 14) #define WM_WM_HINTS_EVENT (WM_USER + 14)
#define MwmHintsDecorations (1L << 1) #define MwmHintsDecorations (1L << 1)