Merge branch 'master' into seat-views

3 files changed, 1 insertions, 33 deletions

diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index f0c9be89..e2a371bf 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -53,12 +53,6 @@ struct roots_cursor {
 	struct wl_listener tool_axis;
 	struct wl_listener tool_tip;
 
-	struct wl_listener pointer_grab_begin;
-	struct wl_listener pointer_grab_end;
-
-	struct wl_listener touch_grab_begin;
-	struct wl_listener touch_grab_end;
-
 	struct wl_listener request_set_cursor;
 };
 
@@ -96,16 +90,4 @@ void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
 void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_request_set_cursor_event *event);
 
-void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
-		struct wlr_seat_pointer_grab *grab);
-
-void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
-		struct wlr_seat_pointer_grab *grab);
-
-void roots_cursor_handle_touch_grab_begin(struct roots_cursor *cursor,
-		struct wlr_seat_touch_grab *grab);
-
-void roots_cursor_handle_touch_grab_end(struct roots_cursor *cursor,
-		struct wlr_seat_touch_grab *grab);
-
 #endif
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 12ab5898..c245eb09 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -50,6 +50,7 @@ struct roots_desktop {
 #ifdef HAS_XWAYLAND
 	struct wlr_xwayland *xwayland;
 	struct wl_listener xwayland_surface;
+	struct wl_listener xwayland_ready;
 #endif
 };
 
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index ec0608e7..609d0c74 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -4,25 +4,10 @@
 #include "rootston/input.h"
 #include "rootston/keyboard.h"
 
-struct roots_drag_icon {
-	struct wlr_surface *surface;
-	struct wl_list link; // roots_seat::drag_icons
-	bool mapped;
-
-	bool is_pointer;
-	int32_t touch_id;
-
-	int32_t sx, sy;
-
-	struct wl_listener surface_destroy;
-	struct wl_listener surface_commit;
-};
-
 struct roots_seat {
 	struct roots_input *input;
 	struct wlr_seat *seat;
 	struct roots_cursor *cursor;
-	struct wl_list drag_icons;
 	struct wl_list link;
 
 	// coordinates of the first touch point if it exists