fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-03-30 22:20:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xwin: Always set the X input focus to none when an X window loses focus

Browse source 
In the multiwindow WM, we need to cancel the X input focus if the
Windows input focus has gone to the desktop, or another application's
window.

We could maybe avoid some unneeded work by not doing this if the
WM_KILLFOCUS wParam is another window owned by us, which is immediately
going to be given the X input focus.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/736>
This commit is contained in:
Jon Turney 2017-04-17 20:00:17 +01:00 • committed by Marge Bot
parent 1afb9c6a7c
commit d7d2dd8286
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/xwin/winmultiwindowwm.c
View file

@ -909,6 +909,7 @@ winMultiWindowWMProc(void *pArg)
-- independently, the WM_TAKE_FOCUS protocol determines whether
the WM should send a WM_TAKE_FOCUS ClientMessage.
*/
if (pNode->msg.iWindow)
{
Bool neverFocus = FALSE;
xcb_get_property_cookie_t cookie;
@ -932,6 +933,13 @@ winMultiWindowWMProc(void *pArg)
pNode->msg.iWindow,
pWMInfo->atmWmProtos, pWMInfo->atmWmTakeFocus);
}
else
/* Set the input focus to none */
{
xcb_set_input_focus(pWMInfo->conn, XCB_INPUT_FOCUS_NONE,
XCB_NONE, XCB_CURRENT_TIME);
}
break;

10
hw/xwin/winmultiwindowwndproc.c
View file

@ -808,9 +808,13 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
/* Remove our keyboard hook if it is installed */
winRemoveKeyboardHookLL();
/* Revert the X focus as well, but only if the Windows focus is going to another window */
if (!wParam && pWin)
DeleteWindowFromAnyEvents(pWin, FALSE);
/* Revert the X focus as well */
if (fWMMsgInitialized)
{
wmMsg.msg = WM_WM_ACTIVATE;
wmMsg.iWindow = 0;
winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
}
return 0;