X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=29849f5bc04237d763e5e44ee4cac54a9d4ad56d;hb=404594c487e291270831d1b08f5f30599b53e084;hp=829bba0a53c88c8901eb97c9f41ffbcef6e5ff7c;hpb=9daf16e4b60699b18c80c9cdb4494af10140f840;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 829bba0..29849f5 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -246,10 +246,10 @@ u_int32_t		swm_debug = 0
 #endif
 
 char			**start_argv;
-xcb_atom_t		astate;
-xcb_atom_t		aprot;
-xcb_atom_t		adelete;
-xcb_atom_t		takefocus;
+xcb_atom_t		a_state;
+xcb_atom_t		a_prot;
+xcb_atom_t		a_delete;
+xcb_atom_t		a_takefocus;
 xcb_atom_t		a_wmname;
 xcb_atom_t		a_netwmname;
 xcb_atom_t		a_utf8_string;
@@ -1931,8 +1931,8 @@ set_win_state(struct ws_win *win, uint16_t state)
 	if (win == NULL)
 		return;
 
-	xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, astate,
-	    astate, 32, 2, data);
+	xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, a_state,
+	    a_state, 32, 2, data);
 }
 
 uint16_t
@@ -1942,7 +1942,7 @@ getstate(xcb_window_t w)
 	xcb_get_property_cookie_t	c;
 	xcb_get_property_reply_t	*r;
 
-	c = xcb_get_property(conn, False, w, astate, astate, 0L, 2L);
+	c = xcb_get_property(conn, False, w, a_state, a_state, 0L, 2L);
 	r = xcb_get_property_reply(conn, c, NULL);
 
 	if (r) {
@@ -1980,7 +1980,7 @@ client_msg(struct ws_win *win, xcb_atom_t a)
 	bzero(&ev, sizeof ev);
 	ev.response_type = XCB_CLIENT_MESSAGE;
 	ev.window = win->id;
-	ev.type = aprot;
+	ev.type = a_prot;
 	ev.format = 32;
 	ev.data.data32[0] = a;
 	ev.data.data32[1] = XCB_CURRENT_TIME;
@@ -4070,7 +4070,7 @@ wkill(struct swm_region *r, union arg *args)
 		xcb_kill_client(conn, r->ws->focus->id);
 	else
 		if (r->ws->focus->can_delete)
-			client_msg(r->ws->focus, adelete);
+			client_msg(r->ws->focus, a_delete);
 
 	xcb_flush(conn);
 }
@@ -5116,7 +5116,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
 		return (1);
 	}
 	cp = keystr;
-	*ks = NoSymbol;
+	*ks = XCB_NO_SYMBOL;
 	*mod = 0;
 	while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
 		DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name);
@@ -5139,7 +5139,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
 		else {
 			*ks = XStringToKeysym(name);
 			XConvertCase(*ks, ks, &uks);
-			if (ks == NoSymbol) {
+			if (ks == XCB_NO_SYMBOL) {
 				DNPRINTF(SWM_D_KEY,
 				    "parsekeys: invalid key %s\n",
 				    name);
@@ -6418,9 +6418,9 @@ manage_window(xcb_window_t id)
 	    xcb_icccm_get_wm_protocols(conn, id, prot),
 	    &wpr, NULL)) {
 		for (i = 0; i < wpr.atoms_len; i++) {
-			if (wpr.atoms[i] == takefocus)
+			if (wpr.atoms[i] == a_takefocus)
 				win->take_focus = 1;
-			if (wpr.atoms[i] == adelete)
+			if (wpr.atoms[i] == a_delete)
 				win->can_delete = 1;
 		}
 		xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
@@ -6654,25 +6654,26 @@ focus_magic(struct ws_win *win)
 		if (win->java) {
 			focus_win(win->child_trans);
 			if (win->child_trans->take_focus)
-				client_msg(win, takefocus);
+				client_msg(win, a_takefocus);
 		} else {
 			/* make sure transient hasn't disappeared */
 			if (validate_win(win->child_trans) == 0) {
 				focus_win(win->child_trans);
 				if (win->child_trans->take_focus)
-					client_msg(win->child_trans, takefocus);
+					client_msg(win->child_trans,
+					    a_takefocus);
 			} else {
 				win->child_trans = NULL;
 				focus_win(win);
 				if (win->take_focus)
-					client_msg(win, takefocus);
+					client_msg(win, a_takefocus);
 			}
 		}
 	} else {
 		/* regular focus */
 		focus_win(win);
 		if (win->take_focus)
-			client_msg(win, takefocus);
+			client_msg(win, a_takefocus);
 	}
 }
 
@@ -7049,7 +7050,7 @@ clientmessage(xcb_client_message_event_t *e)
 	if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) {
 		DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n");
 		if (win->can_delete)
-			client_msg(win, adelete);
+			client_msg(win, a_delete);
 		else
 			xcb_kill_client(conn, win->id);
 	}
@@ -7415,7 +7416,7 @@ setup_screens(void)
 		screens[i].idx = i;
 		TAILQ_INIT(&screens[i].rl);
 		TAILQ_INIT(&screens[i].orl);
-		screens[i].root = RootWindow(display, i);
+		screens[i].root = get_screen(i)->root;
 
 		/* set default colors */
 		setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
@@ -7476,10 +7477,10 @@ setup_globals(void)
 	if ((syms = xcb_key_symbols_alloc(conn)) == NULL)
 		errx(1, "unable to allocate key symbols");
 
-	astate = get_atom_from_string("WM_STATE");
-	aprot = get_atom_from_string("WM_PROTOCOLS");
-	adelete = get_atom_from_string("WM_DELETE_WINDOW");
-	takefocus = get_atom_from_string("WM_TAKE_FOCUS");
+	a_state = get_atom_from_string("WM_STATE");
+	a_prot = get_atom_from_string("WM_PROTOCOLS");
+	a_delete = get_atom_from_string("WM_DELETE_WINDOW");
+	a_takefocus = get_atom_from_string("WM_TAKE_FOCUS");
 	a_wmname = get_atom_from_string("WM_NAME");
 	a_netwmname = get_atom_from_string("_NET_WM_NAME");
 	a_utf8_string = get_atom_from_string("UTF8_STRING");