From e829db1a41a3fe6e970dad0facedc1196e1ca967 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine Date: Mon, 3 Aug 2009 17:38:50 +0200 Subject: [PATCH] update to libxcb 1.4 and xcb-util 0.3.6 These new versions provide similar fields to Xlib for errors (major_code, minor_code and resource_id). --- awesome.c | 8 ++++---- awesomeConfig.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awesome.c b/awesome.c index 295825ae..08896154 100644 --- a/awesome.c +++ b/awesome.c @@ -296,15 +296,15 @@ xerror(void *data __attribute__ ((unused)), /* ignore this */ if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW || (e->error_code == XCB_EVENT_ERROR_BAD_MATCH - && XCB_EVENT_REQUEST_TYPE(e) == XCB_SET_INPUT_FOCUS) + && e->major_code == XCB_SET_INPUT_FOCUS) || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE - && XCB_EVENT_REQUEST_TYPE(e) == XCB_KILL_CLIENT) - || (XCB_EVENT_REQUEST_TYPE(e) == XCB_CONFIGURE_WINDOW + && e->major_code == XCB_KILL_CLIENT) + || (e->major_code == XCB_CONFIGURE_WINDOW && e->error_code == XCB_EVENT_ERROR_BAD_MATCH)) return 0; warn("X error: request=%s, error=%s", - xcb_event_get_request_label(XCB_EVENT_REQUEST_TYPE(e)), + xcb_event_get_request_label(e->major_code), xcb_event_get_error_label(e->error_code)); return 0; diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index eeb263cb..8f577a52 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -128,7 +128,7 @@ execute_process( # Use pkgconfig to get most of the libraries pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED - xcb>=1.1) + xcb>=1.4) pkg_check_modules(AWESOME_REQUIRED REQUIRED glib-2.0 @@ -140,7 +140,7 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED xcb-xtest xcb-xinerama xcb-shape - xcb-event>=0.3.4 + xcb-event>=0.3.6 xcb-aux>=0.3.0 xcb-atom>=0.3.0 xcb-keysyms>=0.3.4