1 files changed, 68 insertions, 3 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 74d9d535..9cd8bfae 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -1,10 +1,14 @@
 #include <strings.h>
 #include <wlr/util/log.h>
 #include "log.h"
+#include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
+#include "sway/output.h"
+#include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "sway/commands.h"
+#include "sway/tree/workspace.h"
+#include "stringop.h"
 
 static bool parse_movement_direction(const char *name,
                 enum movement_direction *out) {
@@ -27,7 +31,55 @@ static bool parse_movement_direction(const char *name,
         return true;
 }
 
+static struct cmd_results *focus_mode(struct sway_container *con,
+                struct sway_seat *seat, bool floating) {
+        struct sway_container *ws = con->type == C_WORKSPACE ?
+                con : container_parent(con, C_WORKSPACE);
+        struct sway_container *new_focus = ws;
+        if (floating) {
+                new_focus = ws->sway_workspace->floating;
+                if (new_focus->children->length == 0) {
+                        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+                }
+        }
+        seat_set_focus(seat, seat_get_active_child(seat, new_focus));
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+static struct cmd_results *focus_output(struct sway_container *con,
+                struct sway_seat *seat, int argc, char **argv) {
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "focus",
+                        "Expected 'focus output <direction|name>'");
+        }
+        char *identifier = join_args(argv, argc);
+        struct sway_container *output = output_by_name(identifier);
+
+        if (!output) {
+                enum movement_direction direction;
+                if (!parse_movement_direction(identifier, &direction) ||
+                                direction == MOVE_PARENT || direction == MOVE_CHILD) {
+                        free(identifier);
+                        return cmd_results_new(CMD_INVALID, "focus",
+                                "There is no output with that name");
+                }
+                struct sway_container *focus = seat_get_focus(seat);
+                focus = container_parent(focus, C_OUTPUT);
+                output = container_get_in_direction(focus, seat, direction);
+        }
+
+        free(identifier);
+        if (output) {
+                seat_set_focus(seat, seat_get_focus_inactive(seat, output));
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
 struct cmd_results *cmd_focus(int argc, char **argv) {
+        if (config->reading || !config->active) {
+                return cmd_results_new(CMD_DEFER, NULL, NULL);
+        }
         struct sway_container *con = config->handler_context.current_container;
         struct sway_seat *seat = config->handler_context.seat;
         if (con->type < C_WORKSPACE) {
@@ -40,11 +92,24 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
         }
 
-        // TODO mode_toggle
+        if (strcmp(argv[0], "floating") == 0) {
+                return focus_mode(con, seat, true);
+        } else if (strcmp(argv[0], "tiling") == 0) {
+                return focus_mode(con, seat, false);
+        } else if (strcmp(argv[0], "mode_toggle") == 0) {
+                return focus_mode(con, seat, !container_is_floating(con));
+        }
+
+        if (strcmp(argv[0], "output") == 0) {
+                argc--; argv++;
+                return focus_output(con, seat, argc, argv);
+        }
+
         enum movement_direction direction = 0;
         if (!parse_movement_direction(argv[0], &direction)) {
                 return cmd_results_new(CMD_INVALID, "focus",
-                                "Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
+                        "Expected 'focus <direction|parent|child|mode_toggle|floating|tiling>' "
+                        "or 'focus output <direction|name>'");
         }
 
         struct sway_container *next_focus = container_get_in_direction(