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

steamcompmgr: Track ctx in win structure

Browse source
This commit is contained in:
Joshua Ashton 2022-01-07 07:15:54 +00:00 committed by Joshie
parent 97056e7a3f
commit a8a1084331
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/steamcompmgr.cpp
View file

@ -154,6 +154,8 @@ struct win {
struct wlserver_surface surface; struct wlserver_surface surface;
xwayland_ctx_t *ctx;
std::vector< std::shared_ptr<commit_t> > commit_queue; std::vector< std::shared_ptr<commit_t> > commit_queue;
}; };
@ -2143,18 +2145,10 @@ found:
} }
// Pick override and cursor from the same ctx as our primary focus. // Pick override and cursor from the same ctx as our primary focus.
if (global_focus.currentFocusWindow)
{ {
gamescope_xwayland_server_t *server = NULL; global_focus.currentOverrideWindow = global_focus.currentFocusWindow->ctx->currentOverrideWindow;
for (size_t i = 0; (server = wlserver_get_xwayland_server(i)); i++) global_focus.cursor = global_focus.currentFocusWindow->ctx->cursor.get();
{
if (server->ctx->currentFocusWindow == global_focus.currentFocusWindow)
{
// Cursor source can change if we have an overlay.
global_focus.cursor = server->ctx->cursor.get();
global_focus.currentOverrideWindow = server->ctx->currentOverrideWindow;
break;
}
}
} }
// Pick overlay/notifications from root ctx // Pick overlay/notifications from root ctx
@ -2630,6 +2624,7 @@ add_win(xwayland_ctx_t *ctx, Window id, Window prev, unsigned long sequence)
return; return;
} }
new_win->ctx = ctx;
new_win->damage_sequence = 0; new_win->damage_sequence = 0;
new_win->map_sequence = 0; new_win->map_sequence = 0;
if (new_win->a.c_class == InputOnly) if (new_win->a.c_class == InputOnly)