X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fworkspace.c;h=3d08fa4c8db51031d1fcf005c59e44287a6069a5;hb=5a29e61a4605cb3a1a9333d8e85d9afdc6b51ab1;hp=44f32c2dfa4aecdad30dc0f40318925e0367ba77;hpb=1bb165a29a269658706218369100d5ed8a2773fd;p=i3%2Fi3 diff --git a/src/workspace.c b/src/workspace.c index 44f32c2d..3d08fa4c 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -112,15 +112,17 @@ Con *create_workspace_on_output(Output *output, Con *content) { DLOG("relevant command = %s\n", bind->command); char *target = bind->command + strlen("workspace "); /* We check if this is the workspace - * next/prev/next_on_output/prev_on_output/back_and_forth command. + * next/prev/next_on_output/prev_on_output/back_and_forth/number command. * Beware: The workspace names "next", "prev", "next_on_output", - * "prev_on_output" and "back_and_forth" are OK, so we check before - * stripping the double quotes */ + * "prev_on_output", "number", "back_and_forth" and "current" are OK, + * so we check before stripping the double quotes */ if (strncasecmp(target, "next", strlen("next")) == 0 || strncasecmp(target, "prev", strlen("prev")) == 0 || strncasecmp(target, "next_on_output", strlen("next_on_output")) == 0 || strncasecmp(target, "prev_on_output", strlen("prev_on_output")) == 0 || - strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0) + strncasecmp(target, "number", strlen("number")) == 0 || + strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0 || + strncasecmp(target, "current", strlen("current")) == 0) continue; if (*target == '"') target++; @@ -303,7 +305,7 @@ static void workspace_reassign_sticky(Con *con) { } -static void _workspace_show(Con *workspace, bool changed_num_workspaces) { +static void _workspace_show(Con *workspace) { Con *current, *old = NULL; /* safe-guard against showing i3-internal workspaces like __i3_scratch */ @@ -347,7 +349,6 @@ static void _workspace_show(Con *workspace, bool changed_num_workspaces) { LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name); tree_close(old, DONT_KILL_WINDOW, false, false); ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); - changed_num_workspaces = true; } } @@ -375,7 +376,7 @@ static void _workspace_show(Con *workspace, bool changed_num_workspaces) { * */ void workspace_show(Con *workspace) { - _workspace_show(workspace, false); + _workspace_show(workspace); } /* @@ -386,7 +387,7 @@ void workspace_show_by_name(const char *num) { Con *workspace; bool changed_num_workspaces; workspace = workspace_get(num, &changed_num_workspaces); - _workspace_show(workspace, changed_num_workspaces); + _workspace_show(workspace); } /*