From cfd02918c0d5dc539bc8858c7d0fab378145b38c Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 9 Jun 2018 13:26:03 +0100
Subject: Render drag icons

---
 include/sway/input/seat.h  | 20 ++++++++++++++++++++
 include/sway/tree/layout.h |  1 +
 2 files changed, 21 insertions(+)

(limited to 'include')

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/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;
 
-- 
cgit v1.2.3


From 6a910b9ba5443aa31f7cc2468c943c2f9da4854b Mon Sep 17 00:00:00 2001
From: Nate Symer <nate@symer.io>
Date: Sat, 9 Jun 2018 09:34:56 -0400
Subject: Implement gaps (PR #2047)

---
 include/sway/tree/arrange.h   | 6 ++++++
 include/sway/tree/container.h | 7 +++++++
 2 files changed, 13 insertions(+)

(limited to 'include')

diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index ce95cfe9..a14bc5dc 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -3,6 +3,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);
+
 // Determine the root container's geometry, then iterate to everything below
 void arrange_root(void);
 
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7ed6aab1..b3406bbe 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -86,6 +86,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;
-- 
cgit v1.2.3