blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwm: remove xcb-util dependency 

This hardcodes a define, but other projects (wlc/weston) either use the raw
number or just redefine it with another name anyway...

This should fix travis build.
This commit is contained in:
Dominique Martinet 2017-08-20 23:06:13 +02:00
parent 3391e5b634
commit 0196284331
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xwayland/xwm.c
View File

@ -1,5 +1,4 @@
#include <stdlib.h> #include <stdlib.h>
#include <xcb/xcb_event.h>
#include <xcb/composite.h> #include <xcb/composite.h>
#include "wlr/util/log.h" #include "wlr/util/log.h"
#include "wlr/types/wlr_surface.h" #include "wlr/types/wlr_surface.h"
@ -171,6 +170,10 @@ static void handle_client_message(struct wlr_xwm *xwm, xcb_client_message_event_
wlr_log(L_DEBUG, "unhandled client message %u", ev->type); wlr_log(L_DEBUG, "unhandled client message %u", ev->type);
} }
/* This is in xcb/xcb_event.h, but pulling xcb-util just for a constant
* others redefine anyway is meh
*/
#define XCB_EVENT_RESPONSE_TYPE_MASK (0x7f)
static int x11_event_handler(int fd, uint32_t mask, void *data) { static int x11_event_handler(int fd, uint32_t mask, void *data) {
int count = 0; int count = 0;
xcb_generic_event_t *event; xcb_generic_event_t *event;