From 5d6aacc1d52ce5358cf6137a2aec8bb5c6835184 Mon Sep 17 00:00:00 2001
From: Dave Hawkes <daveh-wine@cadlink.com>
Date: Mon, 17 Dec 2001 21:19:54 +0000
Subject: [PATCH] Altered the algorithm for selecting a new focus after a
 window is destroyed that currently has the focus.

---
 windows/winpos.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/windows/winpos.c b/windows/winpos.c
index e44a2b32530..72d126c9b9f 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -648,7 +648,16 @@ HWND WINAPI GetActiveWindow(void)
 static BOOL WINPOS_CanActivate(HWND hwnd)
 {
     if (!hwnd) return FALSE;
-    return ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_DISABLED|WS_VISIBLE|WS_CHILD)) == WS_VISIBLE);
+    return ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_DISABLED|WS_CHILD)) == 0);
+}
+
+/*******************************************************************
+ *         WINPOS_IsVisible
+ */
+static BOOL WINPOS_IsVisible(HWND hwnd)
+{
+    if (!hwnd) return FALSE;
+    return ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) == WS_VISIBLE);
 }
 
 
@@ -1394,6 +1403,7 @@ void WINPOS_ActivateOtherWindow(HWND hwnd)
 {
     HWND hwndActive = 0;
     HWND hwndTo = 0;
+    HWND hwndDefaultTo = 0;
     HWND owner;
 
     /* Get current active window from the active queue */
@@ -1417,16 +1427,23 @@ void WINPOS_ActivateOtherWindow(HWND hwnd)
 
     if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) ||
         !(owner = GetWindow( hwnd, GW_OWNER )) ||
-        !WINPOS_CanActivate((hwndTo = GetAncestor( owner, GA_ROOT ))) )
+        !WINPOS_CanActivate((hwndTo = GetAncestor( owner, GA_ROOT ))) ||
+        !WINPOS_IsVisible(hwndTo))
     {
         HWND tmp = GetAncestor( hwnd, GA_ROOT );
         hwndTo = hwndPrevActive;
 
-        while( !WINPOS_CanActivate(hwndTo) )
+        while( !WINPOS_CanActivate(hwndTo) || !WINPOS_IsVisible(hwndTo))
         {
             /* by now owned windows should've been taken care of */
+            if(!hwndDefaultTo && WINPOS_CanActivate(hwndTo))
+            	hwndDefaultTo = hwndTo;
             tmp = hwndTo = GetWindow( tmp, GW_HWNDNEXT );
-            if( !hwndTo ) break;
+            if( !hwndTo )
+            {
+            	hwndTo = hwndDefaultTo;
+            	break;
+            }
         }
     }