Changeset 12998

Timestamp:

Jan 12, 2000, 1:41:20 PM (25 years ago)

Author:

sandervl

Message:

menu, resize/move fixes + ported Wine messagebox code

Location:

tags/trunk/src/user32/new

Files:

• makefile (modified) (2 diffs)
• menu.cpp (modified) (5 diffs)
• msgbox.c (added)
• msgbox.cpp (deleted)
• oslibmsgtranslate.cpp (modified) (3 diffs)
• pmframe.cpp (modified) (7 diffs)
• pmwindow.cpp (modified) (4 diffs)
• user32.rc (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)
• win32wbase.h (modified) (3 diffs)

tags/trunk/src/user32/new/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.56 2000-01-11 10:38:33 sandervl Exp $
+# $Id: makefile,v 1.57 2000-01-12 12:40:41 sandervl Exp $
 
 #
@@ -115 +115 @@
 icontitle.obj: icontitle.cpp $(PDWIN32_INCLUDE)\win\icontitle.h
 
-msgbox.obj:    msgbox.cpp
+msgbox.obj:    msgbox.c
 window.obj:    window.cpp win32class.h win32wbase.h win32wndchild.h oslibwin.h win32wmdiclient.h win32wdesktop.h
 windowmsg.obj: windowmsg.cpp win32class.h win32wbase.h win32wndchild.h oslibmsg.h

tags/trunk/src/user32/new/menu.cpp ¶

@@ -1 @@
-/* $Id: menu.cpp,v 1.7 2000-01-11 17:34:42 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.8 2000-01-12 12:40:43 sandervl Exp $*/
 /*
  * Menu functions
@@ -2402 +2402 @@
         if( hNewWnd != pmt->hOwnerWnd )
         {
-            ReleaseCapture();
+            ReleaseCapture(); 
             pmt->hOwnerWnd = hNewWnd;
+            SetCapture(pmt->hOwnerWnd); //SvL: Don't know if this is good enough
             //EVENT_Capture( pmt->hOwnerWnd, HTMENU ); //CB: todo
         }
@@ -2594 +2595 @@
 
     //EVENT_Capture( mt.hOwnerWnd, HTMENU ); //CB: todo
+    //SvL: Set keyboard & mouse event capture
+    SetCapture(mt.hOwnerWnd);
 
     while (!fEndMenu)
@@ -2602 +2605 @@
         /* we have to keep the message in the queue until it's
          * clear that menu loop is not over yet. */
-        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
+//        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
+        //SvL: Getting messages for only the menu delays background paints (i.e. VPBuddy logo)
+        if (!GetMessageA(&msg,0,0,0)) break;
         TranslateMessage( &msg );
         mt.pt = msg.pt;
@@ -2610 +2615 @@
 
         fRemove = FALSE;
-        if ((msg.message >= WM_MOUSEFIRST) && (msg.message <= WM_MOUSELAST))
+        if((msg.message >= WM_MOUSEFIRST) && (msg.message <= WM_MOUSELAST))
         {
             /* Find a menu for this mouse event */

tags/trunk/src/user32/new/oslibmsgtranslate.cpp ¶

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.10 2000-01-10 23:29:12 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.11 2000-01-12 12:40:44 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -561 +561 @@
     }
 
-    case WM_INITMENU:
-        winMsg->message = WINWM_INITMENU;
-        winMsg->wParam  = (WPARAM)os2Msg->mp2; //hMenu
-        break;
-
-    case WM_MENUSELECT:
-    case WM_MENUEND:
-    case WM_NEXTMENU:
-        goto dummymessage;
-
     case WM_TIMER:
         if (os2Msg->mp2)
@@ -630 +620 @@
 
     case WM_CONTEXTMENU:
-    {
-        OSLIBPOINT pt;
-
-        pt.x = (*(POINTS *)&os2Msg->mp1).x;
-        pt.y = (*(POINTS *)&os2Msg->mp1).y;
-        mapOS2ToWin32Point(os2Msg->hwnd,OSLIB_HWND_DESKTOP,&pt);
-        winMsg->message = WINWM_CONTEXTMENU;
-        winMsg->wParam  = (WPARAM)win32wnd->getWindowHandle();
-        winMsg->lParam  = MAKELONG((USHORT)pt.x, (USHORT)pt.y);
-        break;
-    }
-
+    case WM_INITMENU:
+    case WM_MENUSELECT:
+    case WM_MENUEND:
+    case WM_NEXTMENU:
     case WM_SYSCOLORCHANGE:
     case WM_SYSVALUECHANGED:

