Merge branch 'master' into next

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

diff --git a/i3bar/include/outputs.h b/i3bar/include/outputs.h
index 0c24152752ca40472cfcd4cac2b73010ff3e566d..c6402a5b620b987569769862e2d5b02890bb9cba 100644 (file)
--- a/i3bar/include/outputs.h
+++ b/i3bar/include/outputs.h
@@ -1,27 +1,55 @@
+/*
+ * i3bar - an xcb-based status- and ws-bar for i3
+ *
+ * © 2010-2011 Axel Wagner and contributors
+ *
+ * See file LICNSE for license information
+ *
+ */
 #ifndef OUTPUTS_H_
 #define OUTPUTS_H_
 
-#include "common.h"
 #include <xcb/xcb.h>
 
-typedef struct i3_output_t i3_output;
+#include "common.h"
+
+typedef struct i3_output i3_output;
+
+SLIST_HEAD(outputs_head, i3_output);
+struct outputs_head *outputs;
+
+/*
+ * Start parsing the received json-string
+ *
+ */
+void parse_outputs_json(char* json);
+
+/*
+ * Initiate the output-list
+ *
+ */
+void init_outputs();
 
-i3_output* outputs;
+/*
+ * Returns the output with the given name
+ *
+ */
+i3_output* get_output_by_name(char* name);
 
-void           parse_outputs_json(char* json);
-void           free_outputs();
-i3_output*     get_output_by_name(char* name);
+struct i3_output {
+    char*          name;          /* Name of the output */
+    bool           active;        /* If the output is active */
+    int            ws;            /* The number of the currently visible ws */
+    rect           rect;          /* The rect (relative to the root-win) */
 
-struct i3_output_t {
-       char*           name;
-       bool            active;
-       int             ws;
-       rect            rect;
+    xcb_window_t   bar;           /* The id of the bar of the output */
+    xcb_pixmap_t   buffer;        /* An extra pixmap for double-buffering */
+    xcb_gcontext_t bargc;         /* The graphical context of the bar */
 
-       xcb_window_t    win;
-       xcb_gcontext_t  gctx;
+    struct ws_head *workspaces;   /* The workspaces on this output */
+    struct tc_head *trayclients;  /* The tray clients on this output */
 
-       i3_output*      next;
+    SLIST_ENTRY(i3_output) slist; /* Pointer for the SLIST-Macro */
 };
 
 #endif