summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2012-05-12 18:00:49 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2012-05-12 18:00:49 +0000
commitcf0c457411b017c219be0c968836b0f748e1b12c (patch)
tree23b3e4d1de33f76d40414e101a09feba5aa8aa68 /src
parent51d8264eb1e8f705635cd0af2c0e9dddaf855711 (diff)
downloadlibnsfb-cf0c457411b017c219be0c968836b0f748e1b12c.tar.gz
libnsfb-cf0c457411b017c219be0c968836b0f748e1b12c.tar.bz2
Speculative support for xcb-util 0.3.8 and xcbproto 1.6
svn path=/trunk/libnsfb/; revision=13920
Diffstat (limited to 'src')
-rw-r--r--src/surface/x.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/surface/x.c b/src/surface/x.c
index ccefacf..b9c3429 100644
--- a/src/surface/x.c
+++ b/src/surface/x.c
@@ -33,7 +33,7 @@
#include "plot.h"
#include "cursor.h"
-#if defined(NEED_HINTS_ALLOC)
+#if defined(NSFB_NEED_HINTS_ALLOC)
static xcb_size_hints_t *
xcb_alloc_size_hints(void)
{
@@ -47,6 +47,17 @@ xcb_free_size_hints(xcb_size_hints_t *hints)
}
#endif
+#if defined(NSFB_NEED_ICCCM_API_PREFIX)
+#define xcb_size_hints_set_max_size xcb_icccm_size_hints_set_max_size
+#define xcb_size_hints_set_min_size xcb_icccm_size_hints_set_min_size
+#define xcb_set_wm_size_hints xcb_icccm_set_wm_size_hints
+#endif
+
+#if (NSFB_XCBPROTO_MAJOR_VERSION > 1) || \
+ (NSFB_XCBPROTO_MAJOR_VERSION == 1 && NSFB_XCBPROTO_MINOR_VERSION >= 6)
+#define WM_NORMAL_HINTS XCB_ATOM_WM_NORMAL_HINTS
+#endif
+
#define X_BUTTON_LEFT 1
#define X_BUTTON_MIDDLE 2
#define X_BUTTON_RIGHT 3