handle events on the right screen

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index a97b1f775e6b57672cf74ee92f740bc199748cd8..bfa7989ce89462588ef83cfa02fc6412480c1cd2 100644 (file)
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -253,16 +253,9 @@ bool epist::handleSignal(int sig) {
 
 
 void epist::process_event(XEvent *e) {
-  Window root;
-
-  if (e->xany.type == KeyPress)
-    root = e->xkey.root;
-  else
-    root = e->xany.window;
-  
   ScreenList::const_iterator it, end = _screens.end();
   for (it = _screens.begin(); it != end; ++it) {
-    if ((*it)->rootWindow() == root) {
+    if ((*it)->rootWindow() == e->xany.window) {
       (*it)->processEvent(*e);
       return;
     }

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index cf2c486f44a89e5a18b96f23c3b81be87b4f2cfa..ee19abb1cd1548d0ed209e0ccff99900b9cf78cc 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -118,6 +118,7 @@ XWindow *screen::findWindow(const XEvent &e) const {
 
 void screen::processEvent(const XEvent &e) {
   assert(_managed);
+  assert(e.xany.window == _root);
 
   switch (e.type) {
   case PropertyNotify: