about summary refs log tree commit diff
path: root/client.c
diff options
context:
space:
mode:
authorokan <okan>2013-07-16 14:30:48 +0000
committerokan <okan>2013-07-16 14:30:48 +0000
commit0dec9e849d3ed5dc19882ca4184d01cff5843779 (patch)
tree8593a8f4d664f05dcc771ea0c310038e86342e3b /client.c
parent93bfc4a5c14db580a426571b8be6011998189ad2 (diff)
parenta439012b5806997e60df870faad87a5fec20d4e8 (diff)
downloadcwm-0dec9e849d3ed5dc19882ca4184d01cff5843779.tar.gz
cwm-0dec9e849d3ed5dc19882ca4184d01cff5843779.tar.xz
cwm-0dec9e849d3ed5dc19882ca4184d01cff5843779.zip
cvsimport
Diffstat (limited to 'client.c')
-rw-r--r--client.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/client.c b/client.c
index da943ea..b657304 100644
--- a/client.c
+++ b/client.c
@@ -529,9 +529,9 @@ client_wm_protocols(struct client_ctx *cc)
 
 	if (XGetWMProtocols(X_Dpy, cc->win, &p, &j)) {
 		for (i = 0; i < j; i++) {
-			if (p[i] == cwmh[WM_DELETE_WINDOW].atom)
+			if (p[i] == cwmh[WM_DELETE_WINDOW])
 				cc->xproto |= _WM_DELETE_WINDOW;
-			else if (p[i] == cwmh[WM_TAKE_FOCUS].atom)
+			else if (p[i] == cwmh[WM_TAKE_FOCUS])
 				cc->xproto |= _WM_TAKE_FOCUS;
 		}
 		XFree(p);
@@ -546,7 +546,7 @@ client_msg(struct client_ctx *cc, Atom proto)
 	bzero(&cm, sizeof(cm));
 	cm.type = ClientMessage;
 	cm.window = cc->win;
-	cm.message_type = cwmh[WM_PROTOCOLS].atom;
+	cm.message_type = cwmh[WM_PROTOCOLS];
 	cm.format = 32;
 	cm.data.l[0] = proto;
 	cm.data.l[1] = CurrentTime;
@@ -558,7 +558,7 @@ void
 client_send_delete(struct client_ctx *cc)
 {
 	if (cc->xproto & _WM_DELETE_WINDOW)
-		client_msg(cc, cwmh[WM_DELETE_WINDOW].atom);
+		client_msg(cc, cwmh[WM_DELETE_WINDOW]);
 	else
 		XKillClient(X_Dpy, cc->win);
 }
@@ -569,7 +569,7 @@ client_setname(struct client_ctx *cc)
 	struct winname	*wn;
 	char		*newname;
 
-	if (!xu_getstrprop(cc->win, ewmh[_NET_WM_NAME].atom, &newname))
+	if (!xu_getstrprop(cc->win, ewmh[_NET_WM_NAME], &newname))
 		if (!xu_getstrprop(cc->win, XA_WM_NAME, &newname))
 			newname = xstrdup("");
 
@@ -840,8 +840,7 @@ client_getmwmhints(struct client_ctx *cc)
 {
 	struct mwm_hints	*mwmh;
 
-	if (xu_getprop(cc->win,
-	    cwmh[_MOTIF_WM_HINTS].atom, cwmh[_MOTIF_WM_HINTS].atom,
+	if (xu_getprop(cc->win, cwmh[_MOTIF_WM_HINTS], cwmh[_MOTIF_WM_HINTS],
 	    PROP_MWM_HINTS_ELEMENTS, (u_char **)&mwmh) == MWM_NUMHINTS)
 		if (mwmh->flags & MWM_HINTS_DECORATIONS &&
 		    !(mwmh->decorations & MWM_DECOR_ALL) &&