Implement focus output command

1 files changed, 44 insertions, 1 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index b24d5007..2426a7f4 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -4,9 +4,11 @@
 #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/tree/workspace.h"
+#include "stringop.h"
 
 static bool parse_movement_direction(const char *name,
                 enum movement_direction *out) {
@@ -44,6 +46,43 @@ static struct cmd_results *focus_mode(struct sway_container *con,
         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 (strcmp(identifier, "left") == 0) {
+                        direction = MOVE_LEFT;
+                } else if (strcmp(identifier, "right") == 0) {
+                        direction = MOVE_RIGHT;
+                } else if (strcmp(identifier, "up") == 0) {
+                        direction = MOVE_UP;
+                } else if (strcmp(identifier, "down") == 0) {
+                        direction = MOVE_DOWN;
+                } else {
+                        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) {
         struct sway_container *con = config->handler_context.current_container;
         struct sway_seat *seat = config->handler_context.seat;
@@ -65,7 +104,11 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 return focus_mode(con, seat, !container_is_floating(con));
         }
 
-        // TODO: focus output <direction|name>
+        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",