X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=83d1bfac9966812199c7b883b43da0ca145facc3;hb=e33b66766fa2abe825742dc891385468d7f3ab37;hp=ea82b6463e8fa37c4e729a275284ef51fe314c73;hpb=e4fe23a9219929d9c9ababb0d00c5d643a719bb2;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index ea82b64..83d1bfa 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -747,29 +747,45 @@ setup_ewmh(void)
 void
 teardown_ewmh(void)
 {
-	int			i, success, num_screens;
-	unsigned char		*data = NULL;
-	unsigned long		n;
-	Atom			sup_check, sup_list;
-	Window			id;
+	int			i, num_screens;
+	xcb_atom_t		sup_check, sup_list;
+	xcb_window_t		id;
 
-	sup_check = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
-	sup_list = XInternAtom(display, "_NET_SUPPORTED", False);
+	xcb_intern_atom_cookie_t	c;
+	xcb_intern_atom_reply_t		*r;
+	xcb_get_property_cookie_t	pc;
+	xcb_get_property_reply_t	*pr;
+
+	c = xcb_intern_atom(conn, False, strlen("_NET_SUPPORTING_WM_CHECK"),
+		"_NET_SUPPORTING_WM_CHECK");
+	r = xcb_intern_atom_reply(conn, c, NULL);
+	if (r) {
+		sup_check = r->atom;
+		free(r);
+	}
+	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);
+	}
 
 	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
 	for (i = 0; i < num_screens; i++) {
 		/* Get the support check window and destroy it */
-		success = get_property(screens[i].root, sup_check, 1, XA_WINDOW,
-		    &n, NULL, &data);
-
-		if (success) {
-			id = data[0];
-			XDestroyWindow(display, id);
-			XDeleteProperty(display, screens[i].root, sup_check);
-			XDeleteProperty(display, screens[i].root, sup_list);
+		pc = xcb_get_property(conn, False, screens[i].root, sup_check,
+			XCB_ATOM_WINDOW, 0, 1);
+		pr = xcb_get_property_reply(conn, pc, NULL);
+		if (pr) {
+			id = *((xcb_window_t *)xcb_get_property_value(pr));
+
+			xcb_destroy_window(conn, id);
+			xcb_delete_property(conn, screens[i].root, sup_check);
+			xcb_delete_property(conn, screens[i].root, sup_list);
+		
+			free(pr);
 		}
-
-		XFree(data);
 	}
 }
 
@@ -951,9 +967,10 @@ ewmh_update_win_state(struct ws_win *win, long state, long action)
 void
 ewmh_get_win_state(struct ws_win *win)
 {
-	int			success, i;
-	unsigned long		n;
-	Atom			*states;
+	xcb_atom_t			*states;
+	xcb_get_property_cookie_t	c;
+	xcb_get_property_reply_t	*r;
+	int				i, n;
 
 	if (win == NULL)
 		return;
@@ -964,16 +981,19 @@ ewmh_get_win_state(struct ws_win *win)
 	if (win->manual)
 		win->ewmh_flags |= SWM_F_MANUAL;
 
-	success = get_property(win->id, ewmh[_NET_WM_STATE].atom,
-	    (~0L), XA_ATOM, &n, NULL, (void *)&states);
-
-	if (!success)
+	c = xcb_get_property(conn, False, win->id, ewmh[_NET_WM_STATE].atom,
+		XCB_ATOM_ATOM, 0, (~0L));
+	r = xcb_get_property_reply(conn, c, NULL);
+	if (!r)
 		return;
+	
+	states = xcb_get_property_value(r);
+	n = xcb_get_property_value_length(r);
+
+	free(r);
 
 	for (i = 0; i < n; i++)
 		ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD);
-
-	XFree(states);
 }
 
 /* events */