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

Merged workspace_output_next and workspace_output_next_wrap

Browse source
This commit is contained in:
Erik Reider 2024-01-24 03:11:39 +01:00
parent 7214db9c2d
commit a12a8ea7b0
3 changed files with 20 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,16 +69,12 @@ 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,
struct sway_workspace *workspace_output_next_wrap(struct sway_workspace *current,
bool should_wrap); bool should_wrap);
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,
struct sway_workspace *workspace_output_prev_wrap(struct sway_workspace *current,
bool should_wrap); bool should_wrap);
struct sway_workspace *workspace_prev(struct sway_workspace *current); struct sway_workspace *workspace_prev(struct sway_workspace *current);

4
sway/desktop/render.c
View file

@ -2053,10 +2053,10 @@ void output_render(struct sway_output *output, struct timespec *when,
// Get the sibling workspaces // Get the sibling workspaces
struct sway_workspace *other_ws = NULL; struct sway_workspace *other_ws = NULL;
if (output->workspace_scroll.percent < 0) { if (output->workspace_scroll.percent < 0) {
other_ws = workspace_output_prev_wrap(workspace, other_ws = workspace_output_prev(workspace,
config->workspace_gesture_wrap_around); config->workspace_gesture_wrap_around);
} else if (output->workspace_scroll.percent > 0) { } else if (output->workspace_scroll.percent > 0) {
other_ws = workspace_output_next_wrap(workspace, other_ws = workspace_output_next(workspace,
config->workspace_gesture_wrap_around); config->workspace_gesture_wrap_around);
} }

60
sway/tree/workspace.c
View file

@ -365,11 +365,11 @@ struct sway_workspace *workspace_by_name(const char *name) {
if (current && strcmp(name, "prev") == 0) { if (current && strcmp(name, "prev") == 0) {
return workspace_prev(current); return workspace_prev(current);
} else if (current && strcmp(name, "prev_on_output") == 0) { } else if (current && strcmp(name, "prev_on_output") == 0) {
return workspace_output_prev(current); return workspace_output_prev(current, true);
} else if (current && strcmp(name, "next") == 0) { } else if (current && strcmp(name, "next") == 0) {
return workspace_next(current); return workspace_next(current);
} else if (current && strcmp(name, "next_on_output") == 0) { } else if (current && strcmp(name, "next_on_output") == 0) {
return workspace_output_next(current); return workspace_output_next(current, true);
} 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) {
@ -532,7 +532,7 @@ struct sway_workspace *workspace_next(struct sway_workspace *workspace) {
* 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 should_wrap) {
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);
if (!workspace) { if (!workspace) {
@ -542,55 +542,27 @@ static struct sway_workspace *workspace_output_prev_next_impl(
} }
int index = list_find(output->workspaces, workspace); int index = list_find(output->workspaces, workspace);
size_t new_index = wrap(index + dir, output->workspaces->length); size_t new_index;
if (!should_wrap) {
new_index = index += dir;
if (index < 0 || index >= output->workspaces->length) {
return NULL;
}
} else {
new_index = wrap(index + dir, output->workspaces->length);
}
return output->workspaces->items[new_index]; return output->workspaces->items[new_index];
} }
struct sway_workspace *workspace_output_next(struct sway_workspace *current) { struct sway_workspace *workspace_output_next(struct sway_workspace *current,
return workspace_output_prev_next_impl(current->output, 1);
}
struct sway_workspace *workspace_output_prev(struct sway_workspace *current) {
return workspace_output_prev_next_impl(current->output, -1);
}
/**
* Get the previous or next workspace on the specified output. Doesn't wrap
* around at the end and beginning. If next is false, the previous workspace
* is returned, otherwise the next one is returned.
*/
static struct sway_workspace *workspace_output_prev_next_no_wrap_impl(
struct sway_output *output, int dir) {
struct sway_seat *seat = input_manager_current_seat();
struct sway_workspace *workspace = seat_get_focused_workspace(seat);
if (!workspace) {
sway_log(SWAY_DEBUG,
"No focused workspace to base prev/next on output off of");
return NULL;
}
int index = list_find(output->workspaces, workspace) + dir;
if (index < 0 || index >= output->workspaces->length) {
return NULL;
}
return output->workspaces->items[index];
}
struct sway_workspace *workspace_output_next_wrap(struct sway_workspace *current,
bool should_wrap) { bool should_wrap) {
if (should_wrap) { return workspace_output_prev_next_impl(current->output, 1, should_wrap);
return workspace_output_prev_next_impl(current->output, 1);
}
return workspace_output_prev_next_no_wrap_impl(current->output, 1);
} }
struct sway_workspace *workspace_output_prev_wrap(struct sway_workspace *current, struct sway_workspace *workspace_output_prev(struct sway_workspace *current,
bool should_wrap) { bool should_wrap) {
if (should_wrap) { return workspace_output_prev_next_impl(current->output, -1, should_wrap);
return workspace_output_prev_next_impl(current->output, -1);
}
return workspace_output_prev_next_no_wrap_impl(current->output, -1);
} }
struct sway_workspace *workspace_auto_back_and_forth( struct sway_workspace *workspace_auto_back_and_forth(