*
*/
#include "all.h"
-#include "yajl_utils.h"
-
-#include <yajl/yajl_gen.h>
/* Stores a copy of the name of the last used workspace for the workspace
* back-and-forth switching. */
Con *output, *workspace = NULL;
TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
- GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, num));
+ GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, num));
if (workspace == NULL) {
LOG("Creating new workspace \"%s\"\n", num);
output = con_get_output(focused);
/* look for assignments */
struct Workspace_Assignment *assignment;
- TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
- if (strcmp(assignment->name, num) != 0)
- continue;
- LOG("Found workspace assignment to output \"%s\"\n", assignment->output);
- GREP_FIRST(output, croot, !strcmp(child->name, assignment->output));
- break;
+ /* We set workspace->num to the number if this workspace’s name begins
+ * with a positive number. Otherwise it’s a named ws and num will be
+ * -1. */
+ long parsed_num = ws_name_to_number(num);
+
+ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+ if (strcmp(assignment->name, num) == 0) {
+ DLOG("Found workspace name assignment to output \"%s\"\n", assignment->output);
+ GREP_FIRST(output, croot, !strcmp(child->name, assignment->output));
+ break;
+ } else if (parsed_num != -1 && name_is_digits(assignment->name) && ws_name_to_number(assignment->name) == parsed_num) {
+ DLOG("Found workspace number assignment to output \"%s\"\n", assignment->output);
+ GREP_FIRST(output, croot, !strcmp(child->name, assignment->output));
+ }
}
+
Con *content = output_get_content(output);
LOG("got output %p with content %p\n", output, content);
/* We need to attach this container after setting its type. con_attach
FREE(workspace->name);
workspace->name = sstrdup(num);
workspace->workspace_layout = config.default_layout;
- /* We set ->num to the number if this workspace’s name begins with a
- * positive number. Otherwise it’s a named ws and num will be -1. */
- char *endptr = NULL;
- long parsed_num = strtol(num, &endptr, 10);
- if (parsed_num == LONG_MIN ||
- parsed_num == LONG_MAX ||
- parsed_num < 0 ||
- endptr == num)
- workspace->num = -1;
- else workspace->num = parsed_num;
+ workspace->num = parsed_num;
LOG("num = %d\n", workspace->num);
workspace->parent = content;
con_attach(workspace, content, false);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
+ ewmh_update_number_of_desktops();
+ ewmh_update_desktop_names();
+ ewmh_update_desktop_viewport();
if (created != NULL)
*created = true;
- }
- else if (created != NULL) {
+ } else if (created != NULL) {
*created = false;
}
continue;
DLOG("relevant command = %s\n", bind->command);
char *target = bind->command + strlen("workspace ");
+ while ((*target == ' ' || *target == '\t') && target != '\0')
+ target++;
/* We check if this is the workspace
* next/prev/next_on_output/prev_on_output/back_and_forth/number command.
* Beware: The workspace names "next", "prev", "next_on_output",
continue;
if (*target == '"')
target++;
+ if (strncasecmp(target, "__", strlen("__")) == 0) {
+ LOG("Cannot create workspace \"%s\". Names starting with __ are i3-internal.\n", target);
+ continue;
+ }
FREE(ws->name);
ws->name = strdup(target);
- if (ws->name[strlen(ws->name)-1] == '"')
- ws->name[strlen(ws->name)-1] = '\0';
+ if (ws->name[strlen(ws->name) - 1] == '"')
+ ws->name[strlen(ws->name) - 1] = '\0';
DLOG("trying name *%s*\n", ws->name);
/* Ensure that this workspace is not assigned to a different output —
current = NULL;
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
- GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
+ GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
exists = (current != NULL);
if (!exists) {
/* Set ->num to the number of the workspace, if the name actually
* is a number or starts with a number */
- char *endptr = NULL;
- long parsed_num = strtol(ws->name, &endptr, 10);
- if (parsed_num == LONG_MIN ||
- parsed_num == LONG_MAX ||
- parsed_num < 0 ||
- endptr == ws->name)
- ws->num = -1;
- else ws->num = parsed_num;
+ ws->num = ws_name_to_number(ws->name);
LOG("Used number %d for workspace with name %s\n", ws->num, ws->name);
break;
while (exists) {
c++;
- FREE(ws->name);
- sasprintf(&(ws->name), "%d", c);
+ ws->num = c;
current = NULL;
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
- GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
+ GREP_FIRST(current, output_get_content(out), child->num == ws->num);
exists = (current != NULL);
- DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
+ DLOG("result for ws %d: exists = %d\n", c, exists);
}
- ws->num = c;
+ sasprintf(&(ws->name), "%d", c);
}
con_attach(ws, content, false);
return ws;
}
-
/*
* Returns true if the workspace is currently visible. Especially important for
* multi-monitor environments, as they can have multiple currenlty active
}
TAILQ_FOREACH(current, &(con->floating_head), floating_windows)
- workspace_reassign_sticky(current);
+ workspace_reassign_sticky(current);
}
/*
FREE(con->urgency_timer);
}
-/*
- * For the "focus" event we send, along the usual "change" field, also the
- * current and previous workspace, in "current" and "old" respectively.
- */
-static void ipc_send_workspace_focus_event(Con *current, Con *old) {
- setlocale(LC_NUMERIC, "C");
- yajl_gen gen = ygenalloc();
-
- y(map_open);
-
- ystr("change");
- ystr("focus");
-
- ystr("current");
- dump_node(gen, current, false);
-
- ystr("old");
- if (old == NULL)
- y(null);
- else
- dump_node(gen, old, false);
-
- y(map_close);
-
- const unsigned char *payload;
- ylength length;
- y(get_buf, &payload, &length);
-
- ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, (const char *)payload);
- y(free);
- setlocale(LC_NUMERIC, "");
-}
-
static void _workspace_show(Con *workspace) {
Con *current, *old = NULL;
* the corresponding workspace is cleaned up.
* NOTE: Internal cons such as __i3_scratch (when a scratchpad window is
* focused) are skipped, see bug #868. */
- if (current && !(current->name[0] == '_' && current->name[1] == '_')) {
+ if (current && !con_is_internal(current)) {
FREE(previous_workspace_name);
if (current) {
previous_workspace_name = sstrdup(current->name);
if (focused->urgency_timer == NULL) {
DLOG("Deferring reset of urgency flag of con %p on newly shown workspace %p\n",
- focused, workspace);
+ focused, workspace);
focused->urgency_timer = scalloc(sizeof(struct ev_timer));
/* use a repeating timer to allow for easy resets */
ev_timer_init(focused->urgency_timer, workspace_defer_update_urgent_hint_cb,
- config.workspace_urgency_timer, config.workspace_urgency_timer);
+ config.workspace_urgency_timer, config.workspace_urgency_timer);
focused->urgency_timer->data = focused;
ev_timer_start(main_loop, focused->urgency_timer);
} else {
DLOG("Resetting urgency timer of con %p on workspace %p\n",
- focused, workspace);
+ focused, workspace);
ev_timer_again(main_loop, focused->urgency_timer);
}
} else
con_focus(next);
- ipc_send_workspace_focus_event(workspace, old);
+ ipc_send_workspace_focus_event(workspace, current);
DLOG("old = %p / %s\n", old, (old ? old->name : "(null)"));
/* Close old workspace if necessary. This must be done *after* doing
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\"}");
+ ewmh_update_number_of_desktops();
+ ewmh_update_desktop_names();
+ ewmh_update_desktop_viewport();
}
}
* Focuses the next workspace.
*
*/
-Con* workspace_next(void) {
+Con *workspace_next(void) {
Con *current = con_get_workspace(focused);
Con *next = NULL;
Con *output;
* Focuses the previous workspace.
*
*/
-Con* workspace_prev(void) {
+Con *workspace_prev(void) {
Con *current = con_get_workspace(focused);
Con *prev = NULL;
Con *output;
return prev;
}
-
/*
* Focuses the next workspace on the same output.
*
*/
-Con* workspace_next_on_output(void) {
+Con *workspace_next_on_output(void) {
Con *current = con_get_workspace(focused);
Con *next = NULL;
- Con *output = con_get_output(focused);
+ Con *output = con_get_output(focused);
if (current->num == -1) {
/* If currently a named workspace, find next named workspace. */
* relative order between the list of workspaces. */
if (current->num < child->num && (!next || child->num < next->num))
next = child;
- }
}
+ }
/* Find next named workspace. */
if (!next) {
* Focuses the previous workspace on same output.
*
*/
-Con* workspace_prev_on_output(void) {
+Con *workspace_prev_on_output(void) {
Con *current = con_get_workspace(focused);
Con *prev = NULL;
- Con *output = con_get_output(focused);
+ Con *output = con_get_output(focused);
DLOG("output = %s\n", output->name);
if (current->num == -1) {
NODES_FOREACH_REVERSE(output_get_content(output)) {
if (child->type != CT_WORKSPACE || child->num == -1)
continue;
- /* Need to check child against current and previous because we
+ /* Need to check child against current and previous because we
* are traversing multiple lists and thus are not guaranteed
* the relative order between the list of workspaces. */
if (current->num > child->num && (!prev || child->num > prev->num))
static bool get_urgency_flag(Con *con) {
Con *child;
TAILQ_FOREACH(child, &(con->nodes_head), nodes)
- if (child->urgent || get_urgency_flag(child))
- return true;
+ if (child->urgent || get_urgency_flag(child))
+ return true;
TAILQ_FOREACH(child, &(con->floating_head), floating_windows)
- if (child->urgent || get_urgency_flag(child))
- return true;
+ if (child->urgent || get_urgency_flag(child))
+ return true;
return false;
}
new->layout = ws->layout;
DLOG("Moving children of workspace %p / %s into container %p\n",
- ws, ws->name, new);
+ ws, ws->name, new);
Con *child;
while (!TAILQ_EMPTY(&(ws->nodes_head))) {