alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Implement focus output command

Browse source
This commit is contained in:
Ryan Dwyer 2018-07-19 16:33:27 +10:00
parent 4931d0ddc5
commit a173b79c54
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sway/commands/focus.c
View file

@ -4,9 +4,11 @@
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/output.h"
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "stringop.h"
static bool parse_movement_direction(const char *name, static bool parse_movement_direction(const char *name,
enum movement_direction *out) { 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); 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 cmd_results *cmd_focus(int argc, char **argv) {
struct sway_container *con = config->handler_context.current_container; struct sway_container *con = config->handler_context.current_container;
struct sway_seat *seat = config->handler_context.seat; 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)); 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; enum movement_direction direction = 0;
if (!parse_movement_direction(argv[0], &direction)) { if (!parse_movement_direction(argv[0], &direction)) {
return cmd_results_new(CMD_INVALID, "focus", return cmd_results_new(CMD_INVALID, "focus",