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

add back map event

This commit is contained in:
Tony Crisci 2018-06-05 22:50:29 -04:00
parent 1c75d4e54a
commit 319ebdf476
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/types/wlr_data_device.h
View File

@ -88,6 +88,7 @@ struct wlr_drag_icon {
int32_t sx, sy; int32_t sx, sy;
struct { struct {
struct wl_signal map;
struct wl_signal unmap; struct wl_signal unmap;
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;

24
types/data_device/wlr_drag.c
View File

@ -98,6 +98,16 @@ static void drag_set_focus(struct wlr_drag *drag,
wlr_signal_emit_safe(&drag->events.focus, 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) { static void drag_end(struct wlr_drag *drag) {
if (!drag->cancelling) { if (!drag->cancelling) {
drag->cancelling = true; drag->cancelling = true;
@ -115,9 +125,8 @@ static void drag_end(struct wlr_drag *drag) {
drag_set_focus(drag, NULL, 0, 0); drag_set_focus(drag, NULL, 0, 0);
if (drag->icon) { if (drag->icon) {
drag->icon->mapped = false;
wl_list_remove(&drag->icon_destroy.link); 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); 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) { static void drag_icon_destroy(struct wlr_drag_icon *icon) {
if (!icon) { if (icon == NULL) {
return; return;
} }
drag_icon_set_mapped(icon, false);
wlr_signal_emit_safe(&icon->events.destroy, icon); wlr_signal_emit_safe(&icon->events.destroy, icon);
wlr_surface_set_role_committed(icon->surface, NULL, NULL); wlr_surface_set_role_committed(icon->surface, NULL, NULL);
wl_list_remove(&icon->surface_destroy.link); 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; struct wlr_drag_icon *icon = role_data;
icon->sx += icon->surface->current->sx; icon->sx += icon->surface->current->sx;
icon->sy += icon->surface->current->sy; 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, 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->client = client;
icon->is_pointer = is_pointer; icon->is_pointer = is_pointer;
icon->touch_id = touch_id; 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.unmap);
wl_signal_init(&icon->events.destroy); 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); wl_list_insert(&client->seat->drag_icons, &icon->link);
wlr_signal_emit_safe(&client->seat->events.new_drag_icon, icon); 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; return icon;
} }