X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fworkspace.c;h=8104aa89fc35d6da21765408718255e5d06a0473;hb=36583ec6ee7ada36764a492fdaae158a5cdd04c3;hp=6a81f30e95f85495161514285ea91bdeac9ad7dc;hpb=32be3af10966addeb8c5b84e5364d9f189e6a90c;p=i3%2Fi3

diff --git a/src/workspace.c b/src/workspace.c
index 6a81f30e..8104aa89 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -17,36 +17,69 @@
  * memory and initializing the data structures correctly).
  *
  */
-Con *workspace_get(const char *num) {
-    Con *output, *workspace = NULL, *current;
+Con *workspace_get(const char *num, bool *created) {
+    Con *output, *workspace = NULL, *child;
 
     /* TODO: could that look like this in the future?
     GET_MATCHING_NODE(workspace, croot, strcasecmp(current->name, num) != 0);
     */
-    TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
-        TAILQ_FOREACH(current, &(output->nodes_head), nodes) {
-            if (strcasecmp(current->name, num) != 0)
-                    continue;
+    TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+        TAILQ_FOREACH(child, &(output_get_content(output)->nodes_head), nodes) {
+            if (strcasecmp(child->name, num) != 0)
+                continue;
 
-            workspace = current;
+            workspace = child;
             break;
         }
-    }
 
     LOG("getting ws %s\n", num);
     if (workspace == NULL) {
         LOG("need to create this one\n");
         output = con_get_output(focused);
-        LOG("got output %p\n", output);
-        workspace = con_new(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
+         * will handle CT_WORKSPACEs differently */
+        workspace = con_new(NULL);
+        char *name;
+        asprintf(&name, "[i3 con] workspace %s", num);
+        x_set_name(workspace, name);
+        free(name);
         workspace->type = CT_WORKSPACE;
-        workspace->name = strdup(num);
-        workspace->orientation = HORIZ;
+        FREE(workspace->name);
+        workspace->name = sstrdup(num);
+        /* We set ->num to the number if this workspace’s name consists only of
+         * a positive number. Otherwise it’s a named ws and num will be -1. */
+        char *end;
+        long parsed_num = strtol(num, &end, 10);
+        if (parsed_num == LONG_MIN ||
+            parsed_num == LONG_MAX ||
+            parsed_num < 0 ||
+            (end && *end != '\0'))
+            workspace->num = -1;
+        else workspace->num = parsed_num;
+        LOG("num = %d\n", workspace->num);
+
+        /* If default_orientation is set to NO_ORIENTATION we
+         * determine workspace orientation from workspace size.
+         * Otherwise we just set the orientation to default_orientation. */
+        if (config.default_orientation == NO_ORIENTATION) {
+            workspace->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ;
+            DLOG("Auto orientation. Output resolution set to (%d,%d), setting orientation to %d.\n",
+                 workspace->rect.width, workspace->rect.height, workspace->orientation);
+        } else {
+            workspace->orientation = config.default_orientation;
+        }
+
+        con_attach(workspace, content, false);
 
         ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
+        if (created != NULL)
+            *created = true;
+    }
+    else if (created != NULL) {
+        *created = false;
     }
-
-    //ewmh_update_workarea();
 
     return workspace;
 }
@@ -80,6 +113,7 @@ void workspace_set_name(Workspace *ws, const char *name) {
         else ws->text_width = 0;
         ws->utf8_name = label;
 }
+#endif
 
 /*
  * Returns true if the workspace is currently visible. Especially important for
@@ -87,44 +121,145 @@ void workspace_set_name(Workspace *ws, const char *name) {
  * workspaces.
  *
  */
-bool workspace_is_visible(Workspace *ws) {
-        return (ws->output != NULL && ws->output->current_workspace == ws);
+bool workspace_is_visible(Con *ws) {
+    Con *output = con_get_output(ws);
+    if (output == NULL)
+        return false;
+    Con *fs = con_get_fullscreen_con(output);
+    LOG("workspace visible? fs = %p, ws = %p\n", fs, ws);
+    return (fs == ws);
 }
-#endif
 
+/*
+ * XXX: we need to clean up all this recursive walking code.
+ *
+ */
+Con *_get_sticky(Con *con, const char *sticky_group, Con *exclude) {
+    Con *current;
+
+    TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
+        if (current != exclude &&
+            current->sticky_group != NULL &&
+            current->window != NULL &&
+            strcmp(current->sticky_group, sticky_group) == 0)
+            return current;
+
+        Con *recurse = _get_sticky(current, sticky_group, exclude);
+        if (recurse != NULL)
+            return recurse;
+    }
+
+    TAILQ_FOREACH(current, &(con->floating_head), floating_windows) {
+        if (current != exclude &&
+            current->sticky_group != NULL &&
+            current->window != NULL &&
+            strcmp(current->sticky_group, sticky_group) == 0)
+            return current;
+
+        Con *recurse = _get_sticky(current, sticky_group, exclude);
+        if (recurse != NULL)
+            return recurse;
+    }
+
+    return NULL;
+}
+
+/*
+ * Reassigns all child windows in sticky containers. Called when the user
+ * changes workspaces.
+ *
+ * XXX: what about sticky containers which contain containers?
+ *
+ */
+static void workspace_reassign_sticky(Con *con) {
+    Con *current;
+    /* 1: go through all containers */
+
+    /* handle all children and floating windows of this node */
+    TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
+        if (current->sticky_group == NULL) {
+            workspace_reassign_sticky(current);
+            continue;
+        }
+
+        LOG("Ah, this one is sticky: %s / %p\n", current->name, current);
+        /* 2: find a window which we can re-assign */
+        Con *output = con_get_output(current);
+        Con *src = _get_sticky(output, current->sticky_group, current);
+
+        if (src == NULL) {
+            LOG("No window found for this sticky group\n");
+            workspace_reassign_sticky(current);
+            continue;
+        }
+
+        x_move_win(src, current);
+        current->window = src->window;
+        current->mapped = true;
+        src->window = NULL;
+        src->mapped = false;
+
+        x_reparent_child(current, src);
+
+        LOG("re-assigned window from src %p to dest %p\n", src, current);
+    }
+
+    TAILQ_FOREACH(current, &(con->floating_head), floating_windows)
+        workspace_reassign_sticky(current);
+}
 
 /*
  * Switches to the given workspace
  *
  */
 void workspace_show(const char *num) {
-    Con *workspace, *current, *old;
+    Con *workspace, *current, *old = NULL;
 
-    old = con_get_workspace(focused);
+    bool changed_num_workspaces;
+    workspace = workspace_get(num, &changed_num_workspaces);
 
-    workspace = workspace_get(num);
-    if (workspace == old)
-        return;
-    workspace->fullscreen_mode = CF_OUTPUT;
-    /* disable fullscreen */
-    TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes)
+    /* disable fullscreen for the other workspaces and get the workspace we are
+     * currently on. */
+    TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes) {
+        if (current->fullscreen_mode == CF_OUTPUT)
+            old = current;
         current->fullscreen_mode = CF_NONE;
+    }
+    assert(old != NULL);
 
