From 298ccb539c5f9d538e49364f45e57ff0d88df717 Mon Sep 17 00:00:00 2001
From: Jonathan Buch <jbuch@synyx.de>
Date: Tue, 25 Sep 2018 10:22:50 +0200
Subject: [PATCH] Add configuration for raising containers on focus

* New configuration option: raise_floating
  (From the discussion on https://github.com/i3/i3/issues/2990)
* By default, it still raises the window on focus, otherwise it
  will raise the window on click.
---
 include/sway/commands.h        |  1 +
 include/sway/config.h          |  1 +
 sway/commands.c                |  1 +
 sway/commands/raise_floating.c | 14 ++++++++++++++
 sway/config.c                  |  1 +
 sway/input/seat.c              | 15 ++++++++++++++-
 sway/meson.build               |  1 +
 7 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 sway/commands/raise_floating.c

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 64f707f4b..f7fafb966 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -125,6 +125,7 @@ sway_cmd cmd_floating_modifier;
 sway_cmd cmd_floating_scroll;
 sway_cmd cmd_focus;
 sway_cmd cmd_focus_follows_mouse;
+sway_cmd cmd_raise_floating;
 sway_cmd cmd_focus_on_window_activation;
 sway_cmd cmd_focus_wrapping;
 sway_cmd cmd_font;
diff --git a/include/sway/config.h b/include/sway/config.h
index 98a18b76a..02ace979c 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -359,6 +359,7 @@ struct sway_config {
 
 	// Flags
 	bool focus_follows_mouse;
+	bool raise_floating;
 	bool mouse_warping;
 	enum focus_wrapping_mode focus_wrapping;
 	bool active;
diff --git a/sway/commands.c b/sway/commands.c
index 72db8ab9d..5dd27f7ec 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -107,6 +107,7 @@ static struct cmd_handler handlers[] = {
 	{ "new_window", cmd_default_border },
 	{ "no_focus", cmd_no_focus },
 	{ "output", cmd_output },
+	{ "raise_floating", cmd_raise_floating },
 	{ "seat", cmd_seat },
 	{ "set", cmd_set },
 	{ "show_marks", cmd_show_marks },
diff --git a/sway/commands/raise_floating.c b/sway/commands/raise_floating.c
new file mode 100644
index 000000000..930299a12
--- /dev/null
+++ b/sway/commands/raise_floating.c
@@ -0,0 +1,14 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "util.h"
+
+struct cmd_results *cmd_raise_floating(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "raise_floating", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	config->raise_floating =
+		parse_boolean(argv[0], config->raise_floating);
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config.c b/sway/config.c
index 048b57de4..b56c4f71d 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -221,6 +221,7 @@ static void config_defaults(struct sway_config *config) {
 
 	// Flags
 	config->focus_follows_mouse = true;
+	config->raise_floating = true;
 	config->mouse_warping = true;
 	config->focus_wrapping = WRAP_YES;
 	config->validating = false;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 69bee47ec..c747eafc1 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -734,7 +734,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 
 	// If we've focused a floating container, bring it to the front.
 	// We do this by putting it at the end of the floating list.
-	if (container) {
+	if (container && config->raise_floating) {
 		struct sway_container *floater = container;
 		while (floater->parent) {
 			floater = floater->parent;
@@ -1017,6 +1017,19 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
 	seat->op_ref_con_lx = sx;
 	seat->op_ref_con_ly = sy;
 	seat->op_moved = false;
+
+	// If we've focused a floating container, bring it to the front.
+	// We do this by putting it at the end of the floating list.
+	if (con && !config->raise_floating) {
+		struct sway_container *floater = con;
+		while (floater->parent) {
+			floater = floater->parent;
+		}
+		if (container_is_floating(floater)) {
+			list_move_to_end(floater->workspace->floating, floater);
+			node_set_dirty(&floater->workspace->node);
+		}
+	}
 }
 
 void seat_begin_move_floating(struct sway_seat *seat,
diff --git a/sway/meson.build b/sway/meson.build
index 00ebcb40d..8ab288695 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -48,6 +48,7 @@ sway_sources = files(
 	'commands/floating_modifier.c',
 	'commands/focus.c',
 	'commands/focus_follows_mouse.c',
+	'commands/raise_floating.c',
 	'commands/focus_on_window_activation.c',
 	'commands/focus_wrapping.c',
 	'commands/font.c',