mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop-shell: Keep track of seats 

This properly tracks the seats and with it, destroys them before
destroying weston_desktop object.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2021-08-26 16:37:24 +03:00 committed by Pekka Paalanen
parent 60ab03640a
commit c114fd6ef6
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desktop-shell/shell.c
View File

@ -188,6 +188,8 @@ struct shell_seat {
struct wl_listener caps_changed_listener;
struct wl_listener pointer_focus_listener;
struct wl_listener keyboard_focus_listener;
struct wl_list link; /** shell::seat_list */
};
@ -2251,6 +2253,15 @@ get_focused_output(struct weston_compositor *compositor)
return output;
}
static void
desktop_shell_destroy_seat(struct shell_seat *shseat)
{
wl_list_remove(&shseat->seat_destroy_listener.link);
wl_list_remove(&shseat->link);
free(shseat);
}
static void
destroy_shell_seat(struct wl_listener *listener, void *data)
{
@ -2258,8 +2269,7 @@ destroy_shell_seat(struct wl_listener *listener, void *data)
container_of(listener,
struct shell_seat, seat_destroy_listener);
wl_list_remove(&shseat->seat_destroy_listener.link);
free(shseat);
desktop_shell_destroy_seat(shseat);
}
static void
@ -2293,7 +2303,7 @@ shell_seat_caps_changed(struct wl_listener *listener, void *data)
}
static struct shell_seat *
create_shell_seat(struct weston_seat *seat)
create_shell_seat(struct desktop_shell *shell, struct weston_seat *seat)
{
struct shell_seat *shseat;
@ -2320,6 +2330,8 @@ create_shell_seat(struct weston_seat *seat)
&shseat->caps_changed_listener);
shell_seat_caps_changed(&shseat->caps_changed_listener, NULL);
wl_list_insert(&shell->seat_list, &shseat->link);
return shseat;
}
@ -5028,6 +5040,7 @@ shell_destroy(struct wl_listener *listener, void *data)
container_of(listener, struct desktop_shell, destroy_listener);
struct workspace **ws;
struct shell_output *shell_output, *tmp;
struct shell_seat *shseat, *shseat_next;
/* Force state to unlocked so we don't try to fade */
shell->locked = false;
@ -5053,6 +5066,9 @@ shell_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&shell->output_move_listener.link);
wl_list_remove(&shell->resized_listener.link);
wl_list_for_each_safe(shseat, shseat_next, &shell->seat_list, link)
desktop_shell_destroy_seat(shseat);
weston_desktop_destroy(shell->desktop);
wl_array_for_each(ws, &shell->workspaces.array)
@ -5173,8 +5189,10 @@ static void
handle_seat_created(struct wl_listener *listener, void *data)
{
struct weston_seat *seat = data;
struct desktop_shell *shell =
container_of(listener, struct desktop_shell, seat_create_listener);
create_shell_seat(seat);
create_shell_seat(shell, seat);
}
WL_EXPORT int
@ -5222,6 +5240,7 @@ wet_shell_init(struct weston_compositor *ec,
wl_array_init(&shell->workspaces.array);
wl_list_init(&shell->workspaces.client_list);
wl_list_init(&shell->seat_list);
if (input_panel_setup(shell) < 0)
return -1;
@ -5271,7 +5290,7 @@ wet_shell_init(struct weston_compositor *ec,
wl_event_loop_add_idle(loop, launch_desktop_shell_process, shell);
wl_list_for_each(seat, &ec->seat_list, link)
handle_seat_created(NULL, seat);
create_shell_seat(shell, seat);
shell->seat_create_listener.notify = handle_seat_created;
wl_signal_add(&ec->seat_created_signal, &shell->seat_create_listener);

1
desktop-shell/shell.h
View File

@ -212,6 +212,7 @@ struct desktop_shell {
struct wl_listener output_create_listener;
struct wl_listener output_move_listener;
struct wl_list output_list;
struct wl_list seat_list;
enum weston_desktop_shell_panel_position panel_position;