summary refs log tree commit diff
path: root/xevents.c
diff options
context:
space:
mode:
authorokan <okan>2019-02-28 23:26:12 +0000
committerokan <okan>2019-02-28 23:26:12 +0000
commitae231f67d0ac54fb6281831c10972cc2f1f37acf (patch)
treeb555df0ddb4243ea8ade9a6ae688187184e21840 /xevents.c
parent880b5cda3f36e0135632d6670717e9a964caf0ec (diff)
downloadcwm-ae231f67d0ac54fb6281831c10972cc2f1f37acf.tar.gz
cwm-ae231f67d0ac54fb6281831c10972cc2f1f37acf.tar.xz
cwm-ae231f67d0ac54fb6281831c10972cc2f1f37acf.zip
Move the group index (desktop number) check to the only 2 callers that require
checking due to ewmh.
Diffstat (limited to 'xevents.c')
-rw-r--r--xevents.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xevents.c b/xevents.c
index 8fd65ff..2ef236d 100644
--- a/xevents.c
+++ b/xevents.c
@@ -408,7 +408,9 @@ xev_handle_clientmessage(XEvent *ee)
 			if (e->data.l[0] == (unsigned long)-1)
 				group_movetogroup(cc, 0);
 			else
-				group_movetogroup(cc, e->data.l[0]);
+				if (e->data.l[0] >= 0 &&
+				    e->data.l[0] < Conf.ngroups)
+					group_movetogroup(cc, e->data.l[0]);
 		}
 	} else if (e->message_type == ewmh[_NET_WM_STATE]) {
 		if ((cc = client_find(e->window)) != NULL) {
@@ -417,7 +419,9 @@ xev_handle_clientmessage(XEvent *ee)
 		}
 	} else if (e->message_type == ewmh[_NET_CURRENT_DESKTOP]) {
 		if ((sc = screen_find(e->window)) != NULL) {
-			group_only(sc, e->data.l[0]);
+			if (e->data.l[0] >= 0 &&
+			    e->data.l[0] < Conf.ngroups)
+				group_only(sc, e->data.l[0]);
 		}
 	}
 }