itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drag-icon: use role object destroy handler

Browse Source
Kirill Primak 2 years ago
parent 75af6a0a39
commit 92fbfda2ca
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
include/wlr/types/wlr_data_device.h
Unescape View File

@ -101,8 +101,6 @@ struct wlr_drag_icon {
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
struct wl_listener surface_destroy;
void *data; void *data;
}; };

35
types/data_device/wlr_drag.c
Unescape View File

@ -116,8 +116,6 @@ static void drag_icon_set_mapped(struct wlr_drag_icon *icon, bool mapped) {
} }
} }
static void drag_icon_destroy(struct wlr_drag_icon *icon);
static void drag_destroy(struct wlr_drag *drag) { static void drag_destroy(struct wlr_drag *drag) {
if (drag->cancelling) { if (drag->cancelling) {
return; return;
@ -156,7 +154,9 @@ static void drag_destroy(struct wlr_drag *drag) {
wl_list_remove(&drag->source_destroy.link); wl_list_remove(&drag->source_destroy.link);
} }
drag_icon_destroy(drag->icon); if (drag->icon != NULL) {
wlr_surface_destroy_role_object(drag->icon->surface);
}
free(drag); free(drag);
} }
@ -357,38 +357,31 @@ static void drag_handle_drag_source_destroy(struct wl_listener *listener,
drag_destroy(drag); drag_destroy(drag);
} }
static void drag_icon_surface_role_commit(struct wlr_surface *surface) {
static void drag_icon_destroy(struct wlr_drag_icon *icon) { assert(surface->role == &drag_icon_surface_role);
struct wlr_drag_icon *icon = surface->role_data;
if (icon == NULL) { if (icon == NULL) {
return; return;
} }
drag_icon_set_mapped(icon, false);
wl_signal_emit_mutable(&icon->events.destroy, icon);
icon->surface->role_data = NULL;
wl_list_remove(&icon->surface_destroy.link);
free(icon);
}
static void drag_icon_handle_surface_destroy(struct wl_listener *listener, drag_icon_set_mapped(icon, wlr_surface_has_buffer(surface));
void *data) {
struct wlr_drag_icon *icon =
wl_container_of(listener, icon, surface_destroy);
drag_icon_destroy(icon);
} }
static void drag_icon_surface_role_commit(struct wlr_surface *surface) { static void drag_icon_surface_role_destroy(struct wlr_surface *surface) {
assert(surface->role == &drag_icon_surface_role); assert(surface->role == &drag_icon_surface_role);
struct wlr_drag_icon *icon = surface->role_data; struct wlr_drag_icon *icon = surface->role_data;
if (icon == NULL) { if (icon == NULL) {
return; return;
} }
drag_icon_set_mapped(icon, false);
drag_icon_set_mapped(icon, wlr_surface_has_buffer(surface)); wl_signal_emit_mutable(&icon->events.destroy, icon);
free(icon);
} }
const struct wlr_surface_role drag_icon_surface_role = { const struct wlr_surface_role drag_icon_surface_role = {
.name = "wl_data_device-icon", .name = "wl_data_device-icon",
.commit = drag_icon_surface_role_commit, .commit = drag_icon_surface_role_commit,
.destroy = drag_icon_surface_role_destroy,
}; };
static struct wlr_drag_icon *drag_icon_create(struct wlr_drag *drag, static struct wlr_drag_icon *drag_icon_create(struct wlr_drag *drag,
@ -405,9 +398,6 @@ static struct wlr_drag_icon *drag_icon_create(struct wlr_drag *drag,
wl_signal_init(&icon->events.unmap); wl_signal_init(&icon->events.unmap);
wl_signal_init(&icon->events.destroy); wl_signal_init(&icon->events.destroy);
wl_signal_add(&icon->surface->events.destroy, &icon->surface_destroy);
icon->surface_destroy.notify = drag_icon_handle_surface_destroy;
icon->surface->role_data = icon; icon->surface->role_data = icon;
if (wlr_surface_has_buffer(surface)) { if (wlr_surface_has_buffer(surface)) {
@ -417,7 +407,6 @@ static struct wlr_drag_icon *drag_icon_create(struct wlr_drag *drag,
return icon; return icon;
} }
struct wlr_drag *wlr_drag_create(struct wlr_seat_client *seat_client, struct wlr_drag *wlr_drag_create(struct wlr_seat_client *seat_client,
struct wlr_data_source *source, struct wlr_surface *icon_surface) { struct wlr_data_source *source, struct wlr_surface *icon_surface) {
struct wlr_drag *drag = calloc(1, sizeof(struct wlr_drag)); struct wlr_drag *drag = calloc(1, sizeof(struct wlr_drag));

Write Preview
Loading…
Cancel
Save