data-device: wlr-drag-icon

3 files changed, 2 insertions, 89 deletions

diff --git a/rootston/cursor.c b/rootston/cursor.c
index 10bb4dd3..d0b40876 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -355,104 +355,18 @@ void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 	cursor->cursor_client = event->seat_client->client;
 }
 
-static void handle_drag_icon_commit(struct wl_listener *listener, void *data) {
-	struct roots_drag_icon *drag_icon =
-		wl_container_of(listener, drag_icon, surface_commit);
-	drag_icon->sx += drag_icon->surface->current->sx;
-	drag_icon->sy += drag_icon->surface->current->sy;
-}
-
-static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
-	struct roots_drag_icon *drag_icon =
-		wl_container_of(listener, drag_icon, surface_destroy);
-	wl_list_remove(&drag_icon->link);
-	wl_list_remove(&drag_icon->surface_destroy.link);
-	wl_list_remove(&drag_icon->surface_commit.link);
-	free(drag_icon);
-}
-
-static struct roots_drag_icon *seat_add_drag_icon(struct roots_seat *seat,
-		struct wlr_surface *icon_surface) {
-	if (!icon_surface) {
-		return NULL;
-	}
-
-	struct roots_drag_icon *iter_icon;
-	wl_list_for_each(iter_icon, &seat->drag_icons, link) {
-		if (iter_icon->surface == icon_surface) {
-			// already in the list
-			return iter_icon;
-		}
-	}
-
-	struct roots_drag_icon *drag_icon =
-		calloc(1, sizeof(struct roots_drag_icon));
-	drag_icon->mapped = true;
-	drag_icon->surface = icon_surface;
-	wl_list_insert(&seat->drag_icons, &drag_icon->link);
-
-	wl_signal_add(&icon_surface->events.destroy,
-			&drag_icon->surface_destroy);
-	drag_icon->surface_destroy.notify = handle_drag_icon_destroy;
-
-	wl_signal_add(&icon_surface->events.commit,
-			&drag_icon->surface_commit);
-	drag_icon->surface_commit.notify = handle_drag_icon_commit;
-
-	return drag_icon;
-}
-
-static void seat_unmap_drag_icon(struct roots_seat *seat,
-		struct wlr_surface *icon_surface) {
-	if (!icon_surface) {
-		return;
-	}
-
-	struct roots_drag_icon *icon;
-	wl_list_for_each(icon, &seat->drag_icons, link) {
-		if (icon->surface == icon_surface) {
-			icon->mapped = false;
-		}
-	}
-}
-
 void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_grab *grab) {
-	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
-		struct wlr_drag *drag = grab->data;
-		struct roots_drag_icon *icon =
-			seat_add_drag_icon(cursor->seat, drag->icon);
-		if (icon) {
-			icon->is_pointer = true;
-		}
-	}
 }
 
 void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_grab *grab) {
-	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
-		struct wlr_drag *drag = grab->data;
-		seat_unmap_drag_icon(cursor->seat, drag->icon);
-	}
 }
 
 void roots_cursor_handle_touch_grab_begin(struct roots_cursor *cursor,
 		struct wlr_seat_touch_grab *grab) {
-	if (grab->interface == &wlr_data_device_touch_drag_interface) {
-		struct wlr_drag *drag = grab->data;
-		struct roots_drag_icon *icon =
-			seat_add_drag_icon(cursor->seat, drag->icon);
-		if (icon) {
-			icon->is_pointer = false;
-			icon->touch_id = drag->grab_touch_id;
-		}
-	}
 }
 
 void roots_cursor_handle_touch_grab_end(struct roots_cursor *cursor,
 		struct wlr_seat_touch_grab *grab) {
-	if (grab->interface == &wlr_data_device_touch_drag_interface) {
-		struct wlr_drag *drag = grab->data;
-		seat_unmap_drag_icon(cursor->seat, drag->icon);
-	}
 }
diff --git a/rootston/output.c b/rootston/output.c
index 6c8f2519..b551dcf4 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -191,10 +191,10 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 		render_view(view, desktop, wlr_output, &now);
 	}
 
-	struct roots_drag_icon *drag_icon = NULL;
+	struct wlr_drag_icon *drag_icon = NULL;
 	struct roots_seat *seat = NULL;
 	wl_list_for_each(seat, &server->input->seats, link) {
-		wl_list_for_each(drag_icon, &seat->drag_icons, link) {
+		wl_list_for_each(drag_icon, &seat->seat->drag_icons, link) {
 			if (!drag_icon->mapped) {
 				continue;
 			}
diff --git a/rootston/seat.c b/rootston/seat.c
index 1855ca49..96c6fb0d 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -277,7 +277,6 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
 	wl_list_init(&seat->pointers);
 	wl_list_init(&seat->touch);
 	wl_list_init(&seat->tablet_tools);
-	wl_list_init(&seat->drag_icons);
 
 	seat->input = input;