Merge remote-tracking branch 'upstream/master' into atomic

4 files changed, 39 insertions, 0 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 2e4da438..1f7792ba 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -21,6 +21,19 @@ struct sway_seat_container {
         struct wl_listener destroy;
 };
 
+struct sway_drag_icon {
+        struct sway_seat *seat;
+        struct wlr_drag_icon *wlr_drag_icon;
+        struct wl_list link; // sway_root::drag_icons
+
+        double x, y; // in layout-local coordinates
+
+        struct wl_listener surface_commit;
+        struct wl_listener map;
+        struct wl_listener unmap;
+        struct wl_listener destroy;
+};
+
 struct sway_seat {
         struct wlr_seat *wlr_seat;
         struct sway_cursor *cursor;
@@ -35,8 +48,13 @@ struct sway_seat {
         // If exclusive_client is set, no other clients will receive input events
         struct wl_client *exclusive_client;
 
+        // Last touch point
+        int32_t touch_id;
+        double touch_x, touch_y;
+
         struct wl_listener focus_destroy;
         struct wl_listener new_container;
+        struct wl_listener new_drag_icon;
 
         struct wl_list devices; // sway_seat_device::link
 
@@ -114,4 +132,6 @@ struct seat_config *seat_get_config(struct sway_seat *seat);
 
 bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
+void drag_icon_update_position(struct sway_drag_icon *icon);
+
 #endif
diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index 897a9392..6c8c0dba 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -4,6 +4,12 @@
 
 struct sway_container;
 
+// Remove gaps around container
+void remove_gaps(struct sway_container *c);
+
+// Add gaps around container
+void add_gaps(struct sway_container *c);
+
 /**
  * Arrange layout for all the children of the given container, and add them to
  * the given transaction.
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index a8efd893..f4e978ea 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -60,6 +60,11 @@ struct sway_container_state {
         double swayc_x, swayc_y;
         double swayc_width, swayc_height;
 
+        bool has_gaps;
+        double current_gaps;
+        double gaps_inner;
+        double gaps_outer;
+
         //struct sway_container *parent;
         //list_t *children;
 
@@ -112,6 +117,13 @@ struct sway_container {
         double saved_x, saved_y;
         double saved_width, saved_height;
 
+        // The gaps currently applied to the container.
+        double current_gaps;
+
+        bool has_gaps;
+        double gaps_inner;
+        double gaps_outer;
+
         list_t *children;
 
         struct sway_container *parent;
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index cd131056..ba265623 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -28,6 +28,7 @@ struct sway_root {
         struct wl_listener output_layout_change;
 
         struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
+        struct wl_list drag_icons; // sway_drag_icon::link
 
         struct wlr_texture *debug_tree;