Merge branch 'master' into next

[i3/i3] / i3bar / include / workspaces.h

diff --git a/i3bar/include/workspaces.h b/i3bar/include/workspaces.h
index d4975a1e050f316265b66dceacf44a4b5eb1bd18..5fe1ba1efc4da6214e02681a98ede5ee206b9653 100644 (file)
--- a/i3bar/include/workspaces.h
+++ b/i3bar/include/workspaces.h
@@ -1,27 +1,46 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
+ *
+ * workspaces.c: Maintaining the workspace-lists
+ *
+ */
 #ifndef WORKSPACES_H_
 #define WORKSPACES_H_
 
+#include <xcb/xproto.h>
+
 #include "common.h"
-#include "outputs.h"
 
-typedef struct i3_ws_t i3_ws;
+typedef struct i3_ws i3_ws;
+
+TAILQ_HEAD(ws_head, i3_ws);
 
-i3_ws* workspaces;
+/*
+ * Start parsing the received json-string
+ *
+ */
+void parse_workspaces_json(char *json);
 
-void parse_workspaces_json();
-void free_workspaces();
+/*
+ * free() all workspace data-structures
+ *
+ */
+void free_workspaces(void);
 
-struct i3_ws_t {
-       int             num;
-       char*           name;
-       int             name_width;
-       bool            visible;
-       bool            focused;
-       bool            urgent;
-       rect            rect;
-       i3_output*      output;
+struct i3_ws {
+    int                num;         /* The internal number of the ws */
+    i3String           *name;       /* The name of the ws */
+    int                name_width;  /* The rendered width of the name */
+    bool               visible;     /* If the ws is currently visible on an output */
+    bool               focused;     /* If the ws is currently focused */
+    bool               urgent;      /* If the urgent-hint of the ws is set */
+    rect               rect;        /* The rect of the ws (not used (yet)) */
+    struct i3_output   *output;     /* The current output of the ws */
 
-       i3_ws*          next;
+    TAILQ_ENTRY(i3_ws) tailq;       /* Pointer for the TAILQ-Macro */
 };
 
 #endif