-    LOG("switching to %p\n", workspace);
-    Con *next = workspace;
-
-    while (!TAILQ_EMPTY(&(next->focus_head)))
-        next = TAILQ_FIRST(&(next->focus_head));
+    /* enable fullscreen for the target workspace. If it happens to be the
+     * same one we are currently on anyways, we can stop here. */
+    workspace->fullscreen_mode = CF_OUTPUT;
+    if (workspace == con_get_workspace(focused)) {
+        DLOG("Not switching, already there.\n");
+        return;
+    }
 
+    workspace_reassign_sticky(workspace);
 
-    if (TAILQ_EMPTY(&(old->nodes_head))) {
-        LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
-        tree_close(old, false);
+    LOG("switching to %p\n", workspace);
+    Con *next = con_descend_focused(workspace);
+
+    if (old && TAILQ_EMPTY(&(old->nodes_head)) && TAILQ_EMPTY(&(old->floating_head))) {
+        /* check if this workspace is currently visible */
+        if (!workspace_is_visible(old)) {
+            LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
+            tree_close(old, false, false);
+            ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
+            changed_num_workspaces = true;
+        }
     }
 
     con_focus(next);
     workspace->fullscreen_mode = CF_OUTPUT;
     LOG("focused now = %p / %s\n", focused, focused->name);
+
+    /* Update the EWMH hints */
+    if (changed_num_workspaces)
+        ewmh_update_workarea();
+    ewmh_update_current_desktop();
+
+    ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}");
 #if 0
 
         /* Check if the workspace has not been used yet */
@@ -335,100 +470,13 @@ Workspace *get_first_workspace_for_output(Output *output) {
                 int last_ws = 0;
                 TAILQ_FOREACH(ws, workspaces, workspaces)
                         last_ws = ws->num;
-                result = workspace_get(last_ws + 1);
+                result = workspace_get(last_ws + 1, NULL);
         }
 
         workspace_initialize(result, output, false);
         return result;
 }
 
