Changeset 1425 for trunk/src/user32/pmframe.cpp

Timestamp:

Oct 24, 1999, 1:05:05 AM (26 years ago)

Author:

sandervl

Message:

Combobox + windowpos changes + fixes

Location:

trunk/src/user32

Files:

• . (modified) (1 prop)
• pmframe.cpp (modified) (23 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.10 1999-10-23 10:21:43 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.11 1999-10-23 23:04:36 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -27 +27 @@
 #define PMFRAMELOG
 
+//******************************************************************************
+//******************************************************************************
 VOID Draw3DRect(HPS hps,RECTL rect,LONG colorBR,LONG colorTL)
 {
@@ -47 +49 @@
   GpiLine(hps,&point);
 }
-
+//******************************************************************************
+//******************************************************************************
 VOID DeflateRect(RECTL *rect)
 {
@@ -55 +58 @@
   rect->yBottom++;
 }
-
+//******************************************************************************
+//******************************************************************************
 VOID DrawFrame(HPS hps,RECTL *rect,Win32BaseWindow *win32wnd)
 {
@@ -73 +77 @@
     DeflateRect(rect);
     Draw3DRect(hps,*rect,clrLight,clrBlack);
-  } else if (dwExStyle & WS_EX_DLGMODALFRAME_W)
+  }
+  else if (dwExStyle & WS_EX_DLGMODALFRAME_W)
   {
     Draw3DRect(hps,*rect,clrBlack,clrLight);
@@ -80 +85 @@
     DeflateRect(rect);
     Draw3DRect(hps,*rect,clrLight,clrLight);
-  } else if (dwExStyle & WS_EX_STATICEDGE_W)
+  }
+  else if (dwExStyle & WS_EX_STATICEDGE_W)
   {
     Draw3DRect(hps,*rect,clrWhite,clrDark);
-  } else if (dwExStyle & WS_EX_WINDOWEDGE_W);
+  }
+  else if (dwExStyle & WS_EX_WINDOWEDGE_W);
   else if (dwStyle & WS_BORDER_W)
   {
@@ -91 +98 @@
   DeflateRect(rect);
 }
-
+//******************************************************************************
+//******************************************************************************
 BOOL CanDrawSizeBox(Win32BaseWindow *win32wnd)
 {
@@ -98 +106 @@
           && win32wnd->getHorzScrollHandle() && WinQueryWindow(win32wnd->getHorzScrollHandle(),QW_PARENT) == win32wnd->getOS2FrameWindowHandle());
 }
-
+//******************************************************************************
+//******************************************************************************
 VOID GetSizeBox(Win32BaseWindow *win32wnd,RECTL *rect)
 {
@@ -110 +119 @@
   rect->yBottom = swpHorz.y;
 }
-
+//******************************************************************************
+//******************************************************************************
 BOOL InSizeBox(Win32BaseWindow *win32wnd,POINTS *points)
 {
@@ -126 +136 @@
   return FALSE;
 }
-
+//******************************************************************************
+//******************************************************************************
 VOID DrawSizeBox(HPS hps,RECTL rect)
 {
@@ -156 +167 @@
   }
 }
-
+//******************************************************************************
+//******************************************************************************
+void DrawActivate(Win32BaseWindow *win32wnd, HWND hwnd)
+{
+    if (!win32wnd->isChild())
+    {
+        if (CanDrawSizeBox(win32wnd))
+        {
+          HPS hps;
+          RECTL rect;
+
+          GetSizeBox(win32wnd,&rect);
+          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
+          DrawSizeBox(hps,rect);
+          WinReleasePS(hps);
+
+        }
+    }
+    else
+    {
+        HPS hps;
+        RECTL rect;
+
+        WinQueryWindowRect(hwnd,&rect);
+        rect.xRight = rect.xRight-rect.xLeft;
+        rect.yTop = rect.yTop-rect.yBottom;
+        rect.xLeft = rect.yBottom = 0;
+        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
+        DrawFrame(hps,&rect,win32wnd);
+        WinReleasePS(hps);
+    }
+}
 //******************************************************************************
 //Win32 frame message handler
@@ -180 +222 @@
   switch(msg)
   {
-#if 0
+#if 1
     case WM_ADJUSTWINDOWPOS:
     {
@@ -186 +228 @@
       SWP      swpOld;
       WINDOWPOS wp;
-      ULONG     parentHeight = 0;
-      HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE, hwndAfter;
-
-        dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", hwnd, pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+      HWND      hParent = NULLHANDLE, hwndAfter;
+
+        dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
             goto RunDefFrameProc;
+
         if(!win32wnd->CanReceiveSizeMsgs()) {
-            goto RunDefFrameProc;
+            break;
         }
 
@@ -208 +250 @@
         }
         hwndAfter = pswp->hwndInsertBehind;
-        hFrame = win32wnd->getOS2FrameWindowHandle();
-        OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hFrame);
+        OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
 
         wp.hwnd = win32wnd->getWindowHandle();
