From a173b79c5493d196f1414ab379d393c5f07840bc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 16:33:27 +1000
Subject: Implement focus output command
---
sway/commands/focus.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
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",
--
cgit v1.2.3
From 08736255a3ba16f6b810fd4eee91fe4e1ab92e35 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 16:41:02 +1000
Subject: Defer the focus commands
---
sway/commands.c | 2 +-
sway/commands/focus.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sway/commands.c b/sway/commands.c
index a3e6a500..73c968ea 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -103,6 +103,7 @@ static struct cmd_handler handlers[] = {
{ "exec_always", cmd_exec_always },
{ "floating_maximum_size", cmd_floating_maximum_size },
{ "floating_minimum_size", cmd_floating_minimum_size },
+ { "focus", cmd_focus },
{ "focus_follows_mouse", cmd_focus_follows_mouse },
{ "focus_wrapping", cmd_focus_wrapping },
{ "font", cmd_font },
@@ -137,7 +138,6 @@ static struct cmd_handler command_handlers[] = {
{ "border", cmd_border },
{ "exit", cmd_exit },
{ "floating", cmd_floating },
- { "focus", cmd_focus },
{ "fullscreen", cmd_fullscreen },
{ "kill", cmd_kill },
{ "layout", cmd_layout },
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 2426a7f4..894025ad 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -84,6 +84,9 @@ static struct cmd_results *focus_output(struct sway_container *con,
}
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) {
--
cgit v1.2.3
From 32806d16ee26174f28e7f4727553aacee1cd3452 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 19 Jul 2018 20:17:48 +1000
Subject: Use parse_movement_direction
---
sway/commands/focus.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 894025ad..9cd8bfae 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -57,15 +57,8 @@ static struct cmd_results *focus_output(struct sway_container *con,
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 {
+ 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");
--
cgit v1.2.3