diff options
| author | emersion <contact@emersion.fr> | 2019-01-30 14:07:59 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-01-30 15:24:18 +0100 |
| commit | faa00a4a3362a8d7ea3942be50f95eb693fddb2e (patch) | |
| tree | 6b1db8aaf64e6a0bfd4f94d58585a8ab2e807d94 /rootston/seat.c | |
| parent | d6de329d981f232ad47657d389a76b0da3cd217f (diff) | |
rootston: only allow one drag icon per seat
Diffstat (limited to 'rootston/seat.c')
| -rw-r--r-- | rootston/seat.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index a6281f50..cd95472d 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -594,7 +594,9 @@ static void roots_drag_icon_handle_destroy(struct wl_listener *listener, wl_container_of(listener, icon, destroy); roots_drag_icon_damage_whole(icon); - wl_list_remove(&icon->link); + assert(icon->seat->drag_icon == icon); + icon->seat->drag_icon = NULL; + wl_list_remove(&icon->surface_commit.link); wl_list_remove(&icon->unmap.link); wl_list_remove(&icon->destroy.link); @@ -622,7 +624,8 @@ static void roots_seat_handle_new_drag_icon(struct wl_listener *listener, icon->destroy.notify = roots_drag_icon_handle_destroy; wl_signal_add(&wlr_drag_icon->events.destroy, &icon->destroy); - wl_list_insert(&seat->drag_icons, &icon->link); + assert(seat->drag_icon == NULL); + seat->drag_icon = icon; roots_drag_icon_update_position(icon); } @@ -706,7 +709,6 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) { wl_list_init(&seat->tablet_pads); wl_list_init(&seat->switches); wl_list_init(&seat->views); - wl_list_init(&seat->drag_icons); seat->input = input; |