aboutsummaryrefslogtreecommitdiff
path: root/backend/x11
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-04-06 11:59:57 +0200
committerKenny Levinsen <kl@kl.wtf>2021-04-09 21:54:38 +0200
commit1eb38e001503636a8e5058051e9256d70f1bffcc (patch)
treec33d204acec48d036a60033de949519f4c58abe8 /backend/x11
parent78befa59f96bb0a13e9ffeb4df1272738c6b5012 (diff)
Remove WLR_HAS_XCB_ERRORS
wlroots' dependency on this library doesn't change the features exposed to compositors. It's purely a wlroots implementation detail. Thus downstream compositors shouldn't really care about it. Introduce an "internal_features" dictionary to store the status of such internal dependencies.
Diffstat (limited to 'backend/x11')
-rw-r--r--backend/x11/backend.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index aa9ccd09..95325a68 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -191,7 +191,7 @@ static void backend_destroy(struct wlr_backend *backend) {
wlr_drm_format_set_finish(&x11->dri3_formats);
free(x11->drm_format);
-#if WLR_HAS_XCB_ERRORS
+#if HAS_XCB_ERRORS
xcb_errors_context_free(x11->errors_context);
#endif
@@ -617,7 +617,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
return false;
}
-#if WLR_HAS_XCB_ERRORS
+#if HAS_XCB_ERRORS
if (xcb_errors_context_new(x11->xcb, &x11->errors_context) != 0) {
wlr_log(WLR_ERROR, "Failed to create error context");
return false;
@@ -663,7 +663,7 @@ error_x11:
}
static void handle_x11_error(struct wlr_x11_backend *x11, xcb_value_error_t *ev) {
-#if WLR_HAS_XCB_ERRORS
+#if HAS_XCB_ERRORS
const char *major_name = xcb_errors_get_name_for_major_code(
x11->errors_context, ev->major_opcode);
if (!major_name) {
@@ -701,7 +701,7 @@ log_raw:
static void handle_x11_unknown_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *ev) {
-#if WLR_HAS_XCB_ERRORS
+#if HAS_XCB_ERRORS
const char *extension;
const char *event_name = xcb_errors_get_name_for_xcb_event(
x11->errors_context, ev, &extension);