Merge branch 'master' into next

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

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index b17329056c09ed289c2083657f7a4f567d731f1c..f82c71159d7a10abb6023e54374ebe1cdddffe4c 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -1,9 +1,10 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
+ * vim:ts=4:sw=4:expandtab
  *
- * © 2010 Axel Wagner and contributors
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
  *
- * See file LICNSE for license information
+ * xcb.c: Communicating with X
  *
  */
 #ifndef XCB_H_
@@ -12,6 +13,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;
@@ -28,10 +41,18 @@ struct xcb_color_strings_t {
 typedef struct xcb_colors_t xcb_colors_t;
 
 /*
- * Initialize xcb and use the specified fontname for text-rendering
+ * Early initialization of the connection to X11: Everything which does not
+ * depend on 'config'.
+ *
+ */
+char *init_xcb_early();
+
+/**
+ * Initialization which depends on 'config' being usable. Called after the
+ * configuration has arrived.
  *
  */
-char *init_xcb();
+void init_xcb_late(char *fontname);
 
 /*
  * Initialize the colors
@@ -82,12 +103,4 @@ void draw_bars();
  */
 void redraw_bars();
 
-/*
- * Predicts the length of text based on cached data.
- * The string has to be encoded in ucs2 and glyph_len has to be the length
- * of the string (in glyphs).
- *
- */
-uint32_t predict_text_extents(xcb_char2b_t *text, uint32_t length);
-
 #endif