@@ -219 +260 @@
         if(win32wnd->MsgPosChanging((LPARAM)&wp) == 0)
         {//app or default window handler changed wp
-            dprintf(("OS2: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
+            dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
-            OSLibMapWINDOWPOStoSWP(&wp, pswp, &swpOld, hParent, hFrame);
+            OSLibMapWINDOWPOStoSWPFrame(&wp, pswp, &swpOld, hParent, hwnd);
             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
             pswp->fl |= SWP_NOADJUST;
             pswp->hwndInsertBehind = hwndAfter;
-            pswp->hwnd = hFrame;
+            pswp->hwnd = hwnd;
 
             RestoreOS2TIB();
@@ -233 +274 @@
     }
 
+    case WM_WINDOWPOSCHANGED:
+    {
+      PSWP      pswp   = (PSWP)mp1;
+      SWP       swpOld = *(pswp + 1);
+      WINDOWPOS wp;
+      HWND      hParent = NULLHANDLE;
+      LONG      yDelta = pswp->cy - swpOld.cy;
+      LONG      xDelta = pswp->cx - swpOld.cx;
+
+        dprintf(("PMFRAME: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+        RestoreOS2TIB();
+        rc = OldFrameProc(hwnd,msg,mp1,mp2);
+        SetWin32TIB();
+
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
+            goto PosChangedEnd;
+
+        if(!win32wnd->CanReceiveSizeMsgs())
+            goto PosChangedEnd;
+
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+            if (win32wnd->isChild()) {
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    goto PosChangedEnd; //parent has just been destroyed
+            }
+        }
+        OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
+
+        //delta is difference between old and new client height
+        yDelta = swpOld.cy - win32wnd->getWindowHeight();
+
+        win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+        win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
+
+        wp.hwnd = win32wnd->getWindowHandle();
+        if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
+        {
+           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+           if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
+        }
+
+        if (yDelta != 0 || xDelta != 0)
+        {
+            HENUM henum = WinBeginEnumWindows(WinWindowFromID(pswp->hwnd, FID_CLIENT));
+            SWP swp[10];
+            int i = 0;
+            HWND hwnd;
+
+            while ((hwnd = WinGetNextWindow(henum)) != NULLHANDLE)
+            {
+#if 0
+                if (mdiClient )
+                {
+                  continue;
+                }
+#endif
+                WinQueryWindowPos(hwnd, &(swp[i]));
+
+#ifdef DEBUG
+                Win32BaseWindow *window = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+                dprintf(("ENUMERATE %x delta %d (%d,%d) (%d,%d) %x", (window) ? window->getWindowHandle() : hwnd,
+                         yDelta, swp[i].x, swp[i].y, swp[i].cx, swp[i].cy, swp[i].fl));
+#endif
+
+                if(swp[i].y != 0) {
+                    //child window at offset <> 0 from client area -> offset now changes
+                    swp[i].y  += yDelta;
+                    swp[i].fl &= ~(SWP_NOREDRAW);
+                }
+                //else child window with the same start coorindates as the client area
+                //The app should resize it.
+
+               if (i == 9)
+                {
+                    WinSetMultWindowPos(GetThreadHAB(), swp, 10);
+                    i = 0;
+                }
+                else
+                {
+                    i++;
+                }
+            }
+
+            WinEndEnumWindows(henum);
+
+            if (i)
+               WinSetMultWindowPos(GetThreadHAB(), swp, i);
+        }
+        if (yDelta != 0)
+        {
+            POINT pt;
+            if(GetCaretPos (&pt) == TRUE)
+            {
+                pt.y -= yDelta;
+                SetCaretPos (pt.x, pt.y);
+            }
+        }
+        win32wnd->MsgPosChanged((LPARAM)&wp);
+
+PosChangedEnd:
+        return rc;
+    }
+#if 0
+    case WM_ENABLE:
+        dprintf(("PMFRAME: WM_ENABLE %x", win32wnd->getWindowHandle()));
+        win32wnd->MsgEnable(SHORT1FROMMP(mp1));
+        goto RunDefFrameProc;
+
+    case WM_SHOW:
+        dprintf(("PMFRAME: WM_SHOW %x %d", win32wnd->getWindowHandle(), mp1));
+        win32wnd->MsgShow((ULONG)mp1);
+        goto RunDefFrameProc;
+
+    case WM_ACTIVATE:
+    {
+      HWND hwndActivate = (HWND)mp2;
+      BOOL fMinimized = FALSE;
+
+        dprintf(("PMFRAME: WM_ACTIVATE %x %x", hwnd, hwndActivate));
+        if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
+                //another (non-win32) application's window
+                //set to NULL (allowed according to win32 SDK) to avoid problems
+                hwndActivate = NULL;
+        }
+        if(WinQueryWindowULong(hwnd, QWL_STYLE) & WS_MINIMIZED)
+        {
+           fMinimized = TRUE;
+        }
+
+        win32wnd->MsgActivate(SHORT1FROMMP(mp1), fMinimized, Win32BaseWindow::OS2ToWin32Handle(hwndActivate));
+
+        RestoreOS2TIB();
+        MRESULT rc = OldFrameProc(hwnd,msg,mp1,mp2);
+        DrawActivate(win32wnd, hwnd);
+        return rc;
+    }
+#else
+    case WM_ACTIVATE:
+        DrawActivate(win32wnd, hwnd);
+        goto RunDefFrameProc;
+#endif
 #else
     case WM_ADJUSTWINDOWPOS:
@@ -242 +427 @@
       if(wndchild && wndchild->isChild())
       {
+#if 0
+       SWP swp = *pswp;
+
+        MRESULT rc = OldFrameProc(hwnd, msg, mp1, mp2);
+        pswp->x = swp.x;
+        pswp->y = swp.y;
+        pswp->fl = swp.fl;
+#endif
         dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", hwnd, pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
         RestoreOS2TIB();
@@ -249 +442 @@
     }
 
+    case WM_ACTIVATE:
+        DrawActivate(win32wnd, hwnd);
+        goto RunDefFrameProc;
 #endif
 
@@ -265 +461 @@
         RestoreOS2TIB();
         return (MRESULT)TRUE;
-      } else if (win32wnd->isChild()) goto RunDefWndProc;
+      }
+      else if (win32wnd->isChild()) goto RunDefWndProc;
       else goto RunDefFrameProc;
 
