Update XCB api

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index bdfb0cb..92617c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CFLAGS=-Wall -O0 -g $(shell pkg-config --cflags xcb-shm xcb-aux xcb-dri3 xcb-present xshmfence)
-LIBS=$(shell pkg-config --libs xcb-shm xcb-aux xcb-dri3 xcb-present xshmfence xcb-sync xcb-xfixes)
+CFLAGS=-Wall -O0 -g $(shell pkg-config --cflags xcb xcb-shm xcb-aux xcb-dri3 xcb-present xshmfence)
+LIBS=$(shell pkg-config --libs xcb xcb-shm xcb-aux xcb-dri3 xcb-present xshmfence xcb-sync xcb-xfixes)
 
 all: shmfd dri3 futex xfence present pipefence shmtest condtest
 
diff --git a/dri3.c b/dri3.c
index 59fb753..86512ba 100644
--- a/dri3.c
+++ b/dri3.c
@@ -41,7 +41,7 @@ main (int argc, char **argv)
 	const xcb_query_extension_reply_t	*present_extension;
 	uint32_t		window_mask;
 	uint32_t		window_values[5];
-	xcb_ge_event_t		*xge;
+	xcb_ge_generic_event_t	*xge;
 
 	c = xcb_connect(NULL, &screen_num);
 	if (xcb_connection_has_error(c)) {
@@ -81,10 +81,10 @@ main (int argc, char **argv)
 
 	present_extension = xcb_get_extension_data(c, &xcb_present_id);
 
-	xcb_register_for_special_event(c,
-				       present_extension->major_opcode,
-				       present_event,
-				       NULL);
+	xcb_register_for_special_xge(c,
+				     &xcb_present_id,
+				     present_event,
+				     NULL);
 				       
 	xcb_map_window(c, window);
 
@@ -106,10 +106,10 @@ main (int argc, char **argv)
 				error->major_code,
 				error->minor_code);
 			break;
-		case XCB_GE:
-			xge = (xcb_ge_event_t *) event;
+		case XCB_GE_GENERIC:
+			xge = (xcb_ge_generic_event_t *) event;
 			if (xge->extension == present_extension->major_opcode) {
-				switch (xge->evtype) {
+				switch (xge->event_type) {
 				case XCB_PRESENT_CONFIGURE_NOTIFY: {
 					xcb_present_configure_notify_event_t *ce = (void *) event;
 					printf ("present configure %d %d %d %d\n",
diff --git a/present.c b/present.c
index a67893b..007ed41 100644
--- a/present.c
+++ b/present.c
@@ -53,7 +53,7 @@ uint32_t		gc_mask;
 uint32_t		gc_values[5];
 xcb_segment_t		segments[2];
 xcb_rectangle_t		rectangle;
-xcb_ge_event_t		*xge;
+xcb_ge_generic_event_t		*xge;
 int			x;
 int			x_inc = 30;
 uint64_t		msc;
@@ -279,8 +279,8 @@ main (int argc, char **argv)
 				error->major_code,
 				error->minor_code);
 			break;
-		case XCB_GE:
-			xge = (xcb_ge_event_t *) event;
+		case XCB_GE_GENERIC:
+			xge = (xcb_ge_generic_event_t *) event;
 			if (xge->extension == present_extension->major_opcode) {
 				switch (xge->event_type) {
 				case XCB_PRESENT_CONFIGURE_NOTIFY: {