Changeset 2292 for trunk/src/user32/new/pmframe.cpp

Timestamp:

Jan 2, 2000, 8:30:47 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/new/pmframe.cpp (modified) (12 diffs)

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.2 2000-01-01 17:07:42 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.3 2000-01-02 19:30:43 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -16 +16 @@
 #include <os2wrap.h>
 #include <stdlib.h>
+#include <string.h>
 #include "win32type.h"
 #include <misc.h>
@@ -24 +25 @@
 #include "oslibwin.h"
 #include "caret.h"
+#include "oslibmsg.h"
 
 #define PMFRAMELOG
@@ -216 +218 @@
  MRESULT          rc;
  THDB            *thdb;
- MSG             *pWinMsg;
+ MSG             *pWinMsg,winMsg;
 
   SetWin32TIB();
@@ -228 +230 @@
     goto RunDefWndProc;
   }
-  pWinMsg = &thdb->msg;
+
+  if((thdb->msgstate & 1) == 0)
+  {//message that was sent directly to our window proc handler; translate it here
+        QMSG qmsg;
+
+        qmsg.msg  = msg;
+        qmsg.hwnd = hwnd;
+        qmsg.mp1  = mp1;
+        qmsg.mp2  = mp2;
+        qmsg.time = WinQueryMsgTime(thdb->hab);
+        WinQueryMsgPos(thdb->hab, &qmsg.ptl);
+        qmsg.reserved = 0;
+
+        if(OS2ToWinMsgTranslate((PVOID)thdb, &qmsg, &winMsg, FALSE, MSG_REMOVE) == FALSE)
+        {//message was not translated
+            memset(&winMsg, 0, sizeof(MSG));
+        }
+        pWinMsg = &winMsg;
+  }
+  else {
+        pWinMsg = &thdb->msg;
+        thdb->msgstate++;
+  }
 
   OldFrameProc = (PFNWP)win32wnd->getOldFrameProc();
@@ -236 +260 @@
     case WM_FORMATFRAME:
     {
-      RECTL *client;
-
+      PSWP pswp = (PSWP)mp1,swpClient;
+      RECTL *client = (PRECTL)mp2,rect;
+      INT ccount;
+
+      if (!win32wnd->IsWindowCreated()) goto RunDefFrameProc;
       dprintf(("PMFRAME: WM_FORMATFRAME %x",hwnd));
-      client = (PRECTL)mp2;
-#if 0
-//CB: todo: client rect is wrong/not set with WM_NCCALCSIZE
-      mapWin32ToOS2Rect(hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)client);
-
-      RestorOS2TIB();
-      return (MRESULT)1;
-#else
-      goto RunDefFrameProc;
-#endif
+      RestoreOS2TIB();
+      ccount = (INT)OldFrameProc(hwnd,msg,mp1,mp2);
+      SetWin32TIB();
+      mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+      WinMapWindowPoints(WinQueryWindow(hwnd,QW_PARENT),hwnd,(PPOINTL)&rect,2);
+      swpClient = &pswp[ccount-1];
+      swpClient->x = rect.xLeft;
+      swpClient->y = rect.yBottom;
+      swpClient->cx = rect.xRight-rect.xLeft;
+      swpClient->cy = rect.yTop-rect.yBottom;
+      RestoreOS2TIB();
+      return (MRESULT)ccount;
     }
 
@@ -268 +297 @@
     case WM_BUTTON3UP:
     case WM_BUTTON3DBLCLK:
-        win32wnd->MsgButton(pWinMsg);
-        RestoreOS2TIB();
+        if (win32wnd->IsWindowCreated())
+        {
+          win32wnd->MsgButton(pWinMsg);
+          RestoreOS2TIB();
+        }
         return (MRESULT)TRUE;
 
@@ -287 +319 @@
     {
         //OS/2 Window coordinates -> Win32 Window coordinates
-        win32wnd->MsgMouseMove(pWinMsg);
+        if (win32wnd->IsWindowCreated())
+          win32wnd->MsgMouseMove(pWinMsg);
         RestoreOS2TIB();
         return (MRESULT)TRUE;
@@ -297 +330 @@
 
       // Only send this message if the window is enabled
-      if (!WinIsWindowEnabled(hwnd))
+      if (!win32wnd->IsWindowCreated())
+        res = HT_NORMAL;
+      else if (!WinIsWindowEnabled(hwnd))
         res = HT_ERROR;
       else if (win32wnd->getIgnoreHitTest())
@@ -315 +350 @@
 
     case WM_PAINT:
-        win32wnd->DispatchMsgA(pWinMsg);
+        dprintf(("PMFRAME: WM_PAINT"));
+        if (win32wnd->IsWindowCreated())
+          win32wnd->MsgNCPaint();
         goto RunDefWndProc;
 
@@ -430 +467 @@
       UINT res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
 
-      //CB: only used if CS_SIZEDRAW isn't set
-      //    PM moves children -> fast, no flickering (if redraw flags not set)
+//CB: todo: use WM_NCCALCSIZE
       if (win32wnd->getWindowClass())
       {
@@ -456 +492 @@
         USHORT flags = WinQueryWindowUShort(hwnd,QWS_FLAGS);
 
-        //CB: emulate WM_ACTIVATE -> no flickering
-        hwndTitle = WinWindowFromID(hwnd,FID_TITLEBAR);
-        if (hwndTitle) WinSendMsg(hwndTitle,TBM_SETHILITE,mp1,MPVOID);
-
-        WinSendMsg(WinWindowFromID(hwnd,FID_CLIENT),WM_ACTIVATE,mp1,mp2);
-        WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
-
-        //CB: show owner behind the dialog
-        if (win32wnd->IsModalDialog())
+        if (win32wnd->IsWindowCreated())
         {
-          Win32BaseWindow *topOwner = win32wnd->getOwner()->GetTopParent();
-
-          if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
+          WinSendMsg(WinWindowFromID(hwnd,FID_CLIENT),WM_ACTIVATE,mp1,mp2);
+          WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
+
+          //CB: show owner behind the dialog
+          if (win32wnd->IsModalDialog())
+          {
+            Win32BaseWindow *topOwner = win32wnd->getOwner()->GetTopParent();
+
+            if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
+          }
+        } else
+        {
+          WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
         }