cvsimport

1 files changed, 5 insertions, 5 deletions

diff --git a/xevents.c b/xevents.c
index c72bd0c..de6d41b 100644
--- a/xevents.c
+++ b/xevents.c
@@ -82,7 +82,7 @@ xev_handle_maprequest(XEvent *ee)
 	if ((cc = client_find(e->window)) == NULL)
 		cc = client_init(e->window, NULL);
 
-	if ((cc != NULL) && ((cc->flags & CLIENT_IGNORE) == 0))
+	if ((cc != NULL) && (!(cc->flags & CLIENT_IGNORE)))
 		client_ptrwarp(cc);
 }
 
@@ -239,7 +239,7 @@ xev_handle_buttonpress(XEvent *ee)
 		if (e->window != e->root)
 			return;
 		cc = &fakecc;
-		cc->sc = screen_fromroot(e->window);
+		cc->sc = screen_find(e->window);
 	}
 
 	(*mb->callback)(cc, &mb->argument);
@@ -289,7 +289,7 @@ xev_handle_keypress(XEvent *ee)
 			return;
 	} else {
 		cc = &fakecc;
-		cc->sc = screen_fromroot(e->window);
+		cc->sc = screen_find(e->window);
 	}
 
 	(*kb->callback)(cc, &kb->argument);
@@ -306,7 +306,7 @@ xev_handle_keyrelease(XEvent *ee)
 	KeySym			 keysym;
 	unsigned int		 i;
 
-	sc = screen_fromroot(e->root);
+	sc = screen_find(e->root);
 
 	keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
 	for (i = 0; i < nitems(modkeys); i++) {
@@ -324,7 +324,7 @@ xev_handle_clientmessage(XEvent *ee)
 	struct client_ctx	*cc, *old_cc;
 	struct screen_ctx       *sc;
 
-	sc = screen_fromroot(e->window);
+	sc = screen_find(e->window);
 
 	if ((cc = client_find(e->window)) == NULL && e->window != sc->rootwin)
 		return;