blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roots_seat_destroy: also destroy seat in public function 

Rework the functions a bit so that the handler does the bulk of the work
except for destroying the seat itself, and the main public function
just explicitely calls the handler and destroys the seat
This commit is contained in:
Dominique Martinet 2017-12-29 20:32:01 +01:00
parent a6fb4b007b
commit a477e5d302
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rootston/seat.c
View File

@ -222,23 +222,23 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
static void seat_view_destroy(struct roots_seat_view *seat_view); static void seat_view_destroy(struct roots_seat_view *seat_view);
void roots_seat_destroy(struct roots_seat *seat) {
struct roots_seat_view *view, *nview;
// TODO: probably more to be freed here
wl_list_for_each_safe(view, nview, &seat->views, link) {
seat_view_destroy(view);
}
// Can be called from seat_destroy handler, so don't destroy seat
}
static void roots_seat_handle_seat_destroy(struct wl_listener *listener, static void roots_seat_handle_seat_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct roots_seat *seat = struct roots_seat *seat =
wl_container_of(listener, seat, seat_destroy); wl_container_of(listener, seat, seat_destroy);
roots_seat_destroy(seat); // TODO: probably more to be freed here
wl_list_remove(&seat->seat_destroy.link);
struct roots_seat_view *view, *nview;
wl_list_for_each_safe(view, nview, &seat->views, link) {
seat_view_destroy(view);
}
}
void roots_seat_destroy(struct roots_seat *seat) {
roots_seat_handle_seat_destroy(&seat->seat_destroy, seat->seat);
wlr_seat_destroy(seat->seat);
} }
struct roots_seat *roots_seat_create(struct roots_input *input, char *name) { struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {