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

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.

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;

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;