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

compositor-x11: Remove support for ancient XCB

Browse Source 
We had two non-pkg-config check paths in the configure script, to
support XCB functionality used before XCB had had an accompanying
release: xcb_poll_for_queued_event (released in 1.8, 2012), and a
usable XKB event mechanism (released in 1.9, 2013).

Convert the former to a version-based hard dependency, and the latter to
a version-based soft dependency. This avoids two compiler checks.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Daniel Stone
2016-11-29 12:03:35 +00:00
parent b51e6ed710
commit f86e67d01f
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-x11.c
+2 -7
View File
@@ -1298,15 +1298,10 @@ static int
x11_backend_next_event(struct x11_backend *b,
xcb_generic_event_t **event, uint32_t mask)
{
if (mask & WL_EVENT_READABLE) {
if (mask & WL_EVENT_READABLE)
*event = xcb_poll_for_event(b->conn);
} else {
#ifdef HAVE_XCB_POLL_FOR_QUEUED_EVENT
else
*event = xcb_poll_for_queued_event(b->conn);
#else
*event = xcb_poll_for_event(b->conn);
#endif
}
return *event != NULL;
}