@@ -277 +474 @@
         RestoreOS2TIB();
         return (MRESULT)TRUE;
-      } else if (win32wnd->isChild()) goto RunDefWndProc;
+      }
+      else if (win32wnd->isChild()) goto RunDefWndProc;
       else goto RunDefFrameProc;
 
@@ -288 +486 @@
       else goto RunDefFrameProc;
 
-    case WM_ACTIVATE:
+    case WM_PAINT:
       #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_ACTIVATE"));
+       dprintf(("PMFRAME: WM_PAINT"));
       #endif
       if (!win32wnd->isChild())
@@ -311 +509 @@
           RestoreOS2TIB();
           return res;
-        } else goto RunDefFrameProc;
-      } else
+        }
+        else goto RunDefFrameProc;
+      }
+      else
       {
-        MRESULT res;
+        RECTL rect;
         HPS hps;
-        RECTL rect;
-
-        RestoreOS2TIB();
-        res = OldFrameProc(hwnd,msg,mp1,mp2);
+
+        RestoreOS2TIB();
+        OldFrameProc(hwnd,msg,mp1,mp2);
         SetWin32TIB();
 
@@ -331 +530 @@
 
         RestoreOS2TIB();
-        return res;
-      }
-
-    case WM_PAINT:
-      #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_PAINT"));
-      #endif
-      if (!win32wnd->isChild())
-      {
-        if (CanDrawSizeBox(win32wnd))
-        {
-          MRESULT res;
-          HPS hps;
-          RECTL rect;
-
-          RestoreOS2TIB();
-          res = OldFrameProc(hwnd,msg,mp1,mp2);
-          SetWin32TIB();
-
-          GetSizeBox(win32wnd,&rect);
-          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
-          DrawSizeBox(hps,rect);
-          WinReleasePS(hps);
-
-          RestoreOS2TIB();
-          return res;
-        } else goto RunDefFrameProc;
-      } else
-      {
-        RECTL rect;
-        HPS hps;
-
-        RestoreOS2TIB();
-        OldFrameProc(hwnd,msg,mp1,mp2);
-        SetWin32TIB();
-
-        WinQueryWindowRect(hwnd,&rect);
-        rect.xRight = rect.xRight-rect.xLeft;
-        rect.yTop = rect.yTop-rect.yBottom;
-        rect.xLeft = rect.yBottom = 0;
-        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
-        DrawFrame(hps,&rect,win32wnd);
-        WinReleasePS(hps);
-
-        RestoreOS2TIB();
         return (MRESULT)0;
       }