mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add workspace {prev,next}_on_output --create

Browse source 
This creates the next workspace if you hit the end.
This commit is contained in:
Drew DeVault 2019-02-15 21:01:54 -05:00 committed by Brian Ashworth
parent cd10e755c1
commit 487c83f0de
3 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/sway/tree/workspace.h
View file

@ -67,11 +67,13 @@ struct sway_workspace *workspace_by_number(const char* name);
struct sway_workspace *workspace_by_name(const char*); struct sway_workspace *workspace_by_name(const char*);
struct sway_workspace *workspace_output_next(struct sway_workspace *current); struct sway_workspace *workspace_output_next(
struct sway_workspace *current, bool create);
struct sway_workspace *workspace_next(struct sway_workspace *current); struct sway_workspace *workspace_next(struct sway_workspace *current);
struct sway_workspace *workspace_output_prev(struct sway_workspace *current); struct sway_workspace *workspace_output_prev(
struct sway_workspace *current, bool create);
struct sway_workspace *workspace_prev(struct sway_workspace *current); struct sway_workspace *workspace_prev(struct sway_workspace *current);

13
sway/commands/workspace.c
View file

@ -181,7 +181,9 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
++argv; ++argv;
} }
bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
struct sway_seat *seat = config->handler_context.seat;
struct sway_workspace *current = seat_get_focused_workspace(seat);
struct sway_workspace *ws = NULL; struct sway_workspace *ws = NULL;
if (strcasecmp(argv[0], "number") == 0) { if (strcasecmp(argv[0], "number") == 0) {
if (argc < 2) { if (argc < 2) {
@ -199,12 +201,13 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
} }
} else if (strcasecmp(argv[0], "next") == 0 || } else if (strcasecmp(argv[0], "next") == 0 ||
strcasecmp(argv[0], "prev") == 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) { strcasecmp(argv[0], "current") == 0) {
ws = workspace_by_name(argv[0]); ws = workspace_by_name(argv[0]);
} else if (strcasecmp(argv[0], "next_on_output") == 0) {
ws = workspace_output_next(current, create);
} else if (strcasecmp(argv[0], "prev_on_output") == 0) {
ws = workspace_output_prev(current, create);
} else if (strcasecmp(argv[0], "back_and_forth") == 0) { } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
struct sway_seat *seat = config->handler_context.seat;
if (!seat->prev_workspace_name) { if (!seat->prev_workspace_name) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID,
"There is no previous workspace"); "There is no previous workspace");
@ -220,7 +223,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
free(name); free(name);
} }
workspace_switch(ws, no_auto_back_and_forth); workspace_switch(ws, no_auto_back_and_forth);
seat_consider_warp_to_focus(config->handler_context.seat); seat_consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL); return cmd_results_new(CMD_SUCCESS, NULL);
} }

29
sway/tree/workspace.c
View file

@ -230,8 +230,10 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
// not a command about workspaces // not a command about workspaces
if (strcmp(_target, "next") == 0 || if (strcmp(_target, "next") == 0 ||
strcmp(_target, "prev") == 0 || strcmp(_target, "prev") == 0 ||
strcmp(_target, "next_on_output") == 0 || strncmp(_target, "next_on_output",
strcmp(_target, "prev_on_output") == 0 || strlen("next_on_output")) == 0 ||
strncmp(_target, "prev_on_output",
strlen("next_on_output")) == 0 ||
strcmp(_target, "number") == 0 || strcmp(_target, "number") == 0 ||
strcmp(_target, "back_and_forth") == 0 || strcmp(_target, "back_and_forth") == 0 ||
strcmp(_target, "current") == 0) { strcmp(_target, "current") == 0) {
@ -372,11 +374,11 @@ struct sway_workspace *workspace_by_name(const char *name) {
if (strcmp(name, "prev") == 0) { if (strcmp(name, "prev") == 0) {
return workspace_prev(current); return workspace_prev(current);
} else if (strcmp(name, "prev_on_output") == 0) { } else if (strcmp(name, "prev_on_output") == 0) {
return workspace_output_prev(current); return workspace_output_prev(current, false);
} else if (strcmp(name, "next") == 0) { } else if (strcmp(name, "next") == 0) {
return workspace_next(current); return workspace_next(current);
} else if (strcmp(name, "next_on_output") == 0) { } else if (strcmp(name, "next_on_output") == 0) {
return workspace_output_next(current); return workspace_output_next(current, false);
} else if (strcmp(name, "current") == 0) { } else if (strcmp(name, "current") == 0) {
return current; return current;
} else if (strcasecmp(name, "back_and_forth") == 0) { } else if (strcasecmp(name, "back_and_forth") == 0) {
@ -397,11 +399,18 @@ struct sway_workspace *workspace_by_name(const char *name) {
* otherwise the next one is returned. * otherwise the next one is returned.
*/ */
static struct sway_workspace *workspace_output_prev_next_impl( static struct sway_workspace *workspace_output_prev_next_impl(
struct sway_output *output, int dir) { struct sway_output *output, int dir, bool create) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_workspace *workspace = seat_get_focused_workspace(seat); struct sway_workspace *workspace = seat_get_focused_workspace(seat);
int index = list_find(output->workspaces, workspace); int index = list_find(output->workspaces, workspace);
if (!workspace_is_empty(workspace) && create &&
(index + dir < 0 || index + dir == output->workspaces->length)) {
struct sway_output *output = workspace->output;
char *next = workspace_next_name(output->wlr_output->name);
workspace_create(output, next);
free(next);
}
size_t new_index = wrap(index + dir, output->workspaces->length); size_t new_index = wrap(index + dir, output->workspaces->length);
return output->workspaces->items[new_index]; return output->workspaces->items[new_index];
} }
@ -432,16 +441,18 @@ static struct sway_workspace *workspace_prev_next_impl(
} }
} }
struct sway_workspace *workspace_output_next(struct sway_workspace *current) { struct sway_workspace *workspace_output_next(
return workspace_output_prev_next_impl(current->output, 1); struct sway_workspace *current, bool create) {
return workspace_output_prev_next_impl(current->output, 1, create);
} }
struct sway_workspace *workspace_next(struct sway_workspace *current) { struct sway_workspace *workspace_next(struct sway_workspace *current) {
return workspace_prev_next_impl(current, 1); return workspace_prev_next_impl(current, 1);
} }
struct sway_workspace *workspace_output_prev(struct sway_workspace *current) { struct sway_workspace *workspace_output_prev(
return workspace_output_prev_next_impl(current->output, -1); struct sway_workspace *current, bool create) {
return workspace_output_prev_next_impl(current->output, -1, create);
} }
struct sway_workspace *workspace_prev(struct sway_workspace *current) { struct sway_workspace *workspace_prev(struct sway_workspace *current) {