fix(xcb): check for composite extension (#1430)

* fix(xcb): check for composite extension

* fix(travis): add xcb-composite to deps

* fix(xcb): always include composite when building
This commit is contained in:
NBonaparte 2018-12-02 07:39:14 -08:00 committed by Patrick Ziegler
parent 9725f8fb04
commit 35c0c4a343
4 changed files with 3 additions and 6 deletions

View File

@ -22,6 +22,7 @@ addons:
- &clang
- libstdc++-5-dev
- &base_deps
- libxcb-composite0-dev
- libxcb-ewmh-dev
- libxcb-icccm4-dev
- libxcb-image0-dev

View File

@ -45,7 +45,7 @@ option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON)
option(WITH_XRENDER "xcb-render support" OFF)
option(WITH_XDAMAGE "xcb-damage support" OFF)
option(WITH_XSYNC "xcb-sync support" OFF)
option(WITH_XCOMPOSITE "xcb-composite support" OFF)
option(WITH_XCOMPOSITE "xcb-composite support" ON)
option(WITH_XKB "xcb-xkb support" ON)
option(WITH_XRM "xcb-xrm support" ON)
option(WITH_XCURSOR "xcb-cursor support" ON)

View File

@ -14,9 +14,7 @@
#if WITH_XSYNC
#include "x11/extensions/sync.hpp"
#endif
#if WITH_XCOMPOSITE
#include "x11/extensions/composite.hpp"
#endif
#if WITH_XKB
#include "x11/extensions/xkb.hpp"
#endif

View File

@ -8,14 +8,12 @@ namespace composite_util {
/**
* Query for the XCOMPOSITE extension
*/
void query_extension(connection&) {
#if 0
void query_extension(connection& conn) {
conn.composite().query_version(XCB_COMPOSITE_MAJOR_VERSION, XCB_COMPOSITE_MINOR_VERSION);
if (!conn.extension<xpp::composite::extension>()->present) {
throw application_error("Missing X extension: Composite");
}
#endif
}
}