From: David Hill <dhill@conformal.com>
Date: Tue, 17 Jul 2012 18:52:32 +0000 (-0400)
Subject: bring back the Display variable.  Will be needed for the font code.
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d691aa1d13c2b0f2e064341fc299ad27d8215750;p=spectrwm.git

bring back the Display variable.  Will be needed for the font code.
---

diff --git a/Makefile b/Makefile
index d454252..1d5b133 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CFLAGS+=-std=gnu89 -Wall -Wno-uninitialized -g
 # Uncomment define below to disallow user settable clock format string
 #CFLAGS+=-DSWM_DENY_CLOCK_FORMAT
 CPPFLAGS+= -I${X11BASE}/include
-LDADD+=-lutil -L${X11BASE}/lib -lX11 -lxcb -lxcb-aux -lxcb-icccm -lxcb-keysyms -lxcb-randr -lxcb-xtest
+LDADD+=-lutil -L${X11BASE}/lib -lX11 -lX11-xcb -lxcb-aux -lxcb-icccm -lxcb-keysyms -lxcb-randr -lxcb-xtest
 BUILDVERSION != sh "${.CURDIR}/buildver.sh"
 .if !${BUILDVERSION} == ""
 CPPFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
diff --git a/spectrwm.c b/spectrwm.c
index 4699392..dee3300 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -89,7 +89,7 @@
 #include <util.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xrandr.h>
-#include <xcb/xcb.h>
+#include <X11/Xlib-xcb.h>
 #include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
@@ -260,6 +260,8 @@ int			ss_enabled = 0;
 int			xrandr_support;
 int			xrandr_eventbase;
 unsigned int		numlockmask = 0;
+
+Display			*display;
 xcb_connection_t	*conn;
 xcb_key_symbols_t	*syms;
 
@@ -7712,7 +7714,10 @@ main(int argc, char *argv[])
 	sact.sa_flags = SA_NOCLDSTOP;
 	sigaction(SIGCHLD, &sact, NULL);
 
-	conn = xcb_connect(NULL, NULL);
+	if (!(display = XOpenDisplay(0)))
+		errx(1, "can not open display");
+
+	conn = XGetXCBConnection(display); 
 	if (xcb_connection_has_error(conn))
 		errx(1, "can not get XCB connection");