Merge branch 'master' into next

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

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 431c46945a9af23139d17dcea89b45c8a77cdfc3..74bd21528501d3b4701043ef51691c30e2891a61 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -1,19 +1,38 @@
+/*
+ * i3bar - an xcb-based status- and ws-bar for i3
+ *
+ * © 2010-2011 Axel Wagner and contributors
+ *
+ * See file LICNSE for license information
+ *
+ */
 #ifndef COMMON_H_
 #define COMMON_H_
 
-#include "util.h"
-
-typedef int bool;
+#include <stdbool.h>
 
 typedef struct rect_t rect;
 
+struct ev_loop* main_loop;
+char            *statusline;
+char            *statusline_buffer;
+
 struct rect_t {
-       int     x;
-       int     y;
-       int     w;
-       int     h;
+    int x;
+    int y;
+    int w;
+    int h;
 };
 
-struct ev_loop* main_loop;
+#include "queue.h"
+#include "child.h"
+#include "ipc.h"
+#include "outputs.h"
+#include "util.h"
+#include "workspaces.h"
+#include "trayclients.h"
+#include "xcb.h"
+#include "ucs2_to_utf8.h"
+#include "config.h"
 
 #endif