Merge pull request #2060 from RedSoxFan/focus-wrapping

Implement focus_wrapping

2 files changed, 8 insertions, 2 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 365068ae..87a8c23a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -106,9 +106,9 @@ sway_cmd cmd_floating_mod;
 sway_cmd cmd_floating_scroll;
 sway_cmd cmd_focus;
 sway_cmd cmd_focus_follows_mouse;
+sway_cmd cmd_focus_wrapping;
 sway_cmd cmd_font;
 sway_cmd cmd_for_window;
-sway_cmd cmd_force_focus_wrapping;
 sway_cmd cmd_fullscreen;
 sway_cmd cmd_gaps;
 sway_cmd cmd_hide_edge_borders;
diff --git a/include/sway/config.h b/include/sway/config.h
index 118981e3..de651ea4 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -285,6 +285,12 @@ struct ipc_policy {
         uint32_t features;
 };
 
+enum focus_wrapping_mode {
+        WRAP_NO,
+        WRAP_YES,
+        WRAP_FORCE
+};
+
 /**
  * The configuration struct. The result of loading a config file.
  */
@@ -320,7 +326,7 @@ struct sway_config {
         // Flags
         bool focus_follows_mouse;
         bool mouse_warping;
-        bool force_focus_wrapping;
+        enum focus_wrapping_mode focus_wrapping;
         bool active;
         bool failed;
         bool reloading;