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

Allow calling xwm_set_seat with a NULL seat

This commit is contained in:
emersion 2017-12-27 11:49:25 +01:00
parent 998267e291
commit b3072f81fe
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xwayland/selection.c
View File

@ -854,19 +854,23 @@ static void seat_handle_primary_selection(struct wl_listener *listener,
} }
void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat) { void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat) {
assert(xwm); if (xwm->seat != NULL) {
assert(seat);
if (xwm->seat) {
wl_list_remove(&xwm->seat_selection.link); wl_list_remove(&xwm->seat_selection.link);
wl_list_remove(&xwm->seat_primary_selection.link); wl_list_remove(&xwm->seat_primary_selection.link);
xwm->seat = NULL; xwm->seat = NULL;
} }
if (seat == NULL) {
return;
}
xwm->seat = seat; xwm->seat = seat;
wl_signal_add(&seat->events.selection, &xwm->seat_selection); wl_signal_add(&seat->events.selection, &xwm->seat_selection);
xwm->seat_selection.notify = seat_handle_selection; xwm->seat_selection.notify = seat_handle_selection;
wl_signal_add(&seat->events.primary_selection, &xwm->seat_primary_selection); wl_signal_add(&seat->events.primary_selection, &xwm->seat_primary_selection);
xwm->seat_primary_selection.notify = seat_handle_primary_selection; xwm->seat_primary_selection.notify = seat_handle_primary_selection;
seat_handle_selection(&xwm->seat_selection, seat); seat_handle_selection(&xwm->seat_selection, seat);
seat_handle_primary_selection(&xwm->seat_primary_selection, seat); seat_handle_primary_selection(&xwm->seat_primary_selection, seat);
} }