From a173b79c5493d196f1414ab379d393c5f07840bc Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Jul 2018 16:33:27 +1000 Subject: [PATCH 1/5] 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 b24d50070..2426a7f40 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 '"); + } + 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 + 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", From 08736255a3ba16f6b810fd4eee91fe4e1ab92e35 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Jul 2018 16:41:02 +1000 Subject: [PATCH 2/5] 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 a3e6a5008..73c968ead 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 2426a7f40..894025ad4 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) { From dad3a8deee9019c023c970089b7853c501821f33 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Jul 2018 16:52:02 +1000 Subject: [PATCH 3/5] Fix crash when moving workspace to output --- sway/tree/layout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 197a2fc8b..1f898f8ad 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -232,7 +232,9 @@ void container_move_to(struct sway_container *container, } if (new_workspace != old_workspace) { workspace_detect_urgent(new_workspace); - workspace_detect_urgent(old_workspace); + if (old_workspace) { + workspace_detect_urgent(old_workspace); + } } } From 8533c35a9f15288bb9bade57d972cf0ad0724ec4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Jul 2018 19:49:50 +1000 Subject: [PATCH 4/5] Fix crash and render issues involving cursor_send_pointer_motion Fixes #2303, as well as a crash. To replicate the crash: * Have multiple outputs * In config: for_window [] workspace foo * Also in config: workspace foo output * Focus the right output, and ensure workspace foo doesn't exist * Launch the app that triggers the criteria When the view maps, it calls workspace_switch which calls send_set_focus which calls cursor_send_pointer_motion which calls transaction_commit_dirty. This call to transaction_commit_dirty is not meant to happen at this time because the tree isn't guaranteed to be in a consistent state, but I'm not sure how exactly this leads to the crash or render issues. In this case the transaction is already committed by the view implementation's handle_map function. So the solution is to remove it from cursor_send_pointer_motion and add it to the other functions in cursor.c which call cursor_send_pointer_motion. --- sway/input/cursor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 7a9f3ed77..c76c20b35 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -220,7 +220,6 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, struct sway_drag_icon *drag_icon = wlr_drag_icon->data; drag_icon_update_position(drag_icon); } - transaction_commit_dirty(); } static void handle_cursor_motion(struct wl_listener *listener, void *data) { @@ -230,6 +229,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) { wlr_cursor_move(cursor->cursor, event->device, event->delta_x, event->delta_y); cursor_send_pointer_motion(cursor, event->time_msec, true); + transaction_commit_dirty(); } static void handle_cursor_motion_absolute( @@ -240,6 +240,7 @@ static void handle_cursor_motion_absolute( struct wlr_event_pointer_motion_absolute *event = data; wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y); cursor_send_pointer_motion(cursor, event->time_msec, true); + transaction_commit_dirty(); } void dispatch_cursor_button(struct sway_cursor *cursor, @@ -426,6 +427,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) { wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y); cursor_send_pointer_motion(cursor, event->time_msec, true); + transaction_commit_dirty(); } static void handle_tool_tip(struct wl_listener *listener, void *data) { From 32806d16ee26174f28e7f4727553aacee1cd3452 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Jul 2018 20:17:48 +1000 Subject: [PATCH 5/5] 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 894025ad4..9cd8bfae7 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");