aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/workspace.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/workspace.c')
-rw-r--r--sway/commands/workspace.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index bf6b7e04..c253c75d 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -178,9 +178,9 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
178 "Can't switch workspaces while fullscreen global"); 178 "Can't switch workspaces while fullscreen global");
179 } 179 }
180 180
181 bool no_auto_back_and_forth = false; 181 bool auto_back_and_forth = true;
182 while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) { 182 while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
183 no_auto_back_and_forth = true; 183 auto_back_and_forth = false;
184 if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) { 184 if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) {
185 return error; 185 return error;
186 } 186 }
@@ -215,10 +215,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
215 ws = workspace_by_name(argv[0]); 215 ws = workspace_by_name(argv[0]);
216 } else if (strcasecmp(argv[0], "next_on_output") == 0) { 216 } else if (strcasecmp(argv[0], "next_on_output") == 0) {
217 ws = workspace_output_next(current, create); 217 ws = workspace_output_next(current, create);
218 no_auto_back_and_forth = true; 218 auto_back_and_forth = false;
219 } else if (strcasecmp(argv[0], "prev_on_output") == 0) { 219 } else if (strcasecmp(argv[0], "prev_on_output") == 0) {
220 ws = workspace_output_prev(current, create); 220 ws = workspace_output_prev(current, create);
221 no_auto_back_and_forth = true; 221 auto_back_and_forth = false;
222 } else if (strcasecmp(argv[0], "back_and_forth") == 0) { 222 } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
223 if (!seat->prev_workspace_name) { 223 if (!seat->prev_workspace_name) {
224 return cmd_results_new(CMD_INVALID, 224 return cmd_results_new(CMD_INVALID,
@@ -227,6 +227,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
227 if (!(ws = workspace_by_name(argv[0]))) { 227 if (!(ws = workspace_by_name(argv[0]))) {
228 ws = workspace_create(NULL, seat->prev_workspace_name); 228 ws = workspace_create(NULL, seat->prev_workspace_name);
229 } 229 }
230 auto_back_and_forth = false;
230 } else { 231 } else {
231 char *name = join_args(argv, argc); 232 char *name = join_args(argv, argc);
232 if (!(ws = workspace_by_name(name))) { 233 if (!(ws = workspace_by_name(name))) {
@@ -237,7 +238,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
237 if (!ws) { 238 if (!ws) {
238 return cmd_results_new(CMD_FAILURE, "No workspace to switch to"); 239 return cmd_results_new(CMD_FAILURE, "No workspace to switch to");
239 } 240 }
240 workspace_switch(ws, no_auto_back_and_forth); 241 if(auto_back_and_forth){
242 ws = workspace_auto_back_and_forth(ws);
243 }
244 workspace_switch(ws);
241 seat_consider_warp_to_focus(seat); 245 seat_consider_warp_to_focus(seat);
242 } 246 }
243 return cmd_results_new(CMD_SUCCESS, NULL); 247 return cmd_results_new(CMD_SUCCESS, NULL);