changed workspace_{outout_,}{next,prev} to return workspace

so it can be reused for "move container to workspace next"
This commit is contained in:
minus 2015-08-25 19:00:20 +02:00
parent 03e4a97dbe
commit e854a54e96
3 changed files with 78 additions and 68 deletions

View file

@ -9,9 +9,9 @@ char *workspace_next_name(void);
swayc_t *workspace_create(const char*); swayc_t *workspace_create(const char*);
swayc_t *workspace_by_name(const char*); swayc_t *workspace_by_name(const char*);
void workspace_switch(swayc_t*); void workspace_switch(swayc_t*);
void workspace_output_next(); swayc_t *workspace_output_next();
void workspace_next(); swayc_t *workspace_next();
void workspace_output_prev(); swayc_t *workspace_output_prev();
void workspace_prev(); swayc_t *workspace_prev();
#endif #endif

View file

@ -668,23 +668,23 @@ static bool cmd_workspace(struct sway_config *config, int argc, char **argv) {
if (argc == 1) { if (argc == 1) {
// Handle workspace next/prev // Handle workspace next/prev
if (strcmp(argv[0], "next") == 0) { if (strcmp(argv[0], "next") == 0) {
workspace_next(); workspace_switch(workspace_next());
return true; return true;
} }
if (strcmp(argv[0], "prev") == 0) { if (strcmp(argv[0], "prev") == 0) {
workspace_next(); workspace_switch(workspace_prev());
return true; return true;
} }
// Handle workspace output_next/prev // Handle workspace output_next/prev
if (strcmp(argv[0], "next_on_output") == 0) { if (strcmp(argv[0], "next_on_output") == 0) {
workspace_output_next(); workspace_switch(workspace_output_next());
return true; return true;
} }
if (strcmp(argv[0], "prev_on_output") == 0) { if (strcmp(argv[0], "prev_on_output") == 0) {
workspace_output_prev(); workspace_switch(workspace_output_prev());
return true; return true;
} }

View file

@ -85,85 +85,95 @@ static bool _workspace_by_name(swayc_t *view, void *data) {
} }
swayc_t *workspace_by_name(const char* name) { swayc_t *workspace_by_name(const char* name) {
return swayc_by_test(&root_container, _workspace_by_name, (void *) name); if (strcmp(name, "prev") == 0) {
} return workspace_prev();
}
void workspace_output_next() { else if (strcmp(name, "prev_on_output") == 0) {
// Get the index of the workspace in the current output, and change the view to index+1 workspace. return workspace_output_prev();
// if we're currently focused on the last workspace in the output, switch to the first }
swayc_t *current_output = swayc_active_workspace()->parent; else if (strcmp(name, "next") == 0) {
int i; return workspace_next();
for (i = 0; i < current_output->children->length - 1; i++) { }
if (strcmp((((swayc_t *)current_output->children->items[i])->name), swayc_active_workspace()->name) == 0) { else if (strcmp(name, "next_on_output") == 0) {
workspace_switch(current_output->children->items[i + 1]); return workspace_output_next();
return; }
} else if (strcmp(name, "current") == 0) {
return swayc_active_workspace();
}
else {
return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
} }
workspace_switch(current_output->children->items[0]);
} }
void workspace_next() { /**
// Get the index of the workspace in the current output, and change the focus to index+1 workspace. * Get the previous or next workspace on the specified output.
// if we're currently focused on the last workspace in the output, change focus to the next output * Wraps around at the end and beginning.
// and call workspace_output_next() * If next is false, the previous workspace is returned, otherwise the next one is returned.
*/
swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
if (!sway_assert(output->type == C_OUTPUT, "Argument must be an output, is %d", output->type)) {
return NULL;
}
swayc_t *current_output = swayc_active_workspace()->parent;
int i; int i;
for (i = 0; i < current_output->children->length - 1; i++) { for (i = 0; i < output->children->length; i++) {
if (current_output->children->items[i] == swayc_active_workspace()) { if (output->children->items[i] == output->focused) {
workspace_switch(current_output->children->items[i + 1]); return output->children->items[wrap(i + (next ? 1 : -1), output->children->length)];
return;
} }
} }
// Doesn't happen, at worst the for loop returns the previously active workspace
return NULL;
}
/**
* Get the previous or next workspace. If the first/last workspace on an output is active,
* proceed to the previous/next output's previous/next workspace.
* If next is false, the previous workspace is returned, otherwise the next one is returned.
*/
swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
if (!sway_assert(workspace->type == C_WORKSPACE, "Argument must be a workspace, is %d", workspace->type)) {
return NULL;
}
swayc_t *current_output = workspace->parent;
int offset = next ? 1 : -1;
int start = next ? 0 : 1;
int end = next ? (current_output->children->length) - 1 : current_output->children->length;
int i;
for (i = start; i < end; i++) {
if (current_output->children->items[i] == workspace) {
return current_output->children->items[i + offset];
}
}
// Given workspace is the first/last on the output, jump to the previous/next output
int num_outputs = root_container.children->length; int num_outputs = root_container.children->length;
for (i = 0; i < num_outputs; i++) { for (i = 0; i < num_outputs; i++) {
if (root_container.children->items[i] == current_output) { if (root_container.children->items[i] == current_output) {
swayc_t *next_output = root_container.children->items[wrap(++i, num_outputs)]; swayc_t *next_output = root_container.children->items[wrap(i + offset, num_outputs)];
workspace_switch(next_output->focused); return workspace_output_prev_next_impl(next_output, next);
workspace_output_next();
return;
} }
} }
// Doesn't happen, at worst the for loop returns the previously active workspace on the active output
return NULL;
} }
void workspace_output_prev() { swayc_t *workspace_output_next() {
// Get the index of the workspace in the current output, and change the view to index+1 workspace return workspace_output_prev_next_impl(swayc_active_output(), true);
// if we're currently focused on the first workspace in the output, do nothing and return false
swayc_t *current_output = swayc_active_workspace()->parent;
int i;
for (i = 1; i < current_output->children->length; i++) {
if (strcmp((((swayc_t *)current_output->children->items[i])->name), swayc_active_workspace()->name) == 0) {
workspace_switch(current_output->children->items[i - 1]);
return;
}
}
workspace_switch(current_output->children->items[current_output->children->length - 1]);
} }
void workspace_prev() { swayc_t *workspace_next() {
// Get the index of the workspace in the current output, and change the focus to index-1 workspace. return workspace_prev_next_impl(swayc_active_workspace(), true);
// if we're currently focused on the first workspace in the output, change focus to the previous output }
// and call workspace_output_prev()
swayc_t *current_output = swayc_active_workspace()->parent; swayc_t *workspace_output_prev() {
int i; return workspace_output_prev_next_impl(swayc_active_output(), false);
for (i = 1; i < current_output->children->length; i++) { }
if (current_output->children->items[i] == swayc_active_workspace()) {
workspace_switch(current_output->children->items[i - 1]);
return;
}
}
int num_outputs = root_container.children->length; swayc_t *workspace_prev() {
for (i = 0; i < num_outputs; i++) { return workspace_prev_next_impl(swayc_active_workspace(), false);
if (root_container.children->items[i] == current_output) {
swayc_t *prev_output = root_container.children->items[wrap(--i, num_outputs)];
workspace_switch(prev_output->focused);
workspace_output_prev();
return;
}
}
} }
void workspace_switch(swayc_t *workspace) { void workspace_switch(swayc_t *workspace) {