diff options
| -rw-r--r-- | include/wlr/types/wlr_data_device.h | 1 | ||||
| -rw-r--r-- | types/data_device/wlr_drag.c | 24 |
2 files changed, 21 insertions, 4 deletions
diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index 33fbf525..4de4d610 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -88,6 +88,7 @@ struct wlr_drag_icon { int32_t sx, sy; struct { + struct wl_signal map; struct wl_signal unmap; struct wl_signal destroy; } events; diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c index b4857956..4b42307e 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -98,6 +98,16 @@ static void drag_set_focus(struct wlr_drag *drag, wlr_signal_emit_safe(&drag->events.focus, drag); } +static void drag_icon_set_mapped(struct wlr_drag_icon *icon, bool mapped) { + if (mapped && !icon->mapped) { + wlr_signal_emit_safe(&icon->events.map, icon); + } else if (!mapped && icon->mapped) { + wlr_signal_emit_safe(&icon->events.unmap, icon); + } + + icon->mapped = mapped; +} + static void drag_end(struct wlr_drag *drag) { if (!drag->cancelling) { drag->cancelling = true; @@ -115,9 +125,8 @@ static void drag_end(struct wlr_drag *drag) { drag_set_focus(drag, NULL, 0, 0); if (drag->icon) { - drag->icon->mapped = false; wl_list_remove(&drag->icon_destroy.link); - wlr_signal_emit_safe(&drag->icon->events.unmap, drag->icon); + drag_icon_set_mapped(drag->icon, false); } wlr_signal_emit_safe(&drag->events.destroy, drag); @@ -310,9 +319,10 @@ static void drag_handle_drag_source_destroy(struct wl_listener *listener, static void drag_icon_destroy(struct wlr_drag_icon *icon) { - if (!icon) { + if (icon == NULL) { return; } + drag_icon_set_mapped(icon, false); wlr_signal_emit_safe(&icon->events.destroy, icon); wlr_surface_set_role_committed(icon->surface, NULL, NULL); wl_list_remove(&icon->surface_destroy.link); @@ -333,6 +343,8 @@ static void drag_icon_handle_surface_commit(struct wlr_surface *surface, struct wlr_drag_icon *icon = role_data; icon->sx += icon->surface->current->sx; icon->sy += icon->surface->current->sy; + + drag_icon_set_mapped(icon, wlr_surface_has_buffer(surface)); } static void drag_icon_handle_seat_client_destroy(struct wl_listener *listener, @@ -355,8 +367,8 @@ static struct wlr_drag_icon *drag_icon_create( icon->client = client; icon->is_pointer = is_pointer; icon->touch_id = touch_id; - icon->mapped = true; + wl_signal_init(&icon->events.map); wl_signal_init(&icon->events.unmap); wl_signal_init(&icon->events.destroy); @@ -372,6 +384,10 @@ static struct wlr_drag_icon *drag_icon_create( wl_list_insert(&client->seat->drag_icons, &icon->link); wlr_signal_emit_safe(&client->seat->events.new_drag_icon, icon); + if (wlr_surface_has_buffer(icon_surface)) { + drag_icon_set_mapped(icon, true); + } + return icon; } |