Skip to content

Do proper wayland teardown cleaning up listeners and fds #2066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3v1n0 wants to merge 7 commits into
base: master
Choose a base branch
from
+142 −20
Open

Do proper wayland teardown cleaning up listeners and fds #2066

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91cfce5
wlserver: Remove commit and destroy surface events on destruction
3v1n0 Jan 21, 2026
1f0b558
wlserver: Remove xwayland ready listener on destruction
3v1n0 Jan 21, 2026
b264a71
wlserver: Remove all the signals we connect to in server
3v1n0 Jan 21, 2026
d3f550a
wlserver: Disconnect from all the pointer and touch events
3v1n0 Jan 21, 2026
d94597c
wlserver: Disconnect from device change events on kms close
3v1n0 Jan 21, 2026
678cc1e
wlserver: Destroy the session on shutdown
3v1n0 Jan 21, 2026
863aaca
DRMBackend: Close wayland session KMS on destruction
3v1n0 Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 56 additions & 5 deletions src/wlserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,29 @@ static void wlserver_handle_touch_motion(struct wl_listener *listener, void *dat
wlserver_touchmotion( event->x, event->y, event->touch_id, event->time_msec, false, touch->connector );
}

static void wlserver_handle_pointer_destroy(struct wl_listener *listener, void *data)
{
struct wlserver_pointer *pointer = wl_container_of( listener, pointer, destroy );

wl_list_remove( &pointer->motion.link );
wl_list_remove( &pointer->button.link );
wl_list_remove( &pointer->axis.link );
wl_list_remove( &pointer->frame.link );
wl_list_remove( &pointer->destroy.link );
free( pointer );
}

static void wlserver_handle_touch_destroy(struct wl_listener *listener, void *data)
{
struct wlserver_touch *touch = wl_container_of( listener, touch, destroy );

wl_list_remove( &touch->down.link );
wl_list_remove( &touch->up.link );
wl_list_remove( &touch->motion.link );
wl_list_remove( &touch->destroy.link );
free( touch );
}

static void wlserver_new_input(struct wl_listener *listener, void *data)
{
struct wlr_input_device *device = (struct wlr_input_device *) data;
Expand Down Expand Up @@ -504,7 +527,7 @@ static void wlserver_new_input(struct wl_listener *listener, void *data)
{
struct wlserver_pointer *pointer = (struct wlserver_pointer *) calloc( 1, sizeof( struct wlserver_pointer ) );

pointer->wlr = (struct wlr_pointer *)device;
pointer->wlr = wlr_pointer_from_input_device( device );

pointer->motion.notify = wlserver_handle_pointer_motion;
wl_signal_add( &pointer->wlr->events.motion, &pointer->motion );
Expand All @@ -514,20 +537,24 @@ static void wlserver_new_input(struct wl_listener *listener, void *data)
wl_signal_add( &pointer->wlr->events.axis, &pointer->axis);
pointer->frame.notify = wlserver_handle_pointer_frame;
wl_signal_add( &pointer->wlr->events.frame, &pointer->frame);
pointer->destroy.notify = wlserver_handle_pointer_destroy;
wl_signal_add( &device->events.destroy, &pointer->destroy);
}
break;
case WLR_INPUT_DEVICE_TOUCH:
{
struct wlserver_touch *touch = (struct wlserver_touch *) calloc( 1, sizeof( struct wlserver_touch ) );

touch->wlr = (struct wlr_touch *)device;
touch->wlr = wlr_touch_from_input_device( device );

touch->down.notify = wlserver_handle_touch_down;
wl_signal_add( &touch->wlr->events.down, &touch->down );
touch->up.notify = wlserver_handle_touch_up;
wl_signal_add( &touch->wlr->events.up, &touch->up );
touch->motion.notify = wlserver_handle_touch_motion;
wl_signal_add( &touch->wlr->events.motion, &touch->motion );
touch->destroy.notify = wlserver_handle_touch_destroy;
wl_signal_add( &device->events.destroy, &touch->destroy);

wlserver_touch_associate_connector( touch );
}
Expand Down Expand Up @@ -610,6 +637,9 @@ static void handle_wl_surface_destroy( struct wl_listener *l, void *data )
wl_resource_set_user_data( pSwapchain, nullptr );
}

wl_list_remove( &surf->commit.link );
wl_list_remove( &surf->destroy.link );

delete surf;
}

Expand Down Expand Up @@ -1702,15 +1732,21 @@ int wlsession_open_kms( const char *device_name ) {
}
}

struct wl_listener *listener = new wl_listener();
listener->notify = kms_device_handle_change;
wl_signal_add( &wlserver.wlr.device->events.change, listener );
wlserver.wlr.device_change_listener = new wl_listener();
Copy link
Collaborator

@emersion emersion Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Orthogonal nit: would be slightly nicer to not use new here and just embed the listener in the parent struct. Just something I'm noticing when reading the code, not something that needs fixing in this PR.

wlserver.wlr.device_change_listener->notify = kms_device_handle_change;
wl_signal_add( &wlserver.wlr.device->events.change, wlserver.wlr.device_change_listener );

return wlserver.wlr.device->fd;
}

void wlsession_close_kms()
{
if ( wlserver.wlr.device_change_listener )
{
wl_list_remove( &wlserver.wlr.device_change_listener->link );
delete wlserver.wlr.device_change_listener;
wlserver.wlr.device_change_listener = nullptr;
}
wlr_session_close_file( wlserver.wlr.session, wlserver.wlr.device );
}

Expand Down Expand Up @@ -1773,6 +1809,8 @@ gamescope_xwayland_server_t::~gamescope_xwayland_server_t()
}
content_overrides.clear();

wl_list_remove(&xwayland_ready_listener.link);

wlr_xwayland_server_destroy(xwayland_server);
xwayland_server = nullptr;

Expand Down Expand Up @@ -2240,6 +2278,19 @@ void wlserver_run(void)
// wlroots will restart it automatically.
wlserver_lock();
wlserver.wlr.xwayland_servers.clear();

wl_list_remove( &new_surface_listener.link );
wl_list_remove( &new_input_listener.link );
wl_list_remove( &wlserver.new_pointer_constraint.link );
wl_list_remove( &wlserver.new_xdg_surface.link );
wl_list_remove( &wlserver.new_xdg_toplevel.link );
wl_list_remove( &wlserver.new_layer_shell_surface.link );

#if HAVE_SESSION
if ( wlserver.wlr.session )
wl_list_remove( &wlserver.session_active.link );
#endif

wl_display_destroy_clients(wlserver.display);
wl_display_destroy(wlserver.display);
wlserver.display = NULL;
Expand Down
3 changes: 3 additions & 0 deletions src/wlserver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ struct wlserver_t {
struct wlr_keyboard *virtual_keyboard_device;

struct wlr_device *device;
struct wl_listener *device_change_listener = nullptr;

std::vector<std::unique_ptr<gamescope_xwayland_server_t>> xwayland_servers;
} wlr;
Expand Down Expand Up @@ -210,6 +211,7 @@ struct wlserver_pointer {
struct wl_listener button;
struct wl_listener axis;
struct wl_listener frame;
struct wl_listener destroy;
};

struct wlserver_touch {
Expand All @@ -218,6 +220,7 @@ struct wlserver_touch {
struct wl_listener down;
struct wl_listener up;
struct wl_listener motion;
struct wl_listener destroy;

gamescope::IBackendConnector* connector;
};
Expand Down