Changeset 2291 for trunk/src

Timestamp:

Jan 1, 2000, 6:07:42 PM (26 years ago)

Author:

cbratschi

Message:

first few changes

Location:

trunk/src/user32/new

Files:

• oslibmsgtranslate.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• pmframe.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (5 diffs)
• pmwindow.h (modified) (2 diffs)

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.1 2000-01-01 14:57:19 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.2 2000-01-01 17:07:41 cbratschi Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -123 +123 @@
     winMsg->hwnd = win32wnd->getWindowHandle();
 
+  if (win32wnd && (os2Msg->hwnd == win32wnd->getOS2FrameWindowHandle()))
+  {
+    //special frame messages
+
+    switch (os2Msg->msg)
+    {
+      case WM_BUTTON1DOWN:
+      case WM_BUTTON1UP:
+      case WM_BUTTON1DBLCLK:
+      case WM_BUTTON2DOWN:
+      case WM_BUTTON2UP:
+      case WM_BUTTON2DBLCLK:
+      case WM_BUTTON3DOWN:
+      case WM_BUTTON3UP:
+      case WM_BUTTON3DBLCLK:
+        //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
+        if(win32wnd->lastHitTestVal != HTCLIENT_W) {
+            winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
+            winMsg->wParam  = win32wnd->lastHitTestVal;
+            winMsg->lParam  = MAKELONG(winMsg->pt.x, winMsg->pt.y); //screen coordinates
+        }
+        else {
+            point.x         = (*(POINTS *)&os2Msg->mp1).x;
+            point.y         = (*(POINTS *)&os2Msg->mp1).y;
+            ClientPoint.x   = point.x;
+            ClientPoint.y   = mapOS2ToWin32Y(os2Msg->hwnd,win32wnd->getOS2WindowHandle(),point.y);
+
+            winMsg->message = WINWM_LBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
+            winMsg->lParam  = MAKELONG(ClientPoint.x, ClientPoint.y); //client coordinates
+        }
+
+        return TRUE;
+
+      case WM_BUTTON2MOTIONSTART:
+      case WM_BUTTON2MOTIONEND:
+      case WM_BUTTON2CLICK:
+      case WM_BUTTON1MOTIONSTART:
+      case WM_BUTTON1MOTIONEND:
+      case WM_BUTTON1CLICK:
+      case WM_BUTTON3MOTIONSTART:
+      case WM_BUTTON3MOTIONEND:
+      case WM_BUTTON3CLICK:
+        goto dummymessage;
+
+      case WM_MOUSEMOVE:
+      {
+        ULONG keystate = 0, setcursormsg = WINWM_MOUSEMOVE;
+
+        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000)
+            keystate |= MK_LBUTTON_W;
+        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & 0x8000)
+            keystate |= MK_RBUTTON_W;
+        if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & 0x8000)
+            keystate |= MK_MBUTTON_W;
+        if(WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000)
+            keystate |= MK_SHIFT_W;
+        if(WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000)
+            keystate |= MK_CONTROL_W;
+
+        //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
+        if(win32wnd->lastHitTestVal != HTCLIENT_W)
+        {
+          setcursormsg   = WINWM_NCMOUSEMOVE;
+          winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->lParam = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+        } else
+        {
+          winMsg->wParam = (WPARAM)keystate;
+          winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1),mapOS2ToWin32Y(win32wnd->getOS2FrameWindowHandle(),win32wnd->getOS2WindowHandle(),SHORT2FROMMP(os2Msg->mp1)));
+        }
+        //OS/2 Window coordinates -> Win32 Window coordinates
+        winMsg->message = setcursormsg;
+        return TRUE;
+      }
+
+      case WM_PAINT:
+      {
+        winMsg->message = WINWM_NCPAINT;
+        return TRUE;
+      }
+
+      case WM_HITTEST:
+      {
+        OSLIBPOINT pt;
+
+        pt.x = (*(POINTS *)&os2Msg->mp1).x;
+        pt.y = (*(POINTS *)&os2Msg->mp1).y;
+
+        mapOS2ToWin32Point(os2Msg->hwnd,OSLIB_HWND_DESKTOP,&pt);
+        winMsg->message  = WINWM_NCHITTEST;
+        winMsg->wParam  = 0;
+        winMsg->lParam  = MAKELONG((USHORT)pt.x, (USHORT)pt.y);
+        return TRUE;
+      }
+    }
+    //do normal translation for all other messages
+  }
+
   switch(os2Msg->msg)
   {

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.29 2000-01-01 14:57:20 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.30 2000-01-01 17:07:41 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -90 +90 @@
 
   *hwndFrame = WinCreateWindow (hwndParent,
-                                TopLevel ? WC_FRAME : WIN32_INNERFRAME,
+                                WC_FRAME,
                                 pszName, dwWinStyle, 0, 0, 50, 30,
                                 hwndParent, HWND_TOP,

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.1 2000-01-01 14:57:21 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.2 2000-01-01 17:07:42 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -215 +215 @@
  PFNWP            OldFrameProc;
  MRESULT          rc;
+ THDB            *thdb;
+ MSG             *pWinMsg;
 
   SetWin32TIB();
 
+  thdb = GetThreadTHDB();
   win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwnd);
 
-  if(win32wnd == NULL || !win32wnd->getOldFrameProc())
+  if (!thdb || (win32wnd == NULL) || !win32wnd->getOldFrameProc())
   {
     dprintf(("Invalid win32wnd pointer for frame %x!!", hwnd));
     goto RunDefWndProc;
   }
+  pWinMsg = &thdb->msg;
 
   OldFrameProc = (PFNWP)win32wnd->getOldFrameProc();
@@ -231 +235 @@
   {
     case WM_FORMATFRAME:
+    {
+      RECTL *client;
+
       dprintf(("PMFRAME: WM_FORMATFRAME %x",hwnd));
-      //CB: call WM_NCCALCSIZE and set client pos
-      //    WM_PAINT -> WM_NCPAINT
-      //    WM_HITTEST -> MsgHitTest()
-      //    mouse messages -> MsgButton()
+      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
+    }
+
+    case WM_MINMAXFRAME:
+      dprintf(("PMFRAME: WM_MINMAXFRAME %x",hwnd));
+      //CB: todo
+      goto RunDefFrameProc;
 
     case WM_QUERYBORDERSIZE:
-      //CB: todo: set to 0
       goto RunDefFrameProc;
 
+    case WM_BUTTON1DOWN:
+    case WM_BUTTON1UP:
+    case WM_BUTTON1DBLCLK:
+    case WM_BUTTON2DOWN:
+    case WM_BUTTON2UP:
+    case WM_BUTTON2DBLCLK:
+    case WM_BUTTON3DOWN:
+    case WM_BUTTON3UP:
+    case WM_BUTTON3DBLCLK:
+        win32wnd->MsgButton(pWinMsg);
+        RestoreOS2TIB();
+        return (MRESULT)TRUE;
+
+    case WM_BUTTON2MOTIONSTART:
+    case WM_BUTTON2MOTIONEND:
+    case WM_BUTTON2CLICK:
+    case WM_BUTTON1MOTIONSTART:
+    case WM_BUTTON1MOTIONEND:
+    case WM_BUTTON1CLICK:
+    case WM_BUTTON3MOTIONSTART:
+    case WM_BUTTON3MOTIONEND:
+    case WM_BUTTON3CLICK:
+        RestoreOS2TIB();
+        return (MRESULT)TRUE;
+
+    case WM_MOUSEMOVE:
+    {
+        //OS/2 Window coordinates -> Win32 Window coordinates
+        win32wnd->MsgMouseMove(pWinMsg);
+        RestoreOS2TIB();
+        return (MRESULT)TRUE;
+    }
+
+    case WM_HITTEST:
+    {
+      DWORD res;
+
+      // Only send this message if the window is enabled
+      if (!WinIsWindowEnabled(hwnd))
+        res = HT_ERROR;
+      else if (win32wnd->getIgnoreHitTest())
+        res = HT_NORMAL;
+      else
+      {
+        dprintf(("USER32: WM_HITTEST %x (%d,%d)",hwnd,(*(POINTS *)&mp1).x,(*(POINTS *)&mp1).y));
+
+        //CB: WinWindowFromPoint: PM sends WM_HITTEST -> loop -> stack overflow
+        win32wnd->setIgnoreHitTest(TRUE);
+        res = win32wnd->MsgHitTest(pWinMsg);
+        win32wnd->setIgnoreHitTest(FALSE);
+      }
+      RestoreOS2TIB();
+      return (MRESULT)res;
+    }
+
+    case WM_PAINT:
+        win32wnd->DispatchMsgA(pWinMsg);
+        goto RunDefWndProc;
+
+//CB: not yet checked
     case WM_ADJUSTWINDOWPOS:
     {
@@ -399 +476 @@
 
     case WM_DESTROY:
-      #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_DESTROY"));
-      #endif
+      dprintf(("PMFRAME: WM_DESTROY %x",hwnd));
       WinSubclassWindow(hwnd,OldFrameProc);
       win32wnd->setOldFrameProc(NULL);
       goto RunDefFrameProc;
-
-    case WM_MOUSEMOVE:
-      if (InSizeBox(win32wnd,(POINTS*)&mp1))
-      {
-        WinSetPointer(HWND_DESKTOP,WinQuerySysPointer(HWND_DESKTOP,SPTR_SIZENWSE,FALSE));
-        RestoreOS2TIB();
-        return (MRESULT)TRUE;
-      }
-      else if (win32wnd->isChild()) goto RunDefWndProc;
-      else goto RunDefFrameProc;
-
-    case WM_BUTTON1DOWN:
-      #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_BUTTON1DOWN"));
-      #endif
-
-      if (InSizeBox(win32wnd,(POINTS*)&mp1))
-      {
-        WinSetActiveWindow(HWND_DESKTOP,hwnd);
-        WinSendMsg(hwnd,WM_TRACKFRAME,(MPARAM)(TF_RIGHT | TF_BOTTOM),(MPARAM)0);
-        RestoreOS2TIB();
-        return (MRESULT)TRUE;
-      }
-      else if (win32wnd->isChild()) goto RunDefWndProc;
-      else goto RunDefFrameProc;
-
-    case WM_BUTTON2DOWN:
-    case WM_BUTTON3DOWN:
-      #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_BUTTON2/3DOWN"));
-      #endif
-      if (win32wnd->isChild()) goto RunDefWndProc;
-      else goto RunDefFrameProc;
-
-    case WM_PAINT:
-      #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_PAINT %x",hwnd));
-      #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;
-      }
 
     default:

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.31 2000-01-01 14:57:21 cbratschi Exp $ */
+/* $Id: pmwindow.cpp,v 1.32 2000-01-01 17:07:42 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -54 +54 @@
 BOOL InitPM()
 {
-  CLASSINFO FrameClassInfo;
-
   hab = WinInitialize(0);
   dprintf(("Winitialize returned %x", hab));
@@ -93 +91 @@
      (PSZ)WIN32_STDCLASS,               /* Window class name            */
      (PFNWP)Win32WindowProc,            /* Address of window procedure  */
-//     CS_SIZEREDRAW | CS_HITTEST | CS_MOVENOTIFY,
-     //CS_SIZEREDRAW | CS_HITTEST,
      CS_HITTEST,
      NROF_WIN32WNDBYTES)) {
@@ -100 +96 @@
         return(FALSE);
    }
