Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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).
This commit is contained in:
Arnaud Fontaine 2009-08-03 17:38:50 +02:00 committed by Julien Danjou
parent be1abfa28f
commit e829db1a41
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awesome.c
View File

@ -296,15 +296,15 @@ xerror(void *data __attribute__ ((unused)),
/* ignore this */ /* ignore this */
if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW
|| (e->error_code == XCB_EVENT_ERROR_BAD_MATCH || (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 || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE
&& XCB_EVENT_REQUEST_TYPE(e) == XCB_KILL_CLIENT) && e->major_code == XCB_KILL_CLIENT)
|| (XCB_EVENT_REQUEST_TYPE(e) == XCB_CONFIGURE_WINDOW || (e->major_code == XCB_CONFIGURE_WINDOW
&& e->error_code == XCB_EVENT_ERROR_BAD_MATCH)) && e->error_code == XCB_EVENT_ERROR_BAD_MATCH))
return 0; return 0;
warn("X error: request=%s, error=%s", 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)); xcb_event_get_error_label(e->error_code));
return 0; return 0;

4
awesomeConfig.cmake
View File

@ -128,7 +128,7 @@ execute_process(
# Use pkgconfig to get most of the libraries # Use pkgconfig to get most of the libraries
pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
xcb>=1.1) xcb>=1.4)
pkg_check_modules(AWESOME_REQUIRED REQUIRED pkg_check_modules(AWESOME_REQUIRED REQUIRED
glib-2.0 glib-2.0
@ -140,7 +140,7 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
xcb-xtest xcb-xtest
xcb-xinerama xcb-xinerama
xcb-shape xcb-shape
xcb-event>=0.3.4 xcb-event>=0.3.6
xcb-aux>=0.3.0 xcb-aux>=0.3.0
xcb-atom>=0.3.0 xcb-atom>=0.3.0
xcb-keysyms>=0.3.4 xcb-keysyms>=0.3.4