X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=5c880594d58c4f50528c58aa6ef1682d12ebdea3;hb=be49c0e89319cc03b7119bac2604744bcdd26775;hp=61874aff305e151a6ea886d9cc83b0ad8d388760;hpb=7caf33e7559fb3a53ae4c18623cacb9db48515c1;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 61874af..5c88059 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -279,10 +279,7 @@ 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;
-xcb_atom_t		a_string;
 xcb_atom_t		a_swm_iconic;
 xcb_atom_t		a_swm_ws;
 volatile sig_atomic_t   running = 1;
@@ -4860,7 +4857,7 @@ get_win_name(xcb_window_t win)
 	xcb_get_property_reply_t	*r;
 
 	/* First try _NET_WM_NAME for UTF-8. */
-	c = xcb_get_property(conn, 0, win, a_netwmname,
+	c = xcb_get_property(conn, 0, win, ewmh[_NET_WM_NAME].atom,
 	    XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX);
 	r = xcb_get_property_reply(conn, c, NULL);
 
@@ -5309,16 +5306,12 @@ wkill(struct swm_region *r, union arg *args)
 int
 floating_toggle_win(struct ws_win *win)
 {
-	struct swm_region	*r;
-
 	if (win == NULL)
 		return (0);
 
 	if (!win->ws->r)
 		return (0);
 
-	r = win->ws->r;
-
 	/* reject floating toggles in max stack mode */
 	if (win->ws->cur_layout == &layouts[SWM_MAX_STACK])
 		return (0);
@@ -5708,14 +5701,12 @@ move(struct ws_win *win, union arg *args)
 {
 	xcb_timestamp_t		timestamp = 0;
 	int			move_stp = 0, moving;
-	struct swm_region	*r = NULL;
 	xcb_query_pointer_reply_t	*qpr = NULL;
 	xcb_generic_event_t		*evt;
 	xcb_motion_notify_event_t	*mne;
 
 	if (win == NULL)
 		return;
-	r = win->ws->r;
 
 	if (win->ewmh_flags & EWMH_F_FULLSCREEN)
 		return;
@@ -9438,10 +9429,7 @@ setup_globals(void)
 	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");
-	a_string = get_atom_from_string("STRING");
 	a_swm_iconic = get_atom_from_string("_SWM_ICONIC");
 	a_swm_ws = get_atom_from_string("_SWM_WS");
 }
@@ -9470,7 +9458,8 @@ workaround(void)
 		xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
 		    netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
 		xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
-		    a_netwmname, a_utf8_string, 8, strlen("LG3D"), "LG3D");
+		    ewmh[_NET_WM_NAME].atom, a_utf8_string, 8, strlen("LG3D"),
+		    "LG3D");
 	}
 }