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

hw/xwin: Set convenience variables for WM_CREATE as well 

Set convenience variables in winTopLevelWindowProc() for WM_CREATE as
well.
This commit is contained in:
Jon Turney 2015-12-01 19:33:38 +00:00
parent f67918353a
commit 2e1bc74373
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xwin/winmultiwindowwndproc.c
View File

@ -322,6 +322,20 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
lParam); lParam);
#endif #endif
/*
If this is WM_CREATE, set up the Windows window properties which point to
X window information, before we populate local convenience variables...
*/
if (message == WM_CREATE) {
SetProp(hwnd,
WIN_WINDOW_PROP,
(HANDLE) ((LPCREATESTRUCT) lParam)->lpCreateParams);
SetProp(hwnd,
WIN_WID_PROP,
(HANDLE) (INT_PTR)winGetWindowID(((LPCREATESTRUCT) lParam)->
lpCreateParams));
}
/* Check if the Windows window property for our X window pointer is valid */ /* Check if the Windows window property for our X window pointer is valid */
if ((pWin = GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) { if ((pWin = GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
/* Our X window pointer is valid */ /* Our X window pointer is valid */
@ -382,18 +396,6 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
/* Branch on message type */ /* Branch on message type */
switch (message) { switch (message) {
case WM_CREATE: case WM_CREATE:
/* */
SetProp(hwnd,
WIN_WINDOW_PROP,
(HANDLE) ((LPCREATESTRUCT) lParam)->lpCreateParams);
/* */
SetProp(hwnd,
WIN_WID_PROP,
(HANDLE) (INT_PTR) winGetWindowID(((LPCREATESTRUCT) lParam)->
lpCreateParams));
/* /*
* Make X windows' Z orders sync with Windows windows because * Make X windows' Z orders sync with Windows windows because
* there can be AlwaysOnTop windows overlapped on the window * there can be AlwaysOnTop windows overlapped on the window