about summary refs log tree commit diff
path: root/client.c
diff options
context:
space:
mode:
authorokan <okan>2013-11-08 17:35:12 +0000
committerokan <okan>2013-11-08 17:35:12 +0000
commit3bb928a1c26c76d7e0a929ca3502c29170a83e53 (patch)
treed95e63a844ac922a3d3320ae019f81a83024cc58 /client.c
parentc1bc6d37b385ff4dad1582583fd21f2c45b2c168 (diff)
downloadcwm-3bb928a1c26c76d7e0a929ca3502c29170a83e53.tar.gz
cwm-3bb928a1c26c76d7e0a929ca3502c29170a83e53.tar.xz
cwm-3bb928a1c26c76d7e0a929ca3502c29170a83e53.zip
stash WMProtocols in flags
Diffstat (limited to 'client.c')
-rw-r--r--client.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/client.c b/client.c
index 6c9581d..f697cf2 100644
--- a/client.c
+++ b/client.c
@@ -212,11 +212,11 @@ client_setactive(struct client_ctx *cc, int fg)
 	if (fg) {
 		XInstallColormap(X_Dpy, cc->colormap);
 		if ((cc->flags & CLIENT_INPUT) ||
-		    ((cc->xproto & _WM_TAKE_FOCUS) == 0)) {
+		    ((cc->flags & CLIENT_WM_TAKE_FOCUS) == 0)) {
 			XSetInputFocus(X_Dpy, cc->win,
 			    RevertToPointerRoot, CurrentTime);
 		}
-		if (cc->xproto & _WM_TAKE_FOCUS)
+		if (cc->flags & CLIENT_WM_TAKE_FOCUS)
 			client_msg(cc, cwmh[WM_TAKE_FOCUS]);
 		conf_grab_mouse(cc->win);
 		/*
@@ -532,9 +532,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])
-				cc->xproto |= _WM_DELETE_WINDOW;
+				cc->flags |= CLIENT_WM_DELETE_WINDOW;
 			else if (p[i] == cwmh[WM_TAKE_FOCUS])
-				cc->xproto |= _WM_TAKE_FOCUS;
+				cc->flags |= CLIENT_WM_TAKE_FOCUS;
 		}
 		XFree(p);
 	}
@@ -559,7 +559,7 @@ client_msg(struct client_ctx *cc, Atom proto)
 void
 client_send_delete(struct client_ctx *cc)
 {
-	if (cc->xproto & _WM_DELETE_WINDOW)
+	if (cc->flags & CLIENT_WM_DELETE_WINDOW)
 		client_msg(cc, cwmh[WM_DELETE_WINDOW]);
 	else
 		XKillClient(X_Dpy, cc->win);