X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=281a093e3aa10745bee6978eb301b5a6b6302670;hb=33cce0d97e6ec4ccf11775a450cb65f5938c88b7;hp=7dfca51fccfe9ffe3efed99ce71004150a416df4;hpb=746c37b24b57ea024cf42e3d0d0d7c0ae3b03b83;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 7dfca51f..281a093e 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -60,9 +60,6 @@ screen::screen(epist *epist, int number)
   _info = _epist->getScreenInfo(_number);
   _root = _info->getRootWindow();
   
-  cout << "root window on screen " << _number << ": 0x" << hex << _root << 
-    dec << endl;
-  
   // find a window manager supporting NETWM, waiting for it to load if we must
   int count = 20;  // try for 20 seconds
   _managed = false;
@@ -421,7 +418,8 @@ const XWindow *screen::lastActiveWindow() const {
   // find a window if one exists
   WindowList::const_iterator it, end = _clients.end();
   for (it = _clients.begin(); it != end; ++it)
-    if ((*it)->getScreen() == this)
+    if ((*it)->getScreen() == this && ! (*it)->iconic() &&
+        ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop))
       return *it;
 
   // no windows on this screen