-/*
- * Maps all clients (and stack windows) of the given workspace.
- *
- */
-void workspace_map_clients(xcb_connection_t *conn, Workspace *ws) {
-        Client *client;
-
-        ignore_enter_notify_forall(conn, ws, true);
-
-        /* Map all clients on the new workspace */
-        FOR_TABLE(ws)
-                CIRCLEQ_FOREACH(client, &(ws->table[cols][rows]->clients), clients)
-                        client_map(conn, client);
-
-        /* Map all floating clients */
-        if (!ws->floating_hidden)
-                TAILQ_FOREACH(client, &(ws->floating_clients), floating_clients)
-                        client_map(conn, client);
-
-        /* Map all stack windows, if any */
-        struct Stack_Window *stack_win;
-        SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                if (stack_win->container->workspace == ws && stack_win->rect.height > 0)
-                        xcb_map_window(conn, stack_win->window);
-
-        ignore_enter_notify_forall(conn, ws, false);
-}
-
-/*
- * Unmaps all clients (and stack windows) of the given workspace.
- *
- * This needs to be called separately when temporarily rendering
- * a workspace which is not the active workspace to force
- * reconfiguration of all clients, like in src/xinerama.c when
- * re-assigning a workspace to another screen.
- *
- */
-void workspace_unmap_clients(xcb_connection_t *conn, Workspace *u_ws) {
-        Client *client;
-        struct Stack_Window *stack_win;
-
-        /* Ignore notify events because they would cause focus to be changed */
-        ignore_enter_notify_forall(conn, u_ws, true);
-
-        /* Unmap all clients of the given workspace */
-        int unmapped_clients = 0;
-        FOR_TABLE(u_ws)
-                CIRCLEQ_FOREACH(client, &(u_ws->table[cols][rows]->clients), clients) {
-                        DLOG("unmapping normal client %p / %p / %p\n", client, client->frame, client->child);
-                        client_unmap(conn, client);
-                        unmapped_clients++;
-                }
-
-        /* To find floating clients, we traverse the focus stack */
-        SLIST_FOREACH(client, &(u_ws->focus_stack), focus_clients) {
-                if (!client_is_floating(client))
-                        continue;
-
-                DLOG("unmapping floating client %p / %p / %p\n", client, client->frame, client->child);
-
-                client_unmap(conn, client);
-                unmapped_clients++;
-        }
-
-        /* If we did not unmap any clients, the workspace is empty and we can destroy it, at least
-         * if it is not the current workspace. */
-        if (unmapped_clients == 0 && u_ws != c_ws) {
-                /* Re-assign the workspace of all dock clients which use this workspace */
-                Client *dock;
-                DLOG("workspace %p is empty\n", u_ws);
-                SLIST_FOREACH(dock, &(u_ws->output->dock_clients), dock_clients) {
-                        if (dock->workspace != u_ws)
-                                continue;
-
-                        DLOG("Re-assigning dock client to c_ws (%p)\n", c_ws);
-                        dock->workspace = c_ws;
-                }
-                u_ws->output = NULL;
-        }
-
-        /* Unmap the stack windows on the given workspace, if any */
-        SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                if (stack_win->container->workspace == u_ws)
-                        xcb_unmap_window(conn, stack_win->window);
-
-        ignore_enter_notify_forall(conn, u_ws, false);
-}
 #endif
 
 static bool get_urgency_flag(Con *con) {
@@ -458,34 +506,41 @@ void workspace_update_urgent_flag(Con *ws) {
         ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"urgent\"}");
 }
 
-#if 0
-
 /*
- * Returns the width of the workspace.
+ * 'Forces' workspace orientation by moving all cons into a new split-con with
+ * the same orientation as the workspace and then changing the workspace
+ * orientation.
  *
  */
-int workspace_width(Workspace *ws) {
-        return ws->rect.width;
-}
+void ws_force_orientation(Con *ws, orientation_t orientation) {
+    /* 1: create a new split container */
+    Con *split = con_new(NULL);
+    split->parent = ws;
+
+    /* 2: copy layout and orientation from workspace */
+    split->layout = ws->layout;
+    split->orientation = ws->orientation;
+
+    Con *old_focused = TAILQ_FIRST(&(ws->focus_head));
+
+    /* 3: move the existing cons of this workspace below the new con */
+    DLOG("Moving cons\n");
+    while (!TAILQ_EMPTY(&(ws->nodes_head))) {
+        Con *child = TAILQ_FIRST(&(ws->nodes_head));
+        con_detach(child);
+        con_attach(child, split, true);
+    }
 
-/*
- * Returns the effective height of the workspace (without the internal bar and
- * without dock clients).
- *
- */
-int workspace_height(Workspace *ws) {
-        int height = ws->rect.height;
-        i3Font *font = load_font(global_conn, config.font);
+    /* 4: switch workspace orientation */
+    ws->orientation = orientation;
 
-        /* Reserve space for dock clients */
-        Client *client;
-        SLIST_FOREACH(client, &(ws->output->dock_clients), dock_clients)
-                height -= client->desired_height;
+    /* 5: attach the new split container to the workspace */
+    DLOG("Attaching new split to ws\n");
+    con_attach(split, ws, false);
 
-        /* Space for the internal bar */
-        if (!config.disable_workspace_bar)
-                height -= (font->height + 6);
+    /* 6: fix the percentages */
+    con_fix_percent(ws);
 
-        return height;
+    if (old_focused)
+        con_focus(old_focused);
 }
-#endif