Merge branch 'master' into next

[i3/i3] / include / xcb_compat.h

diff --git a/include/xcb_compat.h b/include/xcb_compat.h
index 1282f6cb0a81f66225bceed81fcf53dfc2670950..fc09a254323953afb13a7ed76147e0e988f6d719 100644 (file)
--- a/include/xcb_compat.h
+++ b/include/xcb_compat.h
@@ -1,7 +1,19 @@
-#ifndef _XCB_COMPAT_H
-#define _XCB_COMPAT_H
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * xcb_compat.h: uses #define to create aliases for xcb functions which got
+ *               renamed. Makes the code work with >= 0.3.8 xcb-util and
+ *               older versions.
+ *
+ */
+#ifndef I3_XCB_COMPAT_H
+#define I3_XCB_COMPAT_H
 
 #define xcb_icccm_get_wm_protocols_reply_t xcb_get_wm_protocols_reply_t
+#define xcb_icccm_get_wm_protocols xcb_get_wm_protocols
 #define xcb_icccm_get_wm_protocols_unchecked xcb_get_wm_protocols_unchecked
 #define xcb_icccm_get_wm_protocols_reply xcb_get_wm_protocols_reply
 #define xcb_icccm_get_wm_protocols_reply_wipe xcb_get_wm_protocols_reply_wipe
@@ -15,12 +27,21 @@
 #define XCB_ICCCM_SIZE_HINT_BASE_SIZE XCB_SIZE_HINT_BASE_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_ASPECT XCB_SIZE_HINT_P_ASPECT
 #define xcb_icccm_wm_hints_t xcb_wm_hints_t
+#define xcb_icccm_get_wm_hints xcb_get_wm_hints
 #define xcb_icccm_get_wm_hints_from_reply xcb_get_wm_hints_from_reply
 #define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply
 #define xcb_icccm_get_wm_hints_unchecked xcb_get_wm_hints_unchecked
 #define xcb_icccm_wm_hints_get_urgency xcb_wm_hints_get_urgency
 #define xcb_icccm_get_wm_transient_for_from_reply xcb_get_wm_transient_for_from_reply
-#define xcb_icccm_get_wm_transient_for_reply xcb_get_wm_transient_for_reply
-#define xcb_icccm_get_wm_transient_for_unchecked xcb_get_wm_transient_for_unchecked
+
+#define XCB_ATOM_CARDINAL CARDINAL
+#define XCB_ATOM_WINDOW WINDOW
+#define XCB_ATOM_WM_TRANSIENT_FOR WM_TRANSIENT_FOR
+#define XCB_ATOM_WM_NAME WM_NAME
+#define XCB_ATOM_WM_CLASS WM_CLASS
+#define XCB_ATOM_WM_HINTS WM_HINTS
+#define XCB_ATOM_ATOM ATOM
+#define XCB_ATOM_WM_NORMAL_HINTS WM_NORMAL_HINTS
+#define XCB_ATOM_STRING STRING
 
 #endif