From e4bfb3bc98b28cb083b4138a76d88384a33d6e57 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 27 Jun 2018 18:16:49 +0900
Subject: Add idle inhibit unstable v1 support

---
 include/sway/desktop/idle_inhibit_v1.h | 13 +++++++++++++
 include/sway/server.h                  |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 include/sway/desktop/idle_inhibit_v1.h

(limited to 'include/sway')

diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
new file mode 100644
index 00000000..94c25a42
--- /dev/null
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -0,0 +1,13 @@
+
+#ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
+#define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
+#include <wlr/types/wlr_idle_inhibit_v1.h>
+#include "sway/server.h"
+
+struct sway_idle_inhibitor_v1 {
+	struct sway_server *server;
+
+	struct wl_listener destroy;
+};
+
+#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 1e1aa3cc..246a9381 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -24,11 +24,15 @@ struct sway_server {
 	struct wlr_compositor *compositor;
 	struct wlr_data_device_manager *data_device_manager;
 	struct wlr_idle *idle;
+	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
 
 	struct sway_input_manager *input;
 
 	struct wl_listener new_output;
 
+	struct wlr_idle_inhibit_manager_v1 *idle_inhibit_v1;
+	struct wl_listener new_idle_inhibitor_v1;
+
 	struct wlr_layer_shell *layer_shell;
 	struct wl_listener layer_shell_surface;
 
@@ -61,6 +65,7 @@ void server_run(struct sway_server *server);
 
 void handle_new_output(struct wl_listener *listener, void *data);
 
+void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
-- 
cgit v1.2.3


From 072b334abc6f065080bf944767bbd53d7a590e47 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 30 Jun 2018 14:09:32 +0900
Subject: idle_inhibit: stop inhibitor when views become invisible

---
 include/sway/desktop/idle_inhibit_v1.h | 4 ++++
 include/sway/server.h                  | 1 +
 2 files changed, 5 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 94c25a42..1764713c 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -6,8 +6,12 @@
 
 struct sway_idle_inhibitor_v1 {
 	struct sway_server *server;
+	struct sway_view *view;
 
+	struct wl_list link;
 	struct wl_listener destroy;
 };
 
+void idle_inhibit_v1_check_active(struct sway_server *server);
+
 #endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 246a9381..693e6b82 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -32,6 +32,7 @@ struct sway_server {
 
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit_v1;
 	struct wl_listener new_idle_inhibitor_v1;
+	struct wl_list idle_inhibitors_v1;
 
 	struct wlr_layer_shell *layer_shell;
 	struct wl_listener layer_shell_surface;
-- 
cgit v1.2.3


From 71224781c48f98f43f5836de663ef6e01604419c Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 2 Jul 2018 09:26:57 +0900
Subject: idle_inhibit: move server data to its own struct

---
 include/sway/desktop/idle_inhibit_v1.h | 17 ++++++++++++++---
 include/sway/server.h                  |  7 ++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 1764713c..e5ed8a3d 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -1,17 +1,28 @@
-
 #ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
 #define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
 #include <wlr/types/wlr_idle_inhibit_v1.h>
+#include <wlr/types/wlr_idle.h>
 #include "sway/server.h"
 
+struct sway_idle_inhibit_manager_v1 {
+	struct wlr_idle_inhibit_manager_v1 *wlr_manager;
+	struct wl_listener new_idle_inhibitor_v1;
+	struct wl_list inhibitors;
+
+	struct wlr_idle *idle;
+};
+
 struct sway_idle_inhibitor_v1 {
-	struct sway_server *server;
+	struct sway_idle_inhibit_manager_v1 *manager;
 	struct sway_view *view;
 
 	struct wl_list link;
 	struct wl_listener destroy;
 };
 
-void idle_inhibit_v1_check_active(struct sway_server *server);
+void idle_inhibit_v1_check_active(
+	struct sway_idle_inhibit_manager_v1 *manager);
 
+struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
+	struct wl_display *wl_display, struct wlr_idle *idle);
 #endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 693e6b82..a3e32898 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -23,16 +23,13 @@ struct sway_server {
 
 	struct wlr_compositor *compositor;
 	struct wlr_data_device_manager *data_device_manager;
-	struct wlr_idle *idle;
-	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
 
 	struct sway_input_manager *input;
 
 	struct wl_listener new_output;
 
-	struct wlr_idle_inhibit_manager_v1 *idle_inhibit_v1;
-	struct wl_listener new_idle_inhibitor_v1;
-	struct wl_list idle_inhibitors_v1;
+	struct wlr_idle *idle;
+	struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;
 
 	struct wlr_layer_shell *layer_shell;
 	struct wl_listener layer_shell_surface;
-- 
cgit v1.2.3


From b0918b1058a704675fc2590ee9ff3bef6324f734 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 4 Jul 2018 14:45:35 +0900
Subject: ipc-server: add display destroy listener and remove ipc_terminate

wl_event_source_remove() is illegal after display has been destroyed,
so just destroy everything when we still can.

==20392==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000001240 at pc 0x00000048e86e bp 0x7ffe4b557e00 sp 0x7ffe4b557df0
READ of size 8 at 0x607000001240 thread T0
    #0 0x48e86d in wl_list_insert ../common/list.c:149
    #1 0x7fdf673d4d7d in wl_event_source_remove src/event-loop.c:487
    #2 0x41b742 in ipc_terminate ../sway/ipc-server.c:94
    #3 0x40b1ad in main ../sway/main.c:440
    #4 0x7fdf6664c18a in __libc_start_main ../csu/libc-start.c:308
    #5 0x409359 in _start (/opt/wayland/bin/sway+0x409359)

0x607000001240 is located 48 bytes inside of 72-byte region [0x607000001210,0x607000001258)
freed by thread T0 here:
    #0 0x7fdf692c4880 in __interceptor_free (/lib64/libasan.so.5+0xee880)
    #1 0x7fdf673d371a in wl_display_destroy src/wayland-server.c:1097

