Merge branch 'master' into next

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

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 0adb29ab1d966aa03ffba5108a4da9c9a75b024d..c1b7cc14e3575bd98051ddd3040b89af16fd90aa 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -1,7 +1,7 @@
 /*
  * i3bar - an xcb-based status- and ws-bar for i3
  *
- * © 2010 Axel Wagner and contributors
+ * © 2010-2011 Axel Wagner and contributors
  *
  * See file LICNSE for license information
  *
@@ -12,6 +12,18 @@
 #include <stdint.h>
 //#include "outputs.h"
 
+#ifdef XCB_COMPAT
+#define XCB_ATOM_CARDINAL CARDINAL
+#endif
+
+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
+#define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
+#define SYSTEM_TRAY_REQUEST_DOCK    0
+#define SYSTEM_TRAY_BEGIN_MESSAGE   1
+#define SYSTEM_TRAY_CANCEL_MESSAGE  2
+#define XEMBED_MAPPED                   (1 << 0)
+#define XEMBED_EMBEDDED_NOTIFY         0
+
 struct xcb_color_strings_t {
     char *bar_fg;
     char *bar_bg;
@@ -19,6 +31,8 @@ struct xcb_color_strings_t {
     char *active_ws_bg;
     char *inactive_ws_fg;
     char *inactive_ws_bg;
+    char *focus_ws_bg;
+    char *focus_ws_fg;
     char *urgent_ws_bg;
     char *urgent_ws_fg;
 };
@@ -29,7 +43,7 @@ typedef struct xcb_colors_t xcb_colors_t;
  * Initialize xcb and use the specified fontname for text-rendering
  *
  */
-char *init_xcb();
+char *init_xcb(char *fontname);
 
 /*
  * Initialize the colors
@@ -56,6 +70,12 @@ void get_atoms();
  */
 void destroy_window(i3_output *output);
 
+/*
+ * Reallocate the statusline-buffer
+ *
+ */
+void realloc_sl_buffer();
+
 /*
  * Reconfigure all bars and create new for newly activated outputs
  *