Merge pull request #133 from ulodha/fix_waitforwindow

Fix waitForWindow() on Mac and Windows.

lackey/App.py

@@ -190,6 +190,8 @@ def getWindow(self):
         Returns an empty string if no match could be found.
         """
         if self.getPID() != -1:
+            if not self.hasWindow():
+                return ""
             return PlatformManager.getWindowTitle(PlatformManager.getWindowByPID(self.getPID()))
         else:
             return ""
@@ -213,7 +215,7 @@ def waitForWindow(self, seconds=5):
         timeout = time.time() + seconds
         while True:
             window_region = self.window()
-            if window_region is not None or time.time() < timeout:
+            if window_region is not None or time.time() > timeout:
                 break
             time.sleep(0.5)
         return window_region
@@ -224,6 +226,8 @@ def window(self, windowNum=0):
         """
         if self._pid == -1:
             return None
+        if not self.hasWindow():
+            return None
         x,y,w,h = PlatformManager.getWindowRect(PlatformManager.getWindowByPID(self._pid, windowNum))
         return Region(x,y,w,h).clipRegionToScreen()
 

lackey/PlatformManagerDarwin.py

@@ -330,7 +330,7 @@ def getWindowByPID(self, pid, order=0):
                     return w["kCGWindowNumber"]
                 else:
                     order -= 1
-        raise OSError("Could not find window for PID {} at index {}".format(pid, order))
+        return None
     def getWindowRect(self, hwnd):
         """ Returns a rect (x,y,w,h) for the specified window's area """
         for w in self._get_window_list():
@@ -340,7 +340,7 @@ def getWindowRect(self, hwnd):
                 width = w["kCGWindowBounds"]["Width"]
                 height = w["kCGWindowBounds"]["Height"]
                 return (x, y, width, height)
-        raise OSError("Unrecognized window number {}".format(hwnd))
+        return None
     def focusWindow(self, hwnd):
         """ Brings specified window to the front """
         Debug.log(3, "Focusing window: " + str(hwnd))