mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 14:04:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

commands: check for special workspaces in workspace & move commands

Browse Source
This commit is contained in:
Ian Fan 2018-08-06 10:43:09 +01:00
parent 3b1f58e135
commit 667b8dcb67
3 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sway/commands/move.c
View File

@ -99,40 +99,48 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
if (strcasecmp(argv[1], "workspace") == 0) { if (strcasecmp(argv[1], "workspace") == 0) {
// move container to workspace x // move container to workspace x
struct sway_container *ws; struct sway_container *ws;
char *ws_name = NULL; if (strcasecmp(argv[2], "next") == 0 ||
if (strcasecmp(argv[2], "number") == 0) { strcasecmp(argv[2], "prev") == 0 ||
// move "container to workspace number x" strcasecmp(argv[2], "next_on_output") == 0 ||
if (argc < 4) { strcasecmp(argv[2], "prev_on_output") == 0 ||
return cmd_results_new(CMD_INVALID, "move", expected_syntax); strcasecmp(argv[2], "back_and_forth") == 0 ||
strcasecmp(argv[2], "current") == 0) {
ws = workspace_by_name(argv[2]);
} else if (strcasecmp(argv[2], "back_and_forth") == 0) {
if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) {
ws = workspace_create(NULL, prev_workspace_name);
} }
ws_name = strdup(argv[3]);
ws = workspace_by_number(ws_name);
} else { } else {
ws_name = join_args(argv + 2, argc - 2); char *ws_name = NULL;
ws = workspace_by_name(ws_name); if (strcasecmp(argv[2], "number") == 0) {
} // move "container to workspace number x"
if (argc < 4) {
if (!no_auto_back_and_forth && config->auto_back_and_forth && return cmd_results_new(CMD_INVALID, "move",
prev_workspace_name) { expected_syntax);
// auto back and forth move }
if (old_ws->name && strcmp(old_ws->name, ws_name) == 0) { ws_name = strdup(argv[3]);
// if target workspace is the current one ws = workspace_by_number(ws_name);
free(ws_name); } else {
ws_name = strdup(prev_workspace_name); ws_name = join_args(argv + 2, argc - 2);
ws = workspace_by_name(ws_name); ws = workspace_by_name(ws_name);
} }
}
if (!ws) { if (!no_auto_back_and_forth && config->auto_back_and_forth &&
if (strcasecmp(argv[2], "back_and_forth") == 0) { prev_workspace_name) {
if (prev_workspace_name) { // auto back and forth move
ws = workspace_create(NULL, prev_workspace_name); if (old_ws->name && strcmp(old_ws->name, ws_name) == 0) {
// if target workspace is the current one
free(ws_name);
ws_name = strdup(prev_workspace_name);
ws = workspace_by_name(ws_name);
} }
} }
ws = workspace_create(NULL, ws_name);
}
free(ws_name);
if (!ws) {
ws = workspace_create(NULL, ws_name);
}
free(ws_name);
}
destination = seat_get_focus_inactive(config->handler_context.seat, ws); destination = seat_get_focus_inactive(config->handler_context.seat, ws);
} else if (strcasecmp(argv[1], "output") == 0) { } else if (strcasecmp(argv[1], "output") == 0) {
struct sway_container *source = container_parent(current, C_OUTPUT); struct sway_container *source = container_parent(current, C_OUTPUT);

18
sway/commands/workspace.c
View File

@ -68,16 +68,20 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
ws = workspace_create(NULL, name); ws = workspace_create(NULL, name);
free(name); free(name);
} }
} else if (strcasecmp(argv[0], "next") == 0 ||
strcasecmp(argv[0], "prev") == 0 ||
strcasecmp(argv[0], "next_on_output") == 0 ||
strcasecmp(argv[0], "prev_on_output") == 0 ||
strcasecmp(argv[0], "current") == 0) {
ws = workspace_by_name(argv[0]);
} else if (strcasecmp(argv[0], "back_and_forth") == 0) {
if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) {
ws = workspace_create(NULL, prev_workspace_name);
}
} else { } else {
char *name = join_args(argv, argc); char *name = join_args(argv, argc);
if (!(ws = workspace_by_name(name))) { if (!(ws = workspace_by_name(name))) {
if (strcasecmp(argv[0], "back_and_forth") == 0) { ws = workspace_create(NULL, name);
if (prev_workspace_name) {
ws = workspace_create(NULL, prev_workspace_name);
}
} else {
ws = workspace_create(NULL, name);
}
} }
free(name); free(name);
} }

39
sway/tree/workspace.c
View File

@ -251,34 +251,23 @@ struct sway_container *workspace_by_name(const char *name) {
current_output = container_parent(focus, C_OUTPUT); current_output = container_parent(focus, C_OUTPUT);
} }
char *name_cpy = strdup(name); if (strcmp(name, "prev") == 0) {
char *first_word = strtok(name_cpy, " "); return workspace_prev(current_workspace);
if (first_word == NULL) { } else if (strcmp(name, "prev_on_output") == 0) {
first_word = name_cpy; return workspace_output_prev(current_output);
} } else if (strcmp(name, "next") == 0) {
return workspace_next(current_workspace);
struct sway_container *ws = NULL; } else if (strcmp(name, "next_on_output") == 0) {
if (strcmp(first_word, "prev") == 0) { return workspace_output_next(current_output);
ws = workspace_prev(current_workspace); } else if (strcmp(name, "current") == 0) {
} else if (strcmp(first_word, "prev_on_output") == 0) { return current_workspace;
ws = workspace_output_prev(current_output); } else if (strcasecmp(name, "back_and_forth") == 0) {
} else if (strcmp(first_word, "next") == 0) { return prev_workspace_name ? container_find(&root_container,
ws = workspace_next(current_workspace); _workspace_by_name, (void *)prev_workspace_name) : NULL;
} else if (strcmp(first_word, "next_on_output") == 0) {
ws = workspace_output_next(current_output);
} else if (strcmp(first_word, "current") == 0) {
ws = current_workspace;
} else if (strcasecmp(first_word, "back_and_forth") == 0) {
if (prev_workspace_name) {
ws = container_find(&root_container, _workspace_by_name,
(void *)prev_workspace_name);
}
} else { } else {
ws = container_find(&root_container, _workspace_by_name, return container_find(&root_container, _workspace_by_name,
(void *)name); (void *)name);
} }
free(name_cpy);
return ws;
} }
/** /**