tags/trunk/src/user32/new/pmframe.cpp ¶

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.10 2000-01-10 23:29:13 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.11 2000-01-12 12:40:45 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -107 +107 @@
   {
     case WM_FORMATFRAME:
-    {
-      PSWP pswp = (PSWP)mp1,swpClient;
-      RECTL *client = (PRECTL)mp2,rect;
-      RECT winRect;
-      INT ccount;
-
-      if (!win32wnd->IsWindowCreated()) goto RunDefFrameProc;
-      dprintf(("PMFRAME: WM_FORMATFRAME %x",hwnd));
-      RestoreOS2TIB();
-      ccount = (INT)OldFrameProc(hwnd,msg,mp1,mp2);
-      SetWin32TIB();
-      dprintf(("Frame size: %d %d",win32wnd->getWindowWidth(),win32wnd->getWindowHeight()));
-      win32wnd->MsgFormatFrame();
-      //CB: todo: use result for WM_CALCVALIDRECTS
-      mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
-      swpClient = &pswp[ccount-1];
-      swpClient->x = rect.xLeft;
-      swpClient->y = rect.yBottom;
-      swpClient->cx = rect.xRight-rect.xLeft;
-      swpClient->cy = rect.yTop-rect.yBottom;
-      dprintf(("New client position: x=%d y=%d w=%d h=%d",swpClient->x,swpClient->y,swpClient->cx,swpClient->cy));
-      RestoreOS2TIB();
-      return (MRESULT)ccount;
-    }
+        break;
 
     case WM_MINMAXFRAME:
@@ -141 +118 @@
       {
         win32wnd->setStyle((win32wnd->getStyle() & ~WS_MINIMIZE_W) | WS_MAXIMIZE_W);
-      } else if ((swp->fl & SWP_MINIMIZE) == SWP_MINIMIZE)
+      } 
+      else if ((swp->fl & SWP_MINIMIZE) == SWP_MINIMIZE)
       {
         win32wnd->setStyle((win32wnd->getStyle() & ~WS_MAXIMIZE_W) | WS_MINIMIZE_W);
-      } else if ((swp->fl & SWP_RESTORE) == SWP_RESTORE)
+      } 
+      else if ((swp->fl & SWP_RESTORE) == SWP_RESTORE)
       {
         win32wnd->setStyle(win32wnd->getStyle() & ~(WS_MINIMIZE_W | WS_MAXIMIZE_W));
@@ -277 +256 @@
       WINDOWPOS wp;
       HWND      hParent = NULLHANDLE;
+      RECTL rect;
+      SWP swpClient = {0};
 
         dprintf(("PMFRAME: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
-            goto PosChangedEnd;
+        {
+                swpClient.hwnd = win32wnd->getOS2WindowHandle();
+                swpClient.hwndInsertBehind = 0;
+                swpClient.x  = 0;
+                swpClient.y  = 0;
+                swpClient.cx = 0;
+                swpClient.cy = 0;
+                swpClient.fl = pswp->fl & ~SWP_ZORDER;
+                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
+                goto PosChangedEnd;
+        }
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
@@ -293 +284 @@
         OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
 
-        win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+                win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+
+                win32wnd->MsgFormatFrame();
+                //CB: todo: use result for WM_CALCVALIDRECTS
+                mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+
+                swpClient.hwnd = win32wnd->getOS2WindowHandle();
+                swpClient.hwndInsertBehind = 0;
+                swpClient.x  = rect.xLeft;
+                swpClient.y  = rect.yBottom;
+                swpClient.cx = rect.xRight-rect.xLeft;
+                swpClient.cy = rect.yTop-rect.yBottom;
+                //TODO: Get rid of SWP_SHOW; needed for winhlp32 button bar for now
+                swpClient.fl = (pswp->fl & ~SWP_ZORDER) | SWP_MOVE | SWP_SHOW;
+                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
+        }
 
         if(win32wnd->CanReceiveSizeMsgs())
           win32wnd->MsgPosChanged((LPARAM)&wp);
 
+        //update child positions: rectWindow is in window coordinates
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+                FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
+        }
+
 PosChangedEnd:
-        //update the client rect
-        RECTL rectl;
-
-        WinQueryWindowRect(win32wnd->getOS2FrameWindowHandle(),&rectl);
-        mapOS2ToWin32Rect(win32wnd->getOS2FrameWindowHandle(),OSLIB_HWND_DESKTOP,(PRECTLOS2)&rectl,win32wnd->getWindowRect());
-        WinQueryWindowRect(win32wnd->getOS2WindowHandle(),&rectl);
-        mapOS2ToWin32Rect(win32wnd->getOS2WindowHandle(),WinQueryWindow(hwnd,QW_PARENT),(PRECTLOS2)&rectl,win32wnd->getClientRectPtr());
-
-        //calls WM_FORMATFRAME if SWP_SIZE is set
         RestoreOS2TIB();
-        rc = OldFrameProc(hwnd,msg,mp1,mp2);
-        SetWin32TIB();
-        //update child positions: rectWindow is in window coordinates
-        FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
-        RestoreOS2TIB();
-        return rc;
+        return (MRESULT)FALSE;
     }
 
