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

wlserver: Move commit handler to wl_surface_info

Browse source
This commit is contained in:
Joshua Ashton 2022-12-05 15:22:16 +00:00 committed by Joshie
parent dd3f14be83
commit eec3517fde
2 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/wlserver.cpp
View file

@ -371,11 +371,19 @@ static wlserver_wl_surface_info *get_wl_surface_info(struct wlr_surface *wlr_sur
return reinterpret_cast<wlserver_wl_surface_info *>(wlr_surf->data);
}
static void handle_wl_surface_commit( struct wl_listener *l, void *data )
{
wlserver_wl_surface_info *surf = wl_container_of( l, surf, commit );
xwayland_surface_commit(surf->wlr);
}
static void handle_wl_surface_destroy( struct wl_listener *l, void *data )
{
wlserver_wl_surface_info *surf = wl_container_of( l, surf, destroy );
if (surf->x11_surface)
surf->x11_surface->wlr = nullptr;
{
wlserver_x11_surface_info_finish(surf->x11_surface);
}
if ( surf->wlr == wlserver.mouse_focus_surface )
wlserver.mouse_focus_surface = nullptr;
@ -408,9 +416,13 @@ static void wlserver_new_surface(struct wl_listener *l, void *data)
wlserver_wl_surface_info *wl_surface_info = new wlserver_wl_surface_info;
wl_surface_info->wlr = wlr_surf;
wl_surface_info->destroy.notify = handle_wl_surface_destroy;
wl_signal_add( &wlr_surf->events.destroy, &wl_surface_info->destroy );
wl_surface_info->commit.notify = handle_wl_surface_commit;
wl_signal_add( &wlr_surf->events.commit, &wl_surface_info->commit );
wlr_surf->data = wl_surface_info;
struct wlserver_x11_surface_info *s, *tmp;
@ -1199,19 +1211,6 @@ const char *wlserver_get_wl_display_name( void )
return wlserver.wl_display_name;
}
static void handle_x11_surface_destroy( struct wl_listener *l, void *data )
{
struct wlserver_x11_surface_info *surf = wl_container_of( l, surf, destroy );
wlserver_x11_surface_info_finish( surf );
wlserver_x11_surface_info_init( surf, surf->xwayland_server, surf->x11_id );
}
static void handle_x11_surface_commit( struct wl_listener *l, void *data )
{
struct wlserver_x11_surface_info *surf = wl_container_of( l, surf, commit );
xwayland_surface_commit( surf->wlr );
}
static void wlserver_x11_surface_info_set_wlr( struct wlserver_x11_surface_info *surf, struct wlr_surface *wlr_surf )
{
assert( surf->wlr == nullptr );
@ -1219,12 +1218,6 @@ static void wlserver_x11_surface_info_set_wlr( struct wlserver_x11_surface_info
wl_list_remove( &surf->pending_link );
wl_list_init( &surf->pending_link );
surf->destroy.notify = handle_x11_surface_destroy;
wl_signal_add( &wlr_surf->events.destroy, &surf->destroy );
surf->commit.notify = handle_x11_surface_commit;
wl_signal_add( &wlr_surf->events.commit, &surf->commit );
wlserver_wl_surface_info *wl_surf_info = get_wl_surface_info(wlr_surf);
surf->wlr = wlr_surf;
wl_surf_info->x11_surface = surf;
@ -1257,8 +1250,6 @@ void wlserver_x11_surface_info_init( struct wlserver_x11_surface_info *surf, gam
surf->wlr = nullptr;
surf->xwayland_server = server;
wl_list_init( &surf->pending_link );
wl_list_init( &surf->destroy.link );
wl_list_init( &surf->commit.link );
}
void gamescope_xwayland_server_t::set_wl_id( struct wlserver_x11_surface_info *surf, uint32_t id )
@ -1274,7 +1265,6 @@ void gamescope_xwayland_server_t::set_wl_id( struct wlserver_x11_surface_info *s
surf->xwayland_server = this;
wl_list_insert( &pending_surfaces, &surf->pending_link );
wl_list_init( &surf->destroy.link );
struct wlr_surface *wlr_surf = nullptr;
if ( content_overrides.count( surf->x11_id ) )
@ -1319,8 +1309,6 @@ void wlserver_x11_surface_info_finish( struct wlserver_x11_surface_info *surf )
surf->wl_id = 0;
surf->wlr = nullptr;
wl_list_remove( &surf->pending_link );
wl_list_remove( &surf->destroy.link );
wl_list_remove( &surf->commit.link );
}
void wlserver_set_xwayland_server_mode( size_t idx, int w, int h, int refresh )

3
src/wlserver.hpp
View file

@ -188,8 +188,6 @@ struct wlserver_x11_surface_info
uint32_t wl_id, x11_id;
bool overridden;
struct wl_list pending_link;
struct wl_listener commit;
struct wl_listener destroy;
gamescope_xwayland_server_t *xwayland_server;
};
@ -198,6 +196,7 @@ struct wlserver_wl_surface_info
{
wlserver_x11_surface_info *x11_surface = nullptr;
struct wlr_surface *wlr = nullptr;
struct wl_listener commit;
struct wl_listener destroy;
uint32_t presentation_hint = 0;