541-resize-set-tiling.t: fix "my" variable mask warnings

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

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 835105e7fe7bde2a7315c9bb659cbce66a854697..7783e8778575b26e309c8415c1684985d68eb418 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -9,13 +9,11 @@
  */
 #pragma once
 
+#include <config.h>
+
 #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
@@ -24,10 +22,17 @@
 #define XEMBED_MAPPED (1 << 0)
 #define XEMBED_EMBEDDED_NOTIFY 0
 
+/* We define xcb_request_failed as a macro to include the relevant line number */
+#define xcb_request_failed(cookie, err_msg) _xcb_request_failed(cookie, err_msg, __LINE__)
+int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line);
+
 struct xcb_color_strings_t {
     char *bar_fg;
     char *bar_bg;
     char *sep_fg;
+    char *focus_bar_fg;
+    char *focus_bar_bg;
+    char *focus_sep_fg;
     char *active_ws_fg;
     char *active_ws_bg;
     char *active_ws_border;