#include "all.h"
#include "yajl_utils.h"
-/* Stores a copy of the name of the last used workspace for the workspace
- * back-and-forth switching. */
-static char *previous_workspace_name = NULL;
+/*
+ * Stores a copy of the name of the last used workspace for the workspace
+ * back-and-forth switching.
+ *
+ */
+char *previous_workspace_name = NULL;
/* NULL-terminated list of workspace names (in order) extracted from
* keybindings. */
* given name or number or NULL if no such output exists. If there is a
* workspace with a matching name and another workspace with a matching number,
* the output assigned to the first one is returned.
+ * The order of the 'ws_assignments' queue is respected: if multiple assignments
+ * match the specified workspace, the first one is returned.
* If 'name' is NULL it will be ignored.
* If 'parsed_num' is -1 it will be ignored.
*
*/
static Con *get_assigned_output(const char *name, long parsed_num) {
Con *output = NULL;
-
struct Workspace_Assignment *assignment;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
if (name && strcmp(assignment->name, name) == 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) {
+ Output *assigned_by_name = get_output_by_name(assignment->output, true);
+ if (assigned_by_name) {
+ /* When the name matches exactly, skip numbered assignments. */
+ return assigned_by_name->con;
+ }
+ } else if (!output && /* Only keep the first numbered assignment. */
+ 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));
+ Output *assigned_by_num = get_output_by_name(assignment->output, true);
+ if (assigned_by_num) {
+ output = assigned_by_num->con;
+ }
}
}
return output;
}
+/*
+ * Returns true if the first output assigned to a workspace with the given
+ * workspace assignment is the same as the given output.
+ */
+bool output_triggers_assignment(Output *output, struct Workspace_Assignment *assignment) {
+ Con *assigned = get_assigned_output(assignment->name, -1);
+ return assigned && assigned == output->con;
+}
+
/*
* Returns a pointer to the workspace with the given number (starting at 0),
* creating the workspace if necessary (by allocating the necessary amount of
DLOG("Getting next unused workspace by number\n");
int c = 0;
while (exists) {
- exists = (get_existing_workspace_by_num(++c) != NULL);
+ c++;
+ Con *assigned = get_assigned_output(NULL, c);
+ exists = (get_existing_workspace_by_num(c) || (assigned && assigned != output->con));
DLOG("result for ws %d: exists = %d\n", c, exists);
}
ws->num = c;
* XXX: we need to clean up all this recursive walking code.
*
*/
-Con *_get_sticky(Con *con, const char *sticky_group, Con *exclude) {
+static Con *_get_sticky(Con *con, const char *sticky_group, Con *exclude) {
Con *current;
TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
*/
void workspace_show(Con *workspace) {
Con *current, *old = NULL;
- Con *old_focus = focused;
/* safe-guard against showing i3-internal workspaces like __i3_scratch */
if (con_is_internal(workspace))
return;
}
+ /* Used to correctly update focus when pushing sticky windows. Holds the
+ * previously focused container in the same output as workspace. For
+ * example, if a sticky window is focused and then we switch focus to a
+ * workspace in another output and then switch to a third workspace in the
+ * first output, the sticky window needs to be refocused. */
+ Con *old_focus = old ? con_descend_focused(old) : NULL;
+
/* Remember currently focused workspace for switching back to it later with
* the 'workspace back_and_forth' command.
* NOTE: We have to duplicate the name as the original will be freed when
if (!workspace_is_visible(old)) {
LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
yajl_gen gen = ipc_marshal_workspace_event("empty", old, NULL);
- tree_close_internal(old, DONT_KILL_WINDOW, false, false);
+ tree_close_internal(old, DONT_KILL_WINDOW, false);
const unsigned char *payload;
ylength length;
return new;
}
-/**
+/*
* Creates a new container and re-parents all of children from the given
* workspace into it.
*
return new;
}
-/**
+/*
* Move the given workspace to the specified output.
* This returns true if and only if moving the workspace was successful.
*/
LOG("got output %p with content %p\n", output, content);
Con *previously_visible_ws = TAILQ_FIRST(&(content->focus_head));
- LOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
+ if (previously_visible_ws) {
+ DLOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
+ } else {
+ DLOG("No previously visible workspace on output.\n");
+ }
bool workspace_was_visible = workspace_is_visible(ws);
if (con_num_children(ws->parent) == 1) {
bool used_assignment = false;
struct Workspace_Assignment *assignment;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
- if (assignment->output == NULL || strcmp(assignment->output, output_primary_name(current_output)) != 0)
+ if (!output_triggers_assignment(current_output, assignment)) {
continue;
+ }
/* check if this workspace is already attached to the tree */
if (get_existing_workspace_by_name(assignment->name) != NULL) {
continue;
workspace_show(ws);
}
+ if (!previously_visible_ws) {
+ return true;
+ }
+
/* NB: We cannot simply work with previously_visible_ws since it might
* have been cleaned up by workspace_show() already, depending on the
* focus order/number of other workspaces on the output.