Changeset 10136 for trunk/src

Timestamp:

Jun 3, 2003, 1:58:57 PM (22 years ago)

Author:

sandervl

Message:

Send focus messages when we receive the undocumented WM_FOCUSCHANGED PM message. Removes the need for the ugly hack to deal with nested focus changes.

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• window.cpp (modified) (5 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.215 2003-05-07 16:13:26 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.216 2003-06-03 11:58:37 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -60 +60 @@
 #include "dbglocal.h"
 
+
+// Notification that focus change has completed (UNDOCUMENTED)
+#define WM_FOCUSCHANGED            0x000e
+
 //define this to use the new code for WM_CALCVALIDRECT handling
 //#define USE_CALCVALIDRECT
@@ -727 +731 @@
         break;
 
-    case WIN32APP_SETFOCUSMSG:
+    case WIN32APP_CHNGEFRAMECTRLS:
+    {
+        dprintf(("OS2: WIN32APP_CHANGEFRAMECTRLS"));
+        OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), (ULONG)mp1, win32wnd->getExStyle(), (ULONG)mp2);
+        break;
+    }
+   
+    case WM_SETFOCUS:
+    {
+        HWND hwndFocus = (HWND)mp1;
+        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
+        break;
+    }
+
+    //Handle all focus processed during WM_FOCUSCHANGED; PM doesn't like focus
+    //changes during focus processing (WM_SETFOCUS). This message is sent
+    //after all focus work has been completed.
+    case WM_FOCUSCHANGED:
+    {
+      HWND hwndFocus      = (HWND)mp1;
+      HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
+
+        dprintf(("OS2: WM_FOCUSCHANGED %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
+
         //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
         //must delay this function call
-        //mp1 = win32 window handle
-        //mp2 = top parent if activation required
-        dprintf(("USER32: Delayed SetFocus %x %x %x call!", teb->o.odin.hwndFocus, mp1, mp2));
-        if(teb->o.odin.hwndFocus) {
-            RELEASE_WNDOBJ(win32wnd);
-            win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
-            if(win32wnd) {
-                 if(mp2) {
-                    SetActiveWindow((HWND)mp2);
-                 }
-                 if(!IsWindow(win32wnd->getWindowHandle())) break;       //abort if window destroyed
-                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), FC_NOSETACTIVE);
-            }
-            else DebugInt3();
-        }
-        break;
-
-    case WIN32APP_CHNGEFRAMECTRLS:
-    {
-      dprintf(("OS2: WIN32APP_CHANGEFRAMECTRLS"));
-      OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), (ULONG)mp1, win32wnd->getExStyle(), (ULONG)mp2);
-      break;
-    }
-
-    case WM_SETFOCUS:
-    {
-      HWND hwndFocus = (HWND)mp1;
-
-        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
-
-        //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
-        //must delay this function call
-
-        teb->o.odin.fWM_SETFOCUS = TRUE;
-        teb->o.odin.hwndFocus    = 0;
+
         if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC)
         {
             //another (non-win32) application's window
             //set to NULL (allowed according to win32 SDK) to avoid problems
-            hwndFocus = NULL;
+            hwndFocus      = 0;
+            hwndFocusWin32 = 0;
         }
         if((ULONG)mp2 == TRUE) {
-            HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
-            recreateCaret (hwndFocusWin32);
+            recreateCaret(hwndFocusWin32);
             win32wnd->MsgSetFocus(hwndFocusWin32);
         }
@@ -784 +777 @@
             else dprintf(("Window has already received a WM_KILLFOCUS (SetFocus(0)); ignore"));
         }
-        teb->o.odin.fWM_SETFOCUS = FALSE;
-
         break;
     }

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.134 2003-04-02 12:58:02 sandervl Exp $ */
+/* $Id: window.cpp,v 1.135 2003-06-03 11:58:38 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -781 +781 @@
 
     hwnd_O = window->getOS2WindowHandle();
-    if(teb->o.odin.hwndFocus) {
-         lastFocus = teb->o.odin.hwndFocus;
-    }
-    else lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
+    lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
 
     hwndTopParent = window->GetTopParent();
@@ -806 +803 @@
     }
 
-    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
-    //must delay this function call
-    if(teb->o.odin.fWM_SETFOCUS) {
-        dprintf(("USER32: Delay SetFocus call!"));
-        teb->o.odin.hwndFocus = hwnd;
-
-        //If keystrokes were ignored and focus is set to the old focus window, then
-        //PM won't send us a WM_SETFOCUS message. (as we don't inform PM for SetFocus(0))
-        if(fIgnoreKeystrokes && lastFocus_W == hwnd) {
-            dprintf(("Manually send WM_SETFOCUS; real focus window hasn't changed"));
-            SendMessageA(lastFocus_W, WM_SETFOCUS, 0, 0);
-        }
-        else {
-            //mp1 = win32 window handle
-            //mp2 = top parent if activation required
-            OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, (activate) ? hwndTopParent : 0);
-        }
-        RELEASE_WNDOBJ(window);
-        return lastFocus_W;
-    }
-    teb->o.odin.hwndFocus = 0;
     if(!IsWindow(hwnd)) return FALSE;       //abort if window destroyed
 
@@ -839 +815 @@
         SendMessageA(lastFocus_W, WM_SETFOCUS, 0, 0);
     }
-
     fIgnoreKeystrokes = FALSE;
     return ret;
@@ -860 +835 @@
         return 0;
     }
-    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
-    //If focus was changed during WM_SETFOCUS, the focus window handle is
-    //stored in teb->o.odin.hwndFocus (set back to 0 when delayed SetFocus
-    //is activated)
-    if(teb->o.odin.hwndFocus) {
-        dprintf(("USER32: GetFocus %x (DURING WM_SETFOCUS PROCESSING)", teb->o.odin.hwndFocus));
-        return teb->o.odin.hwndFocus;
-    }
-
     hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
     hwnd = OS2ToWin32Handle(hwnd);