mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-x11: Only use xcb_poll_for_queued_event if we have it

Browse Source 
Otherwise we can just fall back to xcb_poll_for_event, and just do a
harmless read on the socket.
This commit is contained in:
Kristian Høgsberg 2011-04-25 15:41:59 -04:00
parent b5819dc61d
commit 82ed0423a1
2 changed files with 13 additions and 0 deletions

4
compositor/compositor-x11.c

@ -383,7 +383,11 @@ x11_compositor_next_event(struct x11_compositor *c,
if (mask & WL_EVENT_READABLE) {
*event = xcb_poll_for_event(c->conn);
} else {
#ifdef HAVE_XCB_POLL_FOR_QUEUED_EVENT
*event = xcb_poll_for_queued_event(c->conn);
#else
*event = xcb_poll_for_event(c->conn);
#endif
}
return *event != NULL;

9
configure.ac

@ -21,6 +21,15 @@ LT_INIT
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES([XCB], xcb)
xcb_save_LIBS=$LIBS
xcb_save_CFLAGS=$CFLAGS
CFLAGS=$XCB_CFLAGS
LIBS=$XCB_LIBS
AC_CHECK_FUNCS([xcb_poll_for_queued_event])
LIBS=$xcb_save_LIBS
CFLAGS=$xcb_save_CFLAGS
AC_CHECK_FUNC([dlopen], [],
AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
AC_SUBST(DLOPEN_LIBS)