]> git.sur5r.net Git - i3/i3/blobdiff - src/workspace.c
handle client messages (fullscreen window state)
[i3/i3] / src / workspace.c
index 8d76272925ff8ff5b3d9eb754ffac2147d252072..9b5593d6500e073bc88794dd2041a30d1eb871b4 100644 (file)
@@ -1,34 +1,15 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * workspace.c: Functions for modifying workspaces
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <limits.h>
-#include <err.h>
-
-#include "util.h"
-#include "data.h"
-#include "i3.h"
-#include "config.h"
-#include "xcb.h"
-#include "table.h"
-#include "randr.h"
-#include "layout.h"
-#include "workspace.h"
-#include "client.h"
-#include "log.h"
-#include "ewmh.h"
-#include "ipc.h"
+
+#include "all.h"
 
 /*
  * Returns a pointer to the workspace with the given number (starting at 0),
  * memory and initializing the data structures correctly).
  *
  */
-Workspace *workspace_get(int number) {
-        Workspace *ws = NULL;
-        TAILQ_FOREACH(ws, workspaces, workspaces)
-                if (ws->num == number)
-                        return ws;
-
-        /* If we are still there, we could not find the requested workspace. */
-        int last_ws = TAILQ_LAST(workspaces, workspaces_head)->num;
-
-        DLOG("We need to initialize that one, last ws = %d\n", last_ws);
-
-        for (int c = last_ws; c < number; c++) {
-                DLOG("Creating new ws\n");
-
-                ws = scalloc(sizeof(Workspace));
-                ws->num = c+1;
-                TAILQ_INIT(&(ws->floating_clients));
-                expand_table_cols(ws);
-                expand_table_rows(ws);
-                workspace_set_name(ws, NULL);
+Con *workspace_get(const char *num) {
+    Con *output, *workspace = NULL, *current;
+
+    /* 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;
+
+            workspace = current;
+            break;
+        }
+    }
 
-                TAILQ_INSERT_TAIL(workspaces, ws, workspaces);
+    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);
+        workspace->name = strdup(num);
 
-                ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
-        }
-        DLOG("done\n");
+        ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
+    }
 
-        ewmh_update_workarea();
+    //ewmh_update_workarea();
 
-        return ws;
+    return workspace;
 }
 
+#if 0
+
 /*
  * Sets the name (or just its number) for the given workspace. This has to
  * be called for every workspace as the rendering function
@@ -103,24 +86,42 @@ void workspace_set_name(Workspace *ws, const char *name) {
  *
  */
 bool workspace_is_visible(Workspace *ws) {
-        return (ws->output->current_workspace == ws);
+        return (ws->output != NULL && ws->output->current_workspace == ws);
 }
+#endif
+
 
 /*
  * Switches to the given workspace
  *
  */
-void workspace_show(xcb_connection_t *conn, int workspace) {
-        bool need_warp = false;
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-        /* t_ws (to workspace) is just a convenience pointer to the workspace we’re switching to */
-        Workspace *t_ws = workspace_get(workspace-1);
+void workspace_show(const char *num) {
+    Con *workspace, *current, *old;
+
+    old = con_get_workspace(focused);
 
-        DLOG("show_workspace(%d)\n", workspace);
+    workspace = workspace_get(num);
+    workspace->fullscreen_mode = CF_OUTPUT;
+    /* disable fullscreen */
+    TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes)
+        current->fullscreen_mode = CF_NONE;
 
-        /* Store current_row/current_col */
-        c_ws->current_row = current_row;
-        c_ws->current_col = current_col;
+    LOG("switching to %p\n", workspace);
+    Con *next = workspace;
+
+    while (!TAILQ_EMPTY(&(next->focus_head)))
+        next = TAILQ_FIRST(&(next->focus_head));
+
+
+    if (TAILQ_EMPTY(&(old->nodes_head))) {
+        LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
+        tree_close(old);
+    }
+
+    con_focus(next);
+    workspace->fullscreen_mode = CF_OUTPUT;
+    LOG("focused now = %p / %s\n", focused, focused->name);
+#if 0
 
         /* Check if the workspace has not been used yet */
         workspace_initialize(t_ws, c_ws->output, false);
@@ -209,8 +210,10 @@ void workspace_show(xcb_connection_t *conn, int workspace) {
                 client_warp_pointer_into(conn, last_focused);
                 xcb_flush(conn);
         }
+#endif
 }
 
+#if 0
 /*
  * Assigns the given workspace to the given output by correctly updating its
  * state and reconfiguring all the clients on this workspace.
@@ -248,12 +251,17 @@ void workspace_assign_to(Workspace *ws, Output *output, bool hide_it) {
         if (visible && !hide_it)
                 return;
 
-        workspace_unmap_clients(global_conn, ws);
-
+        /* however, if this is the current workspace, we only need to adjust
+         * the output’s current_workspace pointer (and must not unmap the
+         * windows) */
         if (c_ws == ws) {
                 DLOG("Need to adjust output->current_workspace...\n");
                 output->current_workspace = c_ws;
+                ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}");
+                return;
         }
+
+        workspace_unmap_clients(global_conn, ws);
 }
 
 /*
@@ -425,16 +433,21 @@ void workspace_unmap_clients(xcb_connection_t *conn, Workspace *u_ws) {
  */
 void workspace_update_urgent_flag(Workspace *ws) {
         Client *current;
+        bool old_flag = ws->urgent;
+        bool urgent = false;
 
         SLIST_FOREACH(current, &(ws->focus_stack), focus_clients) {
                 if (!current->urgent)
                         continue;
 
-                ws->urgent = true;
-                return;
+                urgent = true;
+                break;
         }
 
-        ws->urgent = false;
+        ws->urgent = urgent;
+
+        if (old_flag != urgent)
+                ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"urgent\"}");
 }
 
 /*
@@ -465,3 +478,4 @@ int workspace_height(Workspace *ws) {
 
         return height;
 }
+#endif