069d37f987
This commit changes how commands decide what container to act on. Commands get the current container though `current_container`, a global defined in sway/commands.c. If a criteria is given before a command, then the following command will be run once for every container the criteria matches with a reference to the matching container in 'current_container'. Commands should use this instead of `get_focused_container()` from now on. This commit also fixes a few (minor) mistakes made in implementing marks such as non-escaped arrows in sway(5) and calling the "mark" command "floating" by accident. It also cleans up `criteria.c` in a few places.
100 lines
3.6 KiB
C
100 lines
3.6 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include <wlc/wlc.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/container.h"
|
|
#include "sway/focus.h"
|
|
#include "sway/input_state.h"
|
|
#include "sway/output.h"
|
|
#include "sway/workspace.h"
|
|
|
|
struct cmd_results *cmd_focus(int argc, char **argv) {
|
|
if (config->reading) return cmd_results_new(CMD_FAILURE, "focus", "Can't be used in config file.");
|
|
struct cmd_results *error = NULL;
|
|
if (argc > 0 && strcasecmp(argv[0], "output") == 0) {
|
|
swayc_t *output = NULL;
|
|
struct wlc_point abs_pos;
|
|
get_absolute_center_position(get_focused_container(&root_container), &abs_pos);
|
|
if ((error = checkarg(argc, "focus", EXPECTED_EQUAL_TO, 2))) {
|
|
return error;
|
|
} else if (!(output = output_by_name(argv[1], &abs_pos))) {
|
|
return cmd_results_new(CMD_FAILURE, "focus output",
|
|
"Can't find output with name/at direction '%s' @ (%i,%i)", argv[1], abs_pos.x, abs_pos.y);
|
|
} else if (!workspace_switch(swayc_active_workspace_for(output))) {
|
|
return cmd_results_new(CMD_FAILURE, "focus output",
|
|
"Switching to workspace on output '%s' was blocked", argv[1]);
|
|
} else if (config->mouse_warping) {
|
|
swayc_t *focused = get_focused_view(output);
|
|
if (focused && focused->type == C_VIEW) {
|
|
center_pointer_on(focused);
|
|
}
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
} else if (argc == 0) {
|
|
set_focused_container(current_container);
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
} else if ((error = checkarg(argc, "focus", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
static int floating_toggled_index = 0;
|
|
static int tiled_toggled_index = 0;
|
|
if (strcasecmp(argv[0], "left") == 0) {
|
|
move_focus(MOVE_LEFT);
|
|
} else if (strcasecmp(argv[0], "right") == 0) {
|
|
move_focus(MOVE_RIGHT);
|
|
} else if (strcasecmp(argv[0], "up") == 0) {
|
|
move_focus(MOVE_UP);
|
|
} else if (strcasecmp(argv[0], "down") == 0) {
|
|
move_focus(MOVE_DOWN);
|
|
} else if (strcasecmp(argv[0], "parent") == 0) {
|
|
move_focus(MOVE_PARENT);
|
|
} else if (strcasecmp(argv[0], "child") == 0) {
|
|
move_focus(MOVE_CHILD);
|
|
} else if (strcasecmp(argv[0], "next") == 0) {
|
|
move_focus(MOVE_NEXT);
|
|
} else if (strcasecmp(argv[0], "prev") == 0) {
|
|
move_focus(MOVE_PREV);
|
|
} else if (strcasecmp(argv[0], "mode_toggle") == 0) {
|
|
int i;
|
|
swayc_t *workspace = swayc_active_workspace();
|
|
swayc_t *focused = get_focused_view(workspace);
|
|
if (focused->is_floating) {
|
|
if (workspace->children->length > 0) {
|
|
for (i = 0;i < workspace->floating->length; i++) {
|
|
if (workspace->floating->items[i] == focused) {
|
|
floating_toggled_index = i;
|
|
break;
|
|
}
|
|
}
|
|
if (workspace->children->length > tiled_toggled_index) {
|
|
set_focused_container(get_focused_view(workspace->children->items[tiled_toggled_index]));
|
|
} else {
|
|
set_focused_container(get_focused_view(workspace->children->items[0]));
|
|
tiled_toggled_index = 0;
|
|
}
|
|
}
|
|
} else {
|
|
if (workspace->floating->length > 0) {
|
|
for (i = 0;i < workspace->children->length; i++) {
|
|
if (workspace->children->items[i] == focused) {
|
|
tiled_toggled_index = i;
|
|
break;
|
|
}
|
|
}
|
|
if (workspace->floating->length > floating_toggled_index) {
|
|
swayc_t *floating = workspace->floating->items[floating_toggled_index];
|
|
set_focused_container(get_focused_view(floating));
|
|
} else {
|
|
swayc_t *floating = workspace->floating->items[workspace->floating->length - 1];
|
|
set_focused_container(get_focused_view(floating));
|
|
tiled_toggled_index = workspace->floating->length - 1;
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
return cmd_results_new(CMD_INVALID, "focus",
|
|
"Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|