+  if(!WinRegisterClass(                 /* Register window class        */
+     hab,                               /* Anchor block handle          */
+     (PSZ)WIN32_STDCLASS2,              /* Window class name            */
+     (PFNWP)Win32WindowProc,            /* Address of window procedure  */
+     CS_HITTEST | CS_SAVEBITS,
+     NROF_WIN32WNDBYTES)) {
+        dprintf(("WinRegisterClass Win32BaseWindow failed"));
+        return(FALSE);
+   }
+/* //CB: perhaps reuse it for own frame
    if (!WinQueryClassInfo (hab, WC_FRAME, &FrameClassInfo)) {
      dprintf (("WinQueryClassInfo WC_FRAME failed"));
@@ -113 +119 @@
      return (FALSE);
    }
-
+*/
    WinQueryWindowRect(HWND_DESKTOP, &desktopRectl);
    ScreenWidth  = desktopRectl.xRight;

trunk/src/user32/new/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.3 2000-01-01 14:54:54 cbratschi Exp $ */
+/* $Id: pmwindow.h,v 1.4 2000-01-01 17:07:42 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -10 +10 @@
 
 #define WIN32_STDCLASS   "Win32WindowClass"
-#define WIN32_INNERFRAME "Win32InnerFrameClass"
+#define WIN32_STDCLASS2  "Win32WindowClass2"
 
 BOOL InitPM();