@@ -320 +318 @@
     {
       PRECTL oldRect = (PRECTL)mp1,newRect = oldRect+1;
-      UINT res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
+      UINT res = 0; //= CVR_ALIGNLEFT | CVR_ALIGNTOP;
 
 //CB: todo: use WM_NCCALCSIZE result
@@ -334 +332 @@
 
       //CB: PM sets client window position
-      RestoreOS2TIB();
-      OldFrameProc(hwnd,msg,mp1,mp2);
-      SetWin32TIB();
+//      RestoreOS2TIB();
+//      OldFrameProc(hwnd,msg,mp1,mp2);
+//      SetWin32TIB();
 
       RestoreOS2TIB();

tags/trunk/src/user32/new/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.35 2000-01-11 13:52:18 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.36 2000-01-12 12:40:46 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -245 +245 @@
 
     case WM_ADJUSTWINDOWPOS:
-        goto RunDefWndProc;
+    {
+      PSWP      pswp   = (PSWP)mp1;
+        dprintf(("PMWINDOW: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+        goto RunDefWndProc;
+    }
 
     case WM_WINDOWPOSCHANGED:
@@ -366 +370 @@
         break;
 
-    case WM_INITMENU:
-        win32wnd->MsgInitMenu(pWinMsg);
-        break;
-
     case WM_TIMER:
         win32wnd->DispatchMsgA(pWinMsg);
-        goto RunDefWndProc;
-
-    case WM_MENUSELECT:
-    case WM_MENUEND:
-    case WM_NEXTMENU:
         goto RunDefWndProc;
 
@@ -434 +429 @@
         goto RunDefWndProc;
 
+    case WM_INITMENU:
+    case WM_MENUSELECT:
+    case WM_MENUEND:
+    case WM_NEXTMENU:
     case WM_SYSCOLORCHANGE:
     case WM_SYSVALUECHANGED:

tags/trunk/src/user32/new/user32.rc ¶

@@ -1 @@
-/* $Id: user32.rc,v 1.7 2000-01-03 20:53:50 cbratschi Exp $ */
+/* $Id: user32.rc,v 1.8 2000-01-12 12:40:46 sandervl Exp $ */
 /* converted from WINE */
 
@@ -806 +806 @@
 #define OCR_APPSTARTING     32650
 #define OCR_HELP            32651  /* only defined in Odin */
+
+
+MSGBOX DIALOG 100, 80, 216, 168
+STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+BEGIN
+        ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
+        LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
+        PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Cancel", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Abort", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Retry", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Ignore", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Yes", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
 
 /////////////////////////////////////////////////////////////////////////////

tags/trunk/src/user32/new/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.34 2000-01-11 17:34:43 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.35 2000-01-12 12:40:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1023 +1023 @@
 }
 //******************************************************************************
-//TODO: Depending on menu type, we should send WM_INITMENU or WM_INITPOPUPMENU
-//TODO: PM sends it for each submenu that gets activated; Windows only for the first
-//      submenu; once the menu bar is active, moving the cursor doesn't generate other
-//      WM_INITMENU msgs. Not really a problem, but might need to fix this later on.
-//******************************************************************************
-ULONG Win32BaseWindow::MsgInitMenu(MSG *msg)
-{
-    return SendInternalMessageA(msg->message, msg->wParam, msg->lParam);
-}
-//******************************************************************************
 //******************************************************************************
 ULONG Win32BaseWindow::MsgNCPaint()
@@ -1061 +1051 @@
 
     return rc;
-  } else return 0;
+  }
+  else return 0;
 }
 //******************************************************************************
@@ -1100 +1091 @@
     SendInternalMessageA(WM_GETTEXT, wndNameLength, (LPARAM)windowNameA);
     return windowNameA;
-}
-//******************************************************************************
-//******************************************************************************
-ULONG  Win32BaseWindow::MsgContextMenu(ULONG x,ULONG y)
-{
-  return SendInternalMessageA(WM_CONTEXTMENU,Win32Hwnd,MAKELPARAM(x,y));
 }
 //******************************************************************************

tags/trunk/src/user32/new/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.24 2000-01-11 17:34:44 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.25 2000-01-12 12:40:49 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -115 +115 @@
          ULONG  MsgPaint(ULONG tmp1, BOOL select = TRUE);
          ULONG  MsgEraseBackGround(HDC hdc);
-         ULONG  MsgInitMenu(MSG *msg);
          ULONG  MsgHitTest(ULONG x, ULONG y);
          ULONG  MsgNCPaint();
@@ -125 +124 @@
          ULONG  MsgGetTextLength();
          char  *MsgGetText();
-         ULONG  MsgContextMenu(ULONG x,ULONG y);
          VOID   updateWindowStyle(DWORD oldExStyle,DWORD oldStyle);