Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

steamcompmgr: Fix stale keybaord focus bug

Browse source 
When the focus changes but the input focus does not (ie. overlay -> steam) the keyboard focus can be left behind on the game, which is not what we want.

Track this more ganularly.
This commit is contained in:
Joshua Ashton 2022-01-07 09:59:07 +00:00 committed by Joshie
parent e8faa8647e
commit e29d76ef44
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/steamcompmgr.cpp
View file

@ -175,6 +175,7 @@ struct global_focus_t
win *currentNotificationWindow; win *currentNotificationWindow;
win *currentOverrideWindow; win *currentOverrideWindow;
win *currentFadeWindow; win *currentFadeWindow;
win *currentKeyboardFocusWindow;
MouseCursor *cursor; MouseCursor *cursor;
} global_focus; } global_focus;
@ -1987,19 +1988,22 @@ found:
ctx->currentFocusWindow = focus; ctx->currentFocusWindow = focus;
if ( ctx->currentInputFocusWindow != inputFocus ||
ctx->currentInputFocusMode != inputFocus->inputFocusMode )
{
win *keyboardFocusWin = inputFocus; win *keyboardFocusWin = inputFocus;
if ( inputFocus && inputFocus->inputFocusMode )
keyboardFocusWin = override_focus ? override_focus : focus;
Window keyboardFocusWindow = keyboardFocusWin ? keyboardFocusWin->id : None;
if ( ctx->currentInputFocusWindow != inputFocus ||
ctx->currentInputFocusMode != inputFocus->inputFocusMode ||
ctx->currentKeyboardFocusWindow != keyboardFocusWindow )
{
if ( debugFocus == true ) if ( debugFocus == true )
{ {
xwm_log.debugf( "determine_and_apply_focus inputFocus %lu", inputFocus->id ); xwm_log.debugf( "determine_and_apply_focus inputFocus %lu", inputFocus->id );
} }
if ( inputFocus->inputFocusMode )
keyboardFocusWin = override_focus ? override_focus : focus;
if ( !override_focus || override_focus != keyboardFocusWin ) if ( !override_focus || override_focus != keyboardFocusWin )
XSetInputFocus(ctx->dpy, keyboardFocusWin->id, RevertToNone, CurrentTime); XSetInputFocus(ctx->dpy, keyboardFocusWin->id, RevertToNone, CurrentTime);
@ -2171,19 +2175,19 @@ found:
if (global_focus.currentInputFocusWindow) if (global_focus.currentInputFocusWindow)
global_focus.currentInputFocusMode = global_focus.currentInputFocusWindow->inputFocusMode; global_focus.currentInputFocusMode = global_focus.currentInputFocusWindow->inputFocusMode;
win *keyboardFocusWin = global_focus.currentInputFocusWindow; global_focus.currentKeyboardFocusWindow = global_focus.currentInputFocusWindow;
if ( global_focus.currentInputFocusMode ) if ( global_focus.currentInputFocusMode )
{ {
keyboardFocusWin = global_focus.currentOverrideWindow global_focus.currentKeyboardFocusWindow = global_focus.currentOverrideWindow
? global_focus.currentOverrideWindow ? global_focus.currentOverrideWindow
: global_focus.currentFocusWindow; : global_focus.currentFocusWindow;
} }
if ( global_focus.currentInputFocusWindow != previous_focus.currentInputFocusWindow || if ( global_focus.currentInputFocusWindow != previous_focus.currentInputFocusWindow ||
global_focus.currentInputFocusMode != previous_focus.currentInputFocusMode ) global_focus.currentKeyboardFocusWindow != previous_focus.currentKeyboardFocusWindow )
{ {
if ( (global_focus.currentInputFocusWindow && global_focus.currentInputFocusWindow->surface.wlr != nullptr) || if ( (global_focus.currentInputFocusWindow && global_focus.currentInputFocusWindow->surface.wlr != nullptr) ||
(keyboardFocusWin && keyboardFocusWin->surface.wlr != nullptr) ) (global_focus.currentKeyboardFocusWindow && global_focus.currentKeyboardFocusWindow->surface.wlr != nullptr) )
{ {
wlserver_lock(); wlserver_lock();
if ( global_focus.currentInputFocusWindow && global_focus.currentInputFocusWindow->surface.wlr != nullptr ) if ( global_focus.currentInputFocusWindow && global_focus.currentInputFocusWindow->surface.wlr != nullptr )
@ -2195,8 +2199,8 @@ found:
wlserver_mousefocus( global_focus.currentInputFocusWindow->surface.wlr, global_focus.cursor->x(), global_focus.cursor->y() ); wlserver_mousefocus( global_focus.currentInputFocusWindow->surface.wlr, global_focus.cursor->x(), global_focus.cursor->y() );
} }
if ( keyboardFocusWin && keyboardFocusWin->surface.wlr != nullptr ) if ( global_focus.currentKeyboardFocusWindow && global_focus.currentKeyboardFocusWindow->surface.wlr != nullptr )
wlserver_keyboardfocus( keyboardFocusWin->surface.wlr ); wlserver_keyboardfocus( global_focus.currentKeyboardFocusWindow->surface.wlr );
wlserver_unlock(); wlserver_unlock();
} }
} }
@ -2230,9 +2234,9 @@ found:
focused_mouse_display = global_focus.currentInputFocusWindow->ctx->xwayland_server->get_nested_display_name(); focused_mouse_display = global_focus.currentInputFocusWindow->ctx->xwayland_server->get_nested_display_name();
} }
if ( keyboardFocusWin ) if ( global_focus.currentKeyboardFocusWindow )
{ {
focused_keyboard_display = keyboardFocusWin->ctx->xwayland_server->get_nested_display_name(); focused_keyboard_display = global_focus.currentKeyboardFocusWindow->ctx->xwayland_server->get_nested_display_name();
} }
XChangeProperty( root_ctx->dpy, root_ctx->root, root_ctx->atoms.gamescopeFocusedAppAtom, XA_CARDINAL, 32, PropModeReplace, XChangeProperty( root_ctx->dpy, root_ctx->root, root_ctx->atoms.gamescopeFocusedAppAtom, XA_CARDINAL, 32, PropModeReplace,