Merge remote-tracking branch 'upstream/master' into fix-freebsd-build

1 files changed, 11 insertions, 0 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 18d10faa..4ee8c3c2 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -58,6 +58,16 @@ struct sway_mouse_binding {
 };
 
 /**
+ * Focus on window activation.
+ */
+enum sway_fowa {
+	FOWA_SMART,
+	FOWA_URGENT,
+	FOWA_FOCUS,
+	FOWA_NONE,
+};
+
+/**
  * A "mode" of keybindings created via the `mode` command.
  */
 struct sway_mode {
@@ -340,6 +350,7 @@ struct sway_config {
 	size_t font_height;
 	bool pango_markup;
 	size_t urgent_timeout;
+	enum sway_fowa focus_on_window_activation;
 
 	// Flags
 	bool focus_follows_mouse;