Changeset 6965

Timestamp:

Oct 8, 2001, 2:19:10 PM (24 years ago)

Author:

sandervl

Message:

WM_WINDOWPOSCHANGED activation fix

File:

• trunk/src/user32/pmwindow.cpp (modified) (9 diffs)

trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.153 2001-10-07 11:48:28 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.154 2001-10-08 12:19:10 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -67 +67 @@
 void FrameReplaceMenuItem(HWND hwndMenu, ULONG nIndex, ULONG idOld, ULONG   idNew,
                           HBITMAP hbmNew);
+void FrameSetFocus(HWND hwnd);
 
 VOID APIENTRY DspInitSystemDriverName(PSZ pszDriverName, ULONG lenDriverName);
@@ -913 +914 @@
             if(ulFlags & SWP_ACTIVATE) 
             {
-                ULONG ulFrameFlags;
-
                 if(ulFlags & SWP_ZORDER) {
-                    ulFrameFlags = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+                    dprintf(("Set FF_NOACTIVATESWP"));
+                    ULONG ulFrameFlags = WinQueryWindowUShort(hwnd, QWS_FLAGS);
                     WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags | FF_NOACTIVATESWP);
                 }
@@ -926 +926 @@
                 else
                 {
-                    HWND hwndFocusSave = WinQueryWindowULong(hwnd, QWL_HWNDFOCUSSAVE);
-                    if(!WinIsWindow(hab, hwndFocusSave)) {
-                        hwndFocusSave = WinWindowFromID(hwnd, FID_CLIENT);
-                        WinSetWindowULong(hwnd, QWL_HWNDFOCUSSAVE, hwndFocusSave);
-                    }
-                    dprintf(("WM_ADJUSTWINDOWPOS: hwndFocusSave %x %x", OS2ToWin32Handle(hwndFocusSave), hwndFocusSave));
-                    WinSetFocus(HWND_DESKTOP, hwndFocusSave);
-
-                    ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
-                    ulFrameFlags &= ~FF_NOACTIVATESWP;
-                    WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
+                    FrameSetFocus(hwnd);
                 }
             }
@@ -959 +949 @@
             }
         }
-        dprintf(("WM_ADJUSTWINDOWPOS ret %x", ret));
+        dprintf(("WM_ADJUSTWINDOWPOS ret %x flags %x", ret, WinQueryWindowUShort(hwnd, QWS_FLAGS)));
         rc = (MRESULT)ret;
         break;
@@ -966 +956 @@
     case WM_WINDOWPOSCHANGED:
     {
-      PSWP      pswp   = (PSWP)mp1,pswpOld = pswp+1;
-      SWP       swpOld = *(pswp + 1);
+      PSWP      pswp    = (PSWP)mp1,pswpOld = pswp+1;
+      SWP       swpOld  = *(pswp + 1);
       WINDOWPOS wp;
+      ULONG     flAfp   = (ULONG)mp2;
       HWND      hParent = NULLHANDLE;
       RECTL     rect;
@@ -990 +981 @@
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
             } 
+            //MUST call the old frame window proc!
             goto RunDefFrameWndProc;
         }
@@ -1029 +1021 @@
         if(pswp->fl & SWP_HIDE) {
             WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
+        }
+
+        if(flAfp & AWP_ACTIVATE)
+        {
+            FrameSetFocus(hwnd);
         }
 
@@ -1460 +1457 @@
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );
 }
+//******************************************************************************
+//******************************************************************************
+void FrameSetFocus(HWND hwnd)
+{
+    HWND hwndFocusSave = WinQueryWindowULong(hwnd, QWL_HWNDFOCUSSAVE);
+    if(!WinIsWindow(hab, hwndFocusSave)) {
+        hwndFocusSave = WinWindowFromID(hwnd, FID_CLIENT);
+        WinSetWindowULong(hwnd, QWL_HWNDFOCUSSAVE, hwndFocusSave);
+    }
+    dprintf(("FrameSetFocus: hwndFocusSave %x %x", OS2ToWin32Handle(hwndFocusSave), hwndFocusSave));
+    WinSetFocus(HWND_DESKTOP, hwndFocusSave);
+
+    ULONG ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+    ulFrameFlags &= ~FF_NOACTIVATESWP;
+    WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
+}
 #ifndef CUSTOM_TRACKFRAME 
 //******************************************************************************