X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=e70be9266d614589cef03589ac6282ef10c57b3d;hb=376c5ec3f05e789780a47c298c550ea45e16c4fb;hp=5b97af2f11104da3f14fa6d2668cdb6cb11d9774;hpb=ef048ac6ee49f942ee0029e04dfd8697a08f3d10;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 5b97af2..e70be92 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -90,7 +90,7 @@
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
 #include <X11/Xatom.h>
-#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrandr.h>
@@ -221,6 +221,7 @@ int			xrandr_support;
 int			xrandr_eventbase;
 unsigned int		numlockmask = 0;
 Display			*display;
+xcb_connection_t	*conn;
 
 int			cycle_empty = 0;
 int			cycle_visible = 0;
@@ -695,23 +696,39 @@ out:
 void
 setup_ewmh(void)
 {
-	int			i,j;
-	Atom			sup_list;
-
-	sup_list = XInternAtom(display, "_NET_SUPPORTED", False);
-
-	for (i = 0; i < LENGTH(ewmh); i++)
-		ewmh[i].atom = XInternAtom(display, ewmh[i].name, False);
+	xcb_atom_t			sup_list;
+	xcb_intern_atom_cookie_t	c;
+	xcb_intern_atom_reply_t		*r;
+	int				i, j, num_screens;
+
+	c = xcb_intern_atom(conn, False, strlen("_NET_SUPPORTED"),
+		"_NET_SUPPORTED");
+	r = xcb_intern_atom_reply(conn, c, NULL);
+	if (r) {
+		sup_list = r->atom;
+		free(r);
+	}
+	
+	for (i = 0; i < LENGTH(ewmh); i++) {
+		c = xcb_intern_atom(conn, False, strlen(ewmh[i].name),
+			ewmh[i].name);
+		r = xcb_intern_atom_reply(conn, c, NULL);
+		if (r) {
+			ewmh[i].atom = r->atom;
+			free(r);
+		}
+	}
 
-	for (i = 0; i < ScreenCount(display); i++) {
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	for (i = 0; i < num_screens; i++) {
 		/* Support check window will be created by workaround(). */
 
 		/* Report supported atoms */
-		XDeleteProperty(display, screens[i].root, sup_list);
+		xcb_delete_property(conn, screens[i].root, sup_list);
 		for (j = 0; j < LENGTH(ewmh); j++)
-			XChangeProperty(display, screens[i].root,
-			    sup_list, XA_ATOM, 32,
-			    PropModeAppend, (unsigned char *)&ewmh[j].atom, 1);
+			xcb_change_property(conn, XCB_PROP_MODE_APPEND,
+				screens[i].root, sup_list, XCB_ATOM_ATOM, 32, 1,
+				&ewmh[j].atom);
 	}
 }
 
@@ -2159,6 +2176,7 @@ restart(struct swm_region *r, union arg *args)
 	bar_extra_stop();
 	bar_extra = 1;
 	unmap_all();
+	xcb_disconnect(conn);
 	XCloseDisplay(display);
 	execvp(start_argv[0], start_argv);
 	warn("execvp failed");
@@ -7418,6 +7436,9 @@ main(int argc, char *argv[])
 	if (!(display = XOpenDisplay(0)))
 		errx(1, "can not open display");
 
+	if (!(conn = XGetXCBConnection(display)))
+		errx(1, "can not get XCB connection");
+
 	if (active_wm())
 		errx(1, "other wm running");
 
@@ -7597,6 +7618,7 @@ done:
 			XFreeGC(display, screens[i].bar_gc);
 
 	XFreeFontSet(display, bar_fs);
+	xcb_disconnect(conn);	
 	XCloseDisplay(display);
 
 	return (0);