previously allocated by thread T0 here:
    #0 0x7fdf692c4c48 in malloc (/lib64/libasan.so.5+0xeec48)
    #1 0x7fdf673d4d9e in wl_event_loop_create src/event-loop.c:522
    #2 0x40acb2 in main ../sway/main.c:363
    #3 0x7fdf6664c18a in __libc_start_main ../csu/libc-start.c:308
---
 include/sway/ipc-server.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index dd16a175..026b5554 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -9,8 +9,6 @@ struct sway_server;
 
 void ipc_init(struct sway_server *server);
 
-void ipc_terminate(void);
-
 struct sockaddr_un *ipc_user_sockaddr(void);
 
 void ipc_event_workspace(struct sway_container *old,
-- 
cgit v1.2.3


From fe72e3b349f0905519481b77b22c525aca9c704d Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Thu, 5 Jul 2018 07:07:59 +0900
Subject: cmd_results_to_json: return copied string and properly free the json

The only user of this function would copy the string right away
to get rid of the const flag anyway, and freeing a const string
afterwards might work but is not meant to be done according to the
json-c API.
---
 include/sway/commands.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 7ca0bda8..6d17144a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -79,7 +79,7 @@ void free_cmd_results(struct cmd_results *results);
  *
  * Free the JSON string later on.
  */
-const char *cmd_results_to_json(struct cmd_results *results);
+char *cmd_results_to_json(struct cmd_results *results);
 
 struct cmd_results *add_color(const char *name,
 		char *buffer, const char *color);
-- 
cgit v1.2.3


From 78c08fb0a281cbe74c56f0a2ea4b9370b9372661 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Thu, 5 Jul 2018 18:12:14 -0400
Subject: Implement mode --pango_markup

---
 include/sway/config.h     | 1 +
 include/sway/ipc-server.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/config.h b/include/sway/config.h
index e75b0664..ac668c24 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -50,6 +50,7 @@ struct sway_mode {
 	char *name;
 	list_t *keysym_bindings;
 	list_t *keycode_bindings;
+	bool pango;
 };
 
 struct input_config_mapped_from_region {
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index 026b5554..6469f097 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -15,6 +15,6 @@ void ipc_event_workspace(struct sway_container *old,
 		struct sway_container *new, const char *change);
 void ipc_event_window(struct sway_container *window, const char *change);
 void ipc_event_barconfig_update(struct bar_config *bar);
-void ipc_event_mode(const char *mode);
+void ipc_event_mode(const char *mode, bool pango);
 
 #endif
-- 
cgit v1.2.3


From 839c3a550043fd38096a15ff8dcd7de1a084efdc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 3 Jul 2018 17:29:23 +1000
Subject: Use opaque region to determine if frame done should be sent

---
 include/sway/output.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/output.h b/include/sway/output.h
index 19fc5e99..e6fe55c6 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -54,4 +54,8 @@ void output_damage_whole_container(struct sway_output *output,
 struct sway_container *output_by_name(const char *name);
 
 void output_enable(struct sway_output *output);
+
+bool output_has_opaque_lockscreen(struct sway_output *output,
+		struct sway_seat *seat);
+
 #endif
-- 
cgit v1.2.3


From f9625d1d56482a2c8fce4a2d4743d36607fc639d Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 7 Jul 2018 10:30:52 +0100
Subject: Split renderer

---
 include/sway/output.h | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/output.h b/include/sway/output.h
index e6fe55c6..b6cda83c 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -38,6 +38,16 @@ struct sway_output {
 	} events;
 };
 
+/**
+ * Contains a surface's root geometry information. For instance, when rendering
+ * a popup, this will contain the parent view's position and size.
+ */
+struct root_geometry {
+	double x, y;
+	int width, height;
+	float rotation;
+};
+
 void output_damage_whole(struct sway_output *output);
 
 void output_damage_surface(struct sway_output *output, double ox, double oy,
@@ -56,6 +66,35 @@ struct sway_container *output_by_name(const char *name);
 void output_enable(struct sway_output *output);
 
 bool output_has_opaque_lockscreen(struct sway_output *output,
-		struct sway_seat *seat);
+	struct sway_seat *seat);
+
+struct sway_container *output_get_active_workspace(struct sway_output *output);
+
+void output_render(struct sway_output *output, struct timespec *when,
+	pixman_region32_t *damage);
+
+bool output_get_surface_box(struct root_geometry *geo,
+	struct sway_output *output, struct wlr_surface *surface, int sx, int sy,
+	struct wlr_box *surface_box);
+
+void output_surface_for_each_surface(struct wlr_surface *surface,
+	double ox, double oy, struct root_geometry *geo,
+	wlr_surface_iterator_func_t iterator, void *user_data);
+
+void output_view_for_each_surface(struct sway_view *view,
+	struct sway_output *output, struct root_geometry *geo,
+	wlr_surface_iterator_func_t iterator, void *user_data);
+
+void output_layer_for_each_surface(struct wl_list *layer_surfaces,
+	struct root_geometry *geo, wlr_surface_iterator_func_t iterator,
+	void *user_data);
+
+void output_unmanaged_for_each_surface(struct wl_list *unmanaged,
+	struct sway_output *output, struct root_geometry *geo,
+	wlr_surface_iterator_func_t iterator, void *user_data);
+
+void output_drag_icons_for_each_surface(struct wl_list *drag_icons,
+	struct sway_output *output, struct root_geometry *geo,
+	wlr_surface_iterator_func_t iterator, void *user_data);
 
 #endif
-- 
cgit v1.2.3


From ab8a86369c01c7146991ff4ae2ef04b0a1db06ca Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 7 Jul 2018 18:36:20 +1000
Subject: Implement some floating move commands

This implements the following for floating containers:

* move <direction> <amount>
* move [absolute] position <x> <y>
* move [absolute] position mouse
---
 include/sway/desktop.h        | 4 ++++
 include/sway/output.h         | 2 ++
 include/sway/tree/container.h | 6 ++++++
 3 files changed, 12 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index f1ad759a..348fb187 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,4 +1,8 @@
 #include <wlr/types/wlr_surface.h>
 
+struct sway_container;
+
 void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
 	bool whole);
+
+void desktop_damage_whole_container(struct sway_container *con);
diff --git a/include/sway/output.h b/include/sway/output.h
index b6cda83c..bd25e76e 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -97,4 +97,6 @@ void output_drag_icons_for_each_surface(struct wl_list *drag_icons,
 	struct sway_output *output, struct root_geometry *geo,
 	wlr_surface_iterator_func_t iterator, void *user_data);
 
+struct sway_container *output_get_active_workspace(struct sway_output *output);
+
 #endif
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 728daa84..a69da9db 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -297,4 +297,10 @@ bool container_is_floating(struct sway_container *container);
  */
 void container_get_box(struct sway_container *container, struct wlr_box *box);
 
+/**
+ * Move a floating container to a new layout-local position.
+ */
+void container_floating_move_to(struct sway_container *con,
+		double lx, double ly);
+
 #endif
-- 
cgit v1.2.3


From b0fc7e98501fc885197de90af6579dc121e7ef46 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 9 Jul 2018 23:41:00 +1000
Subject: Remove duplicate function declaration and add assertion

---
 include/sway/output.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/output.h b/include/sway/output.h
index bd25e76e..b6cda83c 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -97,6 +97,4 @@ void output_drag_icons_for_each_surface(struct wl_list *drag_icons,
 	struct sway_output *output, struct root_geometry *geo,
 	wlr_surface_iterator_func_t iterator, void *user_data);
 
-struct sway_container *output_get_active_workspace(struct sway_output *output);
-
 #endif
-- 
cgit v1.2.3


From 23c1c26c3fedf5470dbee9fe97c2374a48588863 Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Sun, 8 Jul 2018 20:34:47 +0100
Subject: Add get_config message type to ipc

---
 include/sway/config.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/config.h b/include/sway/config.h
index ac668c24..d5e4116f 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -341,6 +341,7 @@ struct sway_config {
 	int gaps_outer;
 
 	list_t *config_chain;
+	const char *current_config_path;
 	const char *current_config;
 
 	enum sway_container_border border;
@@ -496,7 +497,4 @@ void config_update_font_height(bool recalculate);
 /* Global config singleton. */
 extern struct sway_config *config;
 
-/* Config file currently being read */
-extern const char *current_config_path;
-
 #endif
-- 
cgit v1.2.3


From ba3511b2431d331b735770e38e6bbd83cb5a9d66 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 9 Jul 2018 22:39:47 +0100
Subject: Remove `clipboard` command and `get_clipboard` message

---
 include/sway/commands.h | 1 -
 include/sway/config.h   | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 6d17144a..dda0606a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -95,7 +95,6 @@ sway_cmd cmd_client_unfocused;
 sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
 sway_cmd cmd_client_background;
-sway_cmd cmd_clipboard;
 sway_cmd cmd_commands;
 sway_cmd cmd_debuglog;
 sway_cmd cmd_default_border;
diff --git a/include/sway/config.h b/include/sway/config.h
index d5e4116f..99575274 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -271,11 +271,10 @@ enum ipc_feature {
 	IPC_FEATURE_EVENT_WINDOW = 2048,
 	IPC_FEATURE_EVENT_BINDING = 4096,
 	IPC_FEATURE_EVENT_INPUT = 8192,
-	IPC_FEATURE_GET_CLIPBOARD = 16384,
-	IPC_FEATURE_GET_SEATS = 32768,
+	IPC_FEATURE_GET_SEATS = 16384,
 
 	IPC_FEATURE_ALL_COMMANDS =
-		1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384 | 32768,
+		1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384,
 	IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192,
 
 	IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS,
-- 
cgit v1.2.3


From 41b80c28dfafb9bc13b68e4d5d2811d311b59863 Mon Sep 17 00:00:00 2001
From: Robert Kubosz <kubosz.robert@gmail.com>
Date: Wed, 11 Jul 2018 22:03:06 +0200
Subject: add scroll button option

This commit introduces a scroll_button option, which is intended to be
used with scroll_method. Now user can edit his sway config and add an
scroll_button option to device section.
---
 include/sway/commands.h | 1 +
 include/sway/config.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index dda0606a..32d6cefd 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -207,6 +207,7 @@ sway_cmd input_cmd_natural_scroll;
 sway_cmd input_cmd_pointer_accel;
 sway_cmd input_cmd_repeat_delay;
 sway_cmd input_cmd_repeat_rate;
+sway_cmd input_cmd_scroll_button;
 sway_cmd input_cmd_scroll_method;
 sway_cmd input_cmd_tap;
 sway_cmd input_cmd_xkb_layout;
diff --git a/include/sway/config.h b/include/sway/config.h
index 99575274..75acd4f2 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -75,6 +75,7 @@ struct input_config {
 	float pointer_accel;
 	int repeat_delay;
 	int repeat_rate;
+	int scroll_button;
 	int scroll_method;
 	int send_events;
 	int tap;
-- 
cgit v1.2.3


From 9b16227ec3cfc648f177f186d29b9f0002b7bbde Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 12 Jul 2018 20:01:33 +0100
Subject: Don't disable borders for xwayland floating views

---
 include/sway/tree/view.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7dc8ac46..21d6403e 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -35,6 +35,7 @@ struct sway_view_impl {
 	void (*set_tiled)(struct sway_view *view, bool tiled);
 	void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
 	bool (*wants_floating)(struct sway_view *view);
+	bool (*has_client_side_decorations)(struct sway_view *view);
 	void (*for_each_surface)(struct sway_view *view,
 		wlr_surface_iterator_func_t iterator, void *user_data);
 	void (*close)(struct sway_view *view);
-- 
cgit v1.2.3


From 13c6627ddb7dbe235426e123ee6ff8e6794bda6d Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Sat, 14 Jul 2018 01:01:47 -0400
Subject: Implement tap_button_map for input devices

---
 include/sway/commands.h | 1 +
 include/sway/config.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 32d6cefd..3ebd0002 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -210,6 +210,7 @@ sway_cmd input_cmd_repeat_rate;
 sway_cmd input_cmd_scroll_button;
 sway_cmd input_cmd_scroll_method;
 sway_cmd input_cmd_tap;
+sway_cmd input_cmd_tap_button_map;
 sway_cmd input_cmd_xkb_layout;
 sway_cmd input_cmd_xkb_model;
 sway_cmd input_cmd_xkb_options;
diff --git a/include/sway/config.h b/include/sway/config.h
index 75acd4f2..f660a269 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -79,6 +79,7 @@ struct input_config {
 	int scroll_method;
 	int send_events;
 	int tap;
+	int tap_button_map;
 
 	char *xkb_layout;
 	char *xkb_model;
-- 
cgit v1.2.3


From 2032f85d94f2f222282b242116b3e827dd458f6c Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 14 Jul 2018 23:14:55 +1000
Subject: Simplify transactions by utilising a dirty flag on containers

This PR changes the way we handle transactions to a more simple method.
The new method is to mark containers as dirty from low level code
(eg. arranging, or container_destroy, and eventually seat_set_focus),
then call transaction_commit_dirty which picks up those containers and
runs them through a transaction. The old methods of using transactions
(arrange_and_commit, or creating one manually) are now no longer
possible.

The highest-level code (execute_command and view implementation
handlers) will call transaction_commit_dirty, so most other code just
needs to set containers as dirty. This is done by arranging, but can
also be done by calling container_set_dirty.
---
 include/sway/desktop/transaction.h | 33 ++++++++++++---------------------
 include/sway/server.h              |  5 +----
 include/sway/tree/arrange.h        | 22 ++--------------------
 include/sway/tree/container.h      | 10 ++++++++++
 4 files changed, 25 insertions(+), 45 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 7ab80eb8..cee4afed 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -6,34 +6,25 @@
 /**
  * Transactions enable us to perform atomic layout updates.
  *
- * When we want to make adjustments to the layout, we create a transaction.
- * A transaction contains a list of affected containers and their new state.
+ * A transaction contains a list of containers and their new state.
  * A state might contain a new size, or new border settings, or new parent/child
  * relationships.
  *
- * Calling transaction_commit() makes sway notify of all the affected clients
- * with their new sizes. We then wait for all the views to respond with their
- * new surface sizes. When all are ready, or when a timeout has passed, we apply
- * the updates all at the same time.
- */
-
-struct sway_transaction;
-
-/**
- * Create a new transaction.
- */
-struct sway_transaction *transaction_create(void);
-
-/**
- * Add a container's pending state to the transaction.
+ * Committing a transaction makes sway notify of all the affected clients with
+ * their new sizes. We then wait for all the views to respond with their new
+ * surface sizes. When all are ready, or when a timeout has passed, we apply the
+ * updates all at the same time.
+ *
+ * When we want to make adjustments to the layout, we change the pending state
+ * in containers, mark them as dirty and call transaction_commit_dirty(). This
+ * create and commits a transaction from the dirty containers.
  */
-void transaction_add_container(struct sway_transaction *transaction,
-		struct sway_container *container);
 
 /**
- * Submit a transaction to the client views for configuration.
+ * Find all dirty containers, create and commit a transaction containing them,
+ * and unmark them as dirty.
  */
-void transaction_commit(struct sway_transaction *transaction);
+void transaction_commit_dirty(void);
 
 /**
  * Notify the transaction system that a view is ready for the new layout.
diff --git a/include/sway/server.h b/include/sway/server.h
index a3e32898..a017d1c4 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -47,10 +47,7 @@ struct sway_server {
 	bool debug_txn_timings;
 
 	list_t *transactions;
-
-	// When a view is being destroyed and is waiting for a transaction to
-	// complete it will be stored here.
-	list_t *destroying_containers;
+	list_t *dirty_containers;
 };
 
 struct sway_server server;
diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index 58235642..d6abcc81 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -11,26 +11,8 @@ void remove_gaps(struct sway_container *c);
 void add_gaps(struct sway_container *c);
 
 /**
- * Arrange layout for all the children of the given container, and add them to
- * the given transaction.
- *
- * Use this function if you need to arrange multiple sections of the tree in one
- * transaction.
- *
- * You must set the desired state of the container before calling
- * arrange_windows, then don't change any state-tracked properties in the
- * container until you've called transaction_commit.
+ * Arrange layout for all the children of the given container.
  */
-void arrange_windows(struct sway_container *container,
-		struct sway_transaction *transaction);
-
-/**
- * Arrange layout for the given container and commit the transaction.
- *
- * This function is a wrapper around arrange_windows, and handles creating and
- * committing the transaction for you. Use this function if you're only doing
- * one arrange operation.
- */
-void arrange_and_commit(struct sway_container *container);
+void arrange_windows(struct sway_container *container);
 
 #endif
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index a69da9db..11780916 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -144,6 +144,10 @@ struct sway_container {
 
 	bool destroying;
 
+	// If true, indicates that the container has pending state that differs from
+	// the current.
+	bool dirty;
+
 	struct {
 		struct wl_signal destroy;
 		// Raised after the tree updates, but before arrange_windows
@@ -303,4 +307,10 @@ void container_get_box(struct sway_container *container, struct wlr_box *box);
 void container_floating_move_to(struct sway_container *con,
 		double lx, double ly);
 
+/**
+ * Mark a container as dirty if it isn't already. Dirty containers will be
+ * included in the next transaction then unmarked as dirty.
+ */
+void container_set_dirty(struct sway_container *container);
+
 #endif
-- 
cgit v1.2.3


From b1afcc69fa70c20d815940fc25189063ed59ae0f Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 14 Jul 2018 11:24:22 -0400
Subject: Add extended debugging flags

We currently have several ways of setting debug flags, including command
line arguments, environment variables, and compile-time macros. This
replaces the lot with command line flags.
---
 include/sway/debug.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/debug.h b/include/sway/debug.h
index 2430d319..38d4eccd 100644
--- a/include/sway/debug.h
+++ b/include/sway/debug.h
@@ -1,7 +1,15 @@
 #ifndef SWAY_DEBUG_H
 #define SWAY_DEBUG_H
 
+// Tree
 extern bool enable_debug_tree;
 void update_debug_tree();
 
+// Damage
+extern const char *damage_debug;
+
+// Transactions
+extern int txn_timeout_ms;
+extern bool txn_debug;
+
 #endif
-- 
cgit v1.2.3


From a120d4c79f9406a2f7cc38c60069d3183c98ea87 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 15 Jul 2018 15:20:21 +1000
Subject: Make focus part of transactions

Rather than maintain copies of the entire focus stack, this PR
transactionises the focus by introducing two new properties to the
container state and using those when rendering.

* `bool focused` means this container has actual focus. Only one
container should have this equalling true in its current state.
* `struct sway_container *focus_inactive_child` points to the immediate
child that was most recently focused (eg. for tabbed and stacked
containers).
---
 include/sway/input/seat.h     | 11 -----------
 include/sway/tree/container.h |  3 +++
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 0e440701..1f7792ba 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -118,17 +118,6 @@ struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
 struct sway_container *seat_get_active_child(struct sway_seat *seat,
 		struct sway_container *container);
 
-/**
- * Return the immediate child of container which was most recently focused, with
- * fallback to selecting the child in the parent's `current` (rendered) children
- * list.
- *
- * This is useful for when a tabbed container and its children are destroyed but
- * still being rendered, and we have to render an appropriate child.
- */
-struct sway_container *seat_get_active_current_child(struct sway_seat *seat,
-		struct sway_container *container);
-
 /**
  * Iterate over the focus-inactive children of the container calling the
  * function on each.
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 11780916..04e50fc6 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -68,6 +68,9 @@ struct sway_container_state {
 	struct sway_container *parent;
 	list_t *children;
 
+	struct sway_container *focused_inactive_child;
+	bool focused;
+
 	// View properties
 	double view_x, view_y;
 	double view_width, view_height;
-- 
cgit v1.2.3


From 315d5311b2004b9e148e7b52a7de161b6dfe3878 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 15 Jul 2018 22:43:33 +1000
Subject: Implement urgency base functionality

Introduces a command to manually set urgency, as well as rendering of
urgent views, sending the IPC event, removing urgency after focused for
one second, and matching urgent views via criteria.
---
 include/sway/commands.h       | 1 +
 include/sway/tree/view.h      | 8 ++++++++
 include/sway/tree/workspace.h | 3 +++
 3 files changed, 12 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 3ebd0002..1e93e2a3 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -152,6 +152,7 @@ sway_cmd cmd_swaybg_command;
 sway_cmd cmd_swap;
 sway_cmd cmd_title_format;
 sway_cmd cmd_unmark;
+sway_cmd cmd_urgent;
 sway_cmd cmd_workspace;
 sway_cmd cmd_ws_auto_back_and_forth;
 sway_cmd cmd_workspace_layout;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 21d6403e..9022f7a6 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -70,6 +70,10 @@ struct sway_view {
 	bool border_left;
 	bool border_right;
 
+	struct timespec urgent;
+	bool allow_request_urgent;
+	struct wl_event_source *urgent_timer;
+
 	bool destroying;
 
 	list_t *executed_criteria; // struct criteria *
@@ -305,4 +309,8 @@ void view_update_marks_textures(struct sway_view *view);
  */
 bool view_is_visible(struct sway_view *view);
 
+void view_set_urgent(struct sway_view *view, bool enable);
+
+bool view_is_urgent(struct sway_view *view);
+
 #endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index c72a4ac0..8c2f4cd5 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -42,4 +42,7 @@ void workspace_output_add_priority(struct sway_container *workspace,
 
 struct sway_container *workspace_output_get_highest_available(
 		struct sway_container *ws, struct sway_container *exclude);
+
+bool workspace_is_urgent(struct sway_container *workspace);
+
 #endif
-- 
cgit v1.2.3


From 5f0a4bb6a46cf359dd270e3c448ca1e112331f9d Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Jul 2018 13:15:35 +1000
Subject: Update workspace urgent state when views close or move workspaces

---
 include/sway/tree/workspace.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index 8c2f4cd5..bc95317a 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -10,6 +10,7 @@ struct sway_workspace {
 	struct sway_view *fullscreen;
 	struct sway_container *floating;
 	list_t *output_priority;
+	bool urgent;
 };
 
 extern char *prev_workspace_name;
@@ -43,6 +44,6 @@ void workspace_output_add_priority(struct sway_container *workspace,
 struct sway_container *workspace_output_get_highest_available(
 		struct sway_container *ws, struct sway_container *exclude);
 
-bool workspace_is_urgent(struct sway_container *workspace);
+void workspace_detect_urgent(struct sway_container *workspace);
 
 #endif
-- 
cgit v1.2.3


From be28c18ad5a3271aad537a5356662d57f16d9703 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Jul 2018 14:30:31 +1000
Subject: Mark containers as urgent in IPC if they have urgent views

---
 include/sway/tree/container.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 04e50fc6..ca7a3288 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -316,4 +316,6 @@ void container_floating_move_to(struct sway_container *con,
  */
 void container_set_dirty(struct sway_container *container);
 
+bool container_has_urgent_child(struct sway_container *container);
+
 #endif
-- 
cgit v1.2.3


From fc2484095a71206fe82f5042c0d127458a8da3bc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Jul 2018 22:18:12 +1000
Subject: Implement no_focus command

---
 include/sway/criteria.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index bd3ca0ac..6a8337c5 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -6,9 +6,10 @@
 #include "tree/view.h"
 
 enum criteria_type {
-	CT_COMMAND = 1 << 0,
-	CT_ASSIGN_OUTPUT = 1 << 1,
+	CT_COMMAND          = 1 << 0,
+	CT_ASSIGN_OUTPUT    = 1 << 1,
 	CT_ASSIGN_WORKSPACE = 1 << 2,
+	CT_NO_FOCUS         = 1 << 3,
 };
 
 struct criteria {
-- 
cgit v1.2.3


From 75c699db62e63e2a3c2aa652c9ba9482a8f13ec3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 17 Jul 2018 10:14:33 +1000
Subject: Implement default_floating_border command and adjust CSD behaviour

---
 include/sway/tree/view.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 9022f7a6..e270f851 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -69,6 +69,7 @@ struct sway_view {
 	bool border_bottom;
 	bool border_left;
 	bool border_right;
+	bool using_csd;
 
 	struct timespec urgent;
 	bool allow_request_urgent;
-- 
cgit v1.2.3


From 747725b8bb35bf3fd38d442f5bb565e7a4b11ec4 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Wed, 18 Jul 2018 20:00:48 +0100
Subject: Don't unfocus when an override redirect window is mapped

---
 include/sway/input/seat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 1f7792ba..eac1626b 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -83,7 +83,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		struct sway_container *container, bool warp);
 
 void seat_set_focus_surface(struct sway_seat *seat,
-		struct wlr_surface *surface);
+		struct wlr_surface *surface, bool unfocus);
 
 void seat_set_focus_layer(struct sway_seat *seat,
 		struct wlr_layer_surface *layer);
-- 
cgit v1.2.3


From ec652866060a178796d6dbb32bf7f0e2101e56c9 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Thu, 19 Jul 2018 01:39:58 -0400
Subject: Fix deferred command handling

---
 include/sway/server.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/sway')

diff --git a/include/sway/server.h b/include/sway/server.h
index a017d1c4..70bde6d4 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -56,6 +56,7 @@ struct sway_server server;
 bool server_privileged_prepare(struct sway_server *server);
 bool server_init(struct sway_server *server);
 void server_fini(struct sway_server *server);
+bool server_start_backend(struct sway_server *server);
 void server_run(struct sway_server *server);
 
 void handle_new_output(struct wl_listener *listener, void *data);
-- 
cgit v1.2.3


From 63d6233fcb601abd40f6c611aa4193766aaf9044 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 21:08:51 +1000
Subject: Allow xwayland views to become urgent when on a non-visible workspace

This removes the urgency stuff from the commit handler and puts it in a
new set_hints handler instead. This allows the xwayland surface to
become urgent without having to commit (which doesn't happen if it's on
an non-visible workspace).
---
 include/sway/tree/view.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e270f851..068d92c6 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -140,6 +140,7 @@ struct sway_xwayland_view {
 	struct wl_listener set_title;
 	struct wl_listener set_class;
 	struct wl_listener set_window_type;
+	struct wl_listener set_hints;
 	struct wl_listener map;
 	struct wl_listener unmap;
 	struct wl_listener destroy;
-- 
cgit v1.2.3


From 9605ab45f1c863076bd68acfb1d2e5d25c1b285d Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Fri, 20 Jul 2018 12:32:29 -0400
Subject: Fix output wildcard handling

---
 include/sway/config.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/config.h b/include/sway/config.h
index f660a269..6f6710e9 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -461,6 +461,8 @@ void merge_output_config(struct output_config *dst, struct output_config *src);
 void apply_output_config(struct output_config *oc,
 		struct sway_container *output);
 
+struct output_config *store_output_config(struct output_config *oc);
+
 void free_output_config(struct output_config *oc);
 
 int workspace_output_cmp_workspace(const void *a, const void *b);
-- 
cgit v1.2.3


From c2ed3d8bd6e2ec12f2ce70d7e106c09a7078e91f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Jul 2018 19:37:27 +1000
Subject: Implement force_display_urgency_hint

The directive sets the timeout before an urgent view becomes normal
again after switching to it from another workspace.

Also:

* When an xwayland surface removes the urgent hint while the timer is
active, we now ignore the request. This happens as soon as the view
receives focus, so it was effectively making the timer pointless.
* The timeout is now only applied when switching to it from another
workspace.
---
 include/sway/commands.h | 1 +
 include/sway/config.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 1e93e2a3..e71a7228 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -113,6 +113,7 @@ sway_cmd cmd_focus_follows_mouse;
 sway_cmd cmd_focus_wrapping;
 sway_cmd cmd_font;
 sway_cmd cmd_for_window;
+sway_cmd cmd_force_display_urgency_hint;
 sway_cmd cmd_force_focus_wrapping;
 sway_cmd cmd_fullscreen;
 sway_cmd cmd_gaps;
diff --git a/include/sway/config.h b/include/sway/config.h
index 6f6710e9..87768399 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -324,6 +324,7 @@ struct sway_config {
 	char *font;
 	size_t font_height;
 	bool pango_markup;
+	size_t urgent_timeout;
 
 	// Flags
 	bool focus_follows_mouse;
-- 
cgit v1.2.3


From bc7d3321093339d34839718b35af034de4aeb9f1 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Fri, 20 Jul 2018 22:17:20 -0400
Subject: Reset outputs on reload

---
 include/sway/config.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/config.h b/include/sway/config.h
index 87768399..b8da29c5 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -464,8 +464,12 @@ void apply_output_config(struct output_config *oc,
 
 struct output_config *store_output_config(struct output_config *oc);
 
+void apply_output_config_to_outputs(struct output_config *oc);
+
 void free_output_config(struct output_config *oc);
 
+void create_default_output_configs(void);
+
 int workspace_output_cmp_workspace(const void *a, const void *b);
 
 int sway_binding_cmp(const void *a, const void *b);
-- 
cgit v1.2.3


From 9fbe13b9be18c732b58033a57a22a299af91a170 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Jul 2018 16:13:28 +1000
Subject: Implement floating_modifier and mouse operations for floating views

This implements the following:

* `floating_modifier` configuration directive
* Drag a floating window by its title bar
* Hold mod + drag a floating window from anywhere
* Resize a floating view by dragging the border
* Resize a floating view by holding mod and right clicking anywhere on
the view
* Resize a floating view and keep aspect ratio by holding shift while
resizing using either method
* Mouse cursor turns into resize when hovering floating border or corner
---
 include/sway/commands.h       |  2 +-
 include/sway/input/seat.h     | 16 ++++++++++++++++
 include/sway/tree/container.h | 12 ++++++++++++
 include/sway/tree/layout.h    |  9 +++++----
 4 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index e71a7228..f53d335a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -106,7 +106,7 @@ sway_cmd cmd_exit;
 sway_cmd cmd_floating;
 sway_cmd cmd_floating_maximum_size;
 sway_cmd cmd_floating_minimum_size;
-sway_cmd cmd_floating_mod;
+sway_cmd cmd_floating_modifier;
 sway_cmd cmd_floating_scroll;
 sway_cmd cmd_focus;
 sway_cmd cmd_focus_follows_mouse;
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index eac1626b..be1f3610 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -34,6 +34,8 @@ struct sway_drag_icon {
 	struct wl_listener destroy;
 };
 
+enum resize_edge;
+
 struct sway_seat {
 	struct wlr_seat *wlr_seat;
 	struct sway_cursor *cursor;
@@ -52,6 +54,20 @@ struct sway_seat {
 	int32_t touch_id;
 	double touch_x, touch_y;
 
+	// Operations (drag and resize)
+	enum {
+		OP_NONE,
+		OP_DRAG,
+		OP_RESIZE,
+	} operation;
+	struct sway_container *op_container;
+	enum resize_edge op_resize_edge;
+	uint32_t op_button;
+	bool op_resize_preserve_ratio;
+	double op_ref_lx, op_ref_ly;         // cursor's x/y at start of op
+	double op_ref_width, op_ref_height;  // container's size at start of op
+	double op_ref_con_lx, op_ref_con_ly; // container's x/y at start of op
+
 	struct wl_listener focus_destroy;
 	struct wl_listener new_container;
 	struct wl_listener new_drag_icon;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index ca7a3288..59c5b4c7 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -304,6 +304,12 @@ bool container_is_floating(struct sway_container *container);
  */
 void container_get_box(struct sway_container *container, struct wlr_box *box);
 
+/**
+ * Move a floating container by the specified amount.
+ */
+void container_floating_translate(struct sway_container *con,
+		double x_amount, double y_amount);
+
 /**
  * Move a floating container to a new layout-local position.
  */
@@ -318,4 +324,10 @@ void container_set_dirty(struct sway_container *container);
 
 bool container_has_urgent_child(struct sway_container *container);
 
+/**
+ * If the container is involved in a drag or resize operation via a mouse, this
+ * ends the operation.
+ */
+void container_end_mouse_operation(struct sway_container *container);
+
 #endif
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index ba265623..5a78fd58 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -14,10 +14,11 @@ enum movement_direction {
 };
 
 enum resize_edge {
-	RESIZE_EDGE_LEFT,
-	RESIZE_EDGE_RIGHT,
-	RESIZE_EDGE_TOP,
-	RESIZE_EDGE_BOTTOM,
+	RESIZE_EDGE_NONE   = 0,
+	RESIZE_EDGE_LEFT   = 1,
+	RESIZE_EDGE_RIGHT  = 2,
+	RESIZE_EDGE_TOP    = 4,
+	RESIZE_EDGE_BOTTOM = 8,
 };
 
 struct sway_container;
-- 
cgit v1.2.3


From ff445cc85597ee6bfae01f03d3c246e2326f3981 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Jul 2018 09:28:22 +1000
Subject: Implement xdg shell request_move and request_resize events

Also does a few other related things:

* Now uses enum wlr_edges instead of our own enum resize_edge
* Now uses wlr_xcursor_get_resize_name and removes our own
find_resize_edge_name
* Renames drag to move for consistency
---
 include/sway/input/seat.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index be1f3610..35a965ee 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -3,6 +3,7 @@
 
 #include <wlr/types/wlr_layer_shell.h>
 #include <wlr/types/wlr_seat.h>
+#include <wlr/util/edges.h>
 #include "sway/input/input-manager.h"
 
 struct sway_seat_device {
@@ -34,8 +35,6 @@ struct sway_drag_icon {
 	struct wl_listener destroy;
 };
 
-enum resize_edge;
-
 struct sway_seat {
 	struct wlr_seat *wlr_seat;
 	struct sway_cursor *cursor;
@@ -57,11 +56,12 @@ struct sway_seat {
 	// Operations (drag and resize)
 	enum {
 		OP_NONE,
-		OP_DRAG,
+		OP_MOVE,
 		OP_RESIZE,
 	} operation;
+
 	struct sway_container *op_container;
-	enum resize_edge op_resize_edge;
+	enum wlr_edges op_resize_edge;
 	uint32_t op_button;
 	bool op_resize_preserve_ratio;
 	double op_ref_lx, op_ref_ly;         // cursor's x/y at start of op
@@ -150,4 +150,9 @@ bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
 void drag_icon_update_position(struct sway_drag_icon *icon);
 
+void seat_begin_move(struct sway_seat *seat, struct sway_container *con);
+
+void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
+		uint32_t button, enum wlr_edges edge);
+
 #endif
-- 
cgit v1.2.3


From 0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 10:40:12 +1000
Subject: Replace static handle_end_operation with seat_end_mouse_operation

---
 include/sway/input/seat.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 35a965ee..cd36ef5a 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -155,4 +155,6 @@ void seat_begin_move(struct sway_seat *seat, struct sway_container *con);
 void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
 		uint32_t button, enum wlr_edges edge);
 
+void seat_end_mouse_operation(struct sway_seat *seat);
+
 #endif
-- 
cgit v1.2.3


From 6767d8a593723a9b69d018eed13d24a789be9516 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 10:57:14 +1000
Subject: Prevent re-uploading the same cursor image multiple times

---
 include/sway/input/cursor.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 5dd109ca..b0a3a7c5 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -11,6 +11,7 @@ struct sway_cursor {
 	} previous;
 	struct wlr_xcursor_manager *xcursor_manager;
 
+	const char *image;
 	struct wl_client *image_client;
 
 	struct wl_listener motion;
@@ -37,4 +38,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
 	uint32_t button, enum wlr_button_state state);
 
+void cursor_set_image(struct sway_cursor *cursor, const char *image,
+		struct wl_client *client);
+
 #endif
-- 
cgit v1.2.3


From 9df660ee3188386c907d8feb999636ce8d61d095 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 11:23:48 +1000
Subject: Store last button and use it when views request to move or resize

---
 include/sway/input/seat.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include/sway')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index cd36ef5a..ab25788f 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -68,6 +68,9 @@ struct sway_seat {
 	double op_ref_width, op_ref_height;  // container's size at start of op
 	double op_ref_con_lx, op_ref_con_ly; // container's x/y at start of op
 
+	uint32_t last_button;
+	uint32_t last_button_serial;
+
 	struct wl_listener focus_destroy;
 	struct wl_listener new_container;
 	struct wl_listener new_drag_icon;
@@ -150,11 +153,15 @@ bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
 void drag_icon_update_position(struct sway_drag_icon *icon);
 
-void seat_begin_move(struct sway_seat *seat, struct sway_container *con);
+void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
+		uint32_t button);
 
 void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
 		uint32_t button, enum wlr_edges edge);
 
 void seat_end_mouse_operation(struct sway_seat *seat);
 
+void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
+		uint32_t button, enum wlr_button_state state);
+
 #endif
-- 
cgit v1.2.3


From 011d1ebfa4219eb666487529a5a5e7189c14fd40 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 21 Jul 2018 12:13:00 +1000
Subject: Consider view's min/max sizes when resizing

---
 include/sway/tree/view.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 068d92c6..1dfb218b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -26,6 +26,8 @@ enum sway_view_prop {
 };
 
 struct sway_view_impl {
+	void (*get_constraints)(struct sway_view *view, double *min_width,
+			double *max_width, double *min_height, double *max_height);
 	const char *(*get_string_prop)(struct sway_view *view,
 			enum sway_view_prop prop);
 	uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop);
@@ -215,6 +217,9 @@ uint32_t view_get_window_type(struct sway_view *view);
 
 const char *view_get_shell(struct sway_view *view);
 
+void view_get_constraints(struct sway_view *view, double *min_width,
+		double *max_width, double *min_height, double *max_height);
+
 uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
 	int height);
 
-- 
cgit v1.2.3


From 238c8afc74241efdc44d1cf88322d322ce1226d9 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 22 Jul 2018 22:20:07 +0100
Subject: Handle set_{title,app_id} for xdg-shell and zxdg-shell-v6

This allows to update the title even if the view doesn't commit.
This is useful e.g. when a terminal sets its toplevel title to
the currently running command and when the view isn't visible.
---
 include/sway/tree/view.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/sway')

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 1dfb218b..3bdfe252 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -110,6 +110,8 @@ struct sway_xdg_shell_v6_view {
 	struct wl_listener request_resize;
 	struct wl_listener request_maximize;
 	struct wl_listener request_fullscreen;
+	struct wl_listener set_title;
+	struct wl_listener set_app_id;
 	struct wl_listener new_popup;
 	struct wl_listener map;
 	struct wl_listener unmap;
@@ -124,6 +126,8 @@ struct sway_xdg_shell_view {
 	struct wl_listener request_resize;
 	struct wl_listener request_maximize;
 	struct wl_listener request_fullscreen;
+	struct wl_listener set_title;
+	struct wl_listener set_app_id;
 	struct wl_listener new_popup;
 	struct wl_listener map;
 	struct wl_listener unmap;
-- 
cgit v1.2.3


From 81e8f31cc6f284b54ab206e14af7ecbc1a9ed1bb Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 14:10:40 +1000
Subject: Implement scratchpad

Implements the following commands:

* move scratchpad
* scratchpad show
* [criteria] scratchpad show

Also fixes these:

* Fix memory leak when executing command with criteria
(use `list_free(views)` instead of `free(views)`)
* Fix crash when running `move to` with no further arguments
---
 include/sway/scratchpad.h     | 26 ++++++++++++++++++++++++++
 include/sway/server.h         |  2 ++
 include/sway/tree/container.h |  5 +++++
 3 files changed, 33 insertions(+)
 create mode 100644 include/sway/scratchpad.h

(limited to 'include/sway')

diff --git a/include/sway/scratchpad.h b/include/sway/scratchpad.h
new file mode 100644
index 00000000..5af5256f
--- /dev/null
+++ b/include/sway/scratchpad.h
@@ -0,0 +1,26 @@
+#ifndef _SWAY_SCRATCHPAD_H
+#define _SWAY_SCRATCHPAD_H
+
+#include "tree/container.h"
+
+/**
+ * Move a container to the scratchpad.
+ */
+void scratchpad_add_container(struct sway_container *con);
+
+/**
+ * Remove a container from the scratchpad.
+ */
+void scratchpad_remove_container(struct sway_container *con);
+
+/**
+ * Show or hide the next container on the scratchpad.
+ */
+void scratchpad_toggle_auto(void);
+
+/**
+ * Show or hide a specific container on the scratchpad.
+ */
+void scratchpad_toggle_container(struct sway_container *con);
+
+#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 70bde6d4..6cef2e58 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -48,6 +48,8 @@ struct sway_server {
 
 	list_t *transactions;
 	list_t *dirty_containers;
+
+	list_t *scratchpad; // struct sway_container
 };
 
 struct sway_server server;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 59c5b4c7..2a4be18c 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -135,6 +135,11 @@ struct sway_container {
 
 	struct sway_container *parent;
 
+	// Indicates that the container is a scratchpad container.
+	// Both hidden and visible scratchpad containers have scratchpad=true.
+	// Hidden scratchpad containers have a NULL parent.
+	bool scratchpad;
+
 	float alpha;
 
 	struct wlr_texture *title_focused;
-- 
cgit v1.2.3


From 12e90fa6006b2cf17a5b5983b5a6e2e70cda58d3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Jul 2018 22:28:20 +1000
Subject: Store scratchpad list in sway_root instead of server

---
 include/sway/server.h      | 2 --
 include/sway/tree/layout.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/sway')

diff --git a/include/sway/server.h b/include/sway/server.h
index 6cef2e58..70bde6d4 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -48,8 +48,6 @@ struct sway_server {
 
 	list_t *transactions;
 	list_t *dirty_containers;
-
-	list_t *scratchpad; // struct sway_container
 };
 
 struct sway_server server;
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index 5a78fd58..7d7da2d7 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -35,6 +35,8 @@ struct sway_root {
 
 	struct wl_list outputs; // sway_output::link
 
+	list_t *scratchpad; // struct sway_container
+
 	struct {
 		struct wl_signal new_container;
 	} events;
-- 
cgit v1.2.3