From 95db83f13c91d212d99b72de6e3c3d4853553e71 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 12 Aug 2015 07:30:28 +0100 Subject: Fix typo in 'keyboard layout updates' --- hw/xwin/winconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 93b412e3c..7639da7ce 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -346,7 +346,7 @@ winConfigKeyboard(DeviceIntPtr pDevice) g_winInfo.xkb.variant = pLayout->xkbvariant; g_winInfo.xkb.options = pLayout->xkboptions; - if (deviceIdentifier == 0xa0000) { + if (deviceIdentifier == 0xa000) { winMsg(X_PROBED, "Windows keyboard layout device identifier indicates Macintosh, setting Model = \"macintosh\""); g_winInfo.xkb.model = "macintosh"; } -- cgit v1.2.3 From b0d3e709e6284e219850dc5e63384167f79bfb9e Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 17 Aug 2015 14:47:58 +0100 Subject: Report xkbcomp exit status in hex --- xkb/ddxLoad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index ffccafefa..c03fa6079 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -208,7 +208,7 @@ RunXkbComp(xkbcomp_buffer_callback callback, void *userdata) else LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); #if defined(WIN32) || defined(__CYGWIN__) - LogMessage(X_ERROR, "xkbcomp exit status %d\n", status); + LogMessage(X_ERROR, "xkbcomp exit status 0x%x\n", status); { char *lineptr = NULL; -- cgit v1.2.3 From 1272ef4bf87d27af4f81c5a7c0359fa4b300f0ba Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 20 Aug 2015 18:02:31 +0100 Subject: Don't unmap windows on SWP_HIDEWINDOW unmapping the X window on SWP_HIDEWINDOW makes the window inaccessible after a virtual desktop change with Dexpot. --- hw/xwin/winmultiwindowwndproc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 9c2423a7a..7fd0a0acf 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -978,14 +978,18 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) winStartMousePolling(s_pScreenPriv); } - /* Window is being hidden */ - if (pWinPos->flags & SWP_HIDEWINDOW) { - /* Tell our Window Manager thread to unmap the window */ - wmMsg.msg = WM_WM_UNMAP; - - if (fWMMsgInitialized) - winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg); - } + /* + We don't react to SWP_HIDEWINDOW indicating window is being hidden in + a symmetrical way (i.e. by sending WM_WM_UNMAP) + + If the cause of the window being hidden is the X windows being unmapped, + (WM_STATE has changed to WithdrawnState), then the window has already + been unmapped. + + Virtual desktop software (like VirtuaWin or Dexpot) uses SWP_HIDEWINDOW + to hide windows on other desktops. We mustn't unmap the X window in + that situation, as it becomes inaccessible. + */ } /* * Pass the message to DefWindowProc to let the function -- cgit v1.2.3