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

steamcompmgr: Add win_surface helper

Browse source 
Makes this easier to read
This commit is contained in:
Joshua Ashton 2022-01-08 06:20:07 +00:00 committed by Joshie
parent 062a2bf496
commit e7cd2dbb25
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/steamcompmgr.cpp
View file

@ -2060,6 +2060,14 @@ found:
XFree(children); XFree(children);
} }
wlr_surface *win_surface(win *window)
{
if (!window)
return nullptr;
return window->surface.wlr;
}
static void static void
determine_and_apply_focus() determine_and_apply_focus()
{ {
@ -2187,11 +2195,11 @@ found:
if ( global_focus.inputFocusWindow != previous_focus.inputFocusWindow || if ( global_focus.inputFocusWindow != previous_focus.inputFocusWindow ||
global_focus.keyboardFocusWindow != previous_focus.keyboardFocusWindow ) global_focus.keyboardFocusWindow != previous_focus.keyboardFocusWindow )
{ {
if ( (global_focus.inputFocusWindow && global_focus.inputFocusWindow->surface.wlr != nullptr) || if ( win_surface(global_focus.inputFocusWindow) != nullptr ||
(global_focus.keyboardFocusWindow && global_focus.keyboardFocusWindow->surface.wlr != nullptr) ) win_surface(global_focus.keyboardFocusWindow) != nullptr )
{ {
wlserver_lock(); wlserver_lock();
if ( global_focus.inputFocusWindow && global_focus.inputFocusWindow->surface.wlr != nullptr ) if ( win_surface(global_focus.inputFocusWindow) != nullptr )
{ {
// Instantly stop pressing left mouse before transitioning to a new window. // Instantly stop pressing left mouse before transitioning to a new window.
// for focus. // for focus.
@ -2200,7 +2208,7 @@ found:
wlserver_mousefocus( global_focus.inputFocusWindow->surface.wlr, global_focus.cursor->x(), global_focus.cursor->y() ); wlserver_mousefocus( global_focus.inputFocusWindow->surface.wlr, global_focus.cursor->x(), global_focus.cursor->y() );
} }
if ( global_focus.keyboardFocusWindow && global_focus.keyboardFocusWindow->surface.wlr != nullptr ) if ( win_surface(global_focus.keyboardFocusWindow) != nullptr )
wlserver_keyboardfocus( global_focus.keyboardFocusWindow->surface.wlr ); wlserver_keyboardfocus( global_focus.keyboardFocusWindow->surface.wlr );
wlserver_unlock(); wlserver_unlock();
} }