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

diff --git a/spectrwm.c b/spectrwm.c
index 5b97af2..63e925a 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;
@@ -649,19 +650,26 @@ get_property(Window id, Atom atom, long count, Atom type, unsigned long *nitems,
 void
 update_iconic(struct ws_win *win, int newv)
 {
-	int32_t v = newv;
-	Atom iprop;
+	int32_t				v = newv;
+	xcb_atom_t			iprop;
+	xcb_intern_atom_cookie_t	c;
+	xcb_intern_atom_reply_t		*r;
 
 	win->iconic = newv;
 
-	iprop = XInternAtom(display, "_SWM_ICONIC", False);
-	if (!iprop)
+	c = xcb_intern_atom(conn, False, strlen("_SWM_ICONIC"), "_SWM_ICONIC");
+	r = xcb_intern_atom_reply(conn, c, NULL);
+	if (r) {
+		iprop = r->atom;
+		free(r);
+	} else
 		return;
+		
 	if (newv)
-		XChangeProperty(display, win->id, iprop, XA_INTEGER, 32,
-		    PropModeReplace, (unsigned char *)&v, 1);
+		xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+			iprop, XCB_ATOM_INTEGER, 32, 1, &v);
 	else
-		XDeleteProperty(display, win->id, iprop);
+		xcb_delete_property(conn, win->id, iprop);
 }
 
 int
@@ -695,23 +703,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);
 	}
 }
 
@@ -1248,13 +1272,16 @@ name_to_color(char *colorname)
 void
 setscreencolor(char *val, int i, int c)
 {
-	if (i > 0 && i <= ScreenCount(display)) {
+	int	num_screens;
+
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	if (i > 0 && i <= num_screens) {
 		screens[i - 1].c[c].color = name_to_color(val);
 		free(screens[i - 1].c[c].name);
 		if ((screens[i - 1].c[c].name = strdup(val)) == NULL)
 			err(1, "strdup");
 	} else if (i == -1) {
-		for (i = 0; i < ScreenCount(display); i++) {
+		for (i = 0; i < num_screens; i++) {
 			screens[i].c[c].color = name_to_color(val);
 			free(screens[i].c[c].name);
 			if ((screens[i].c[c].name = strdup(val)) == NULL)
@@ -1262,7 +1289,7 @@ setscreencolor(char *val, int i, int c)
 		}
 	} else
 		errx(1, "invalid screen index: %d out of bounds (maximum %d)",
-		    i, ScreenCount(display));
+		    i, num_screens);
 }
 
 void
@@ -2159,6 +2186,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");
@@ -7287,12 +7315,13 @@ grab_windows(void)
 void
 setup_screens(void)
 {
-	int			i, j, k;
+	int			i, j, k, num_screens;
 	int			errorbase, major, minor;
 	struct workspace	*ws;
 	XGCValues		gcv;
 
-	if ((screens = calloc(ScreenCount(display),
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	if ((screens = calloc(num_screens,
 	     sizeof(struct swm_screen))) == NULL)
 		err(1, "setup_screens: calloc: failed to allocate memory for "
 		    "screens");
@@ -7305,7 +7334,7 @@ setup_screens(void)
 			xrandr_support = 0;
 
 	/* map physical screens */
-	for (i = 0; i < ScreenCount(display); i++) {
+	for (i = 0; i < num_screens; i++) {
 		DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i);
 		screens[i].idx = i;
 		TAILQ_INIT(&screens[i].rl);
@@ -7418,6 +7447,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 +7629,7 @@ done:
 			XFreeGC(display, screens[i].bar_gc);
 
 	XFreeFontSet(display, bar_fs);
+	xcb_disconnect(conn);	
 	XCloseDisplay(display);
 
 	return (0);