Changeset 2391 for trunk/src

Timestamp:

Jan 9, 2000, 6:57:50 PM (26 years ago)

Author:

sandervl

Message:

System menu commands now work

Location:

trunk/src/user32

Files:

• oslibmenu.cpp (modified) (2 diffs)
• oslibmenu.h (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• pmframe.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wbasepaint.cpp (modified) (6 diffs)

trunk/src/user32/oslibmenu.cpp

@@ -1 @@
-/* $Id: oslibmenu.cpp,v 1.7 2000-01-08 16:53:38 sandervl Exp $ */
+/* $Id: oslibmenu.cpp,v 1.8 2000-01-09 17:57:46 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -110 +110 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibWinSetSystemMenu(HWND hMenu)
+{
+   WinSetWindowUShort(hMenu, QWS_ID, FID_SYSMENU);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibmenu.h

@@ -1 @@
-/* $Id: oslibmenu.h,v 1.5 2000-01-08 14:15:06 sandervl Exp $ */
+/* $Id: oslibmenu.h,v 1.6 2000-01-09 17:57:46 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -24 +24 @@
 BOOL  OSLibGetMenuItemRect(HWND hMenu, int index, LPRECT pRect);
 int   OSLibGetMenuItemPos(HWND hMenu, int item);
- 
+void  OSLibWinSetSystemMenu(HWND hMenu);
+
 #endif //__OSLIBGDI_H__

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.11 2000-01-09 14:37:09 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.12 2000-01-09 17:57:47 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -396 +396 @@
       ULONG win32sc;
 
+
         if(SHORT2FROMMP(os2Msg->mp2) == TRUE) {//syscommand caused by mouse action
-            POINTL pointl;
-            WinQueryPointerPos(HWND_DESKTOP, &pointl);
-            x = pointl.x;
-            y = mapScreenY(y);
-        }
-        switch(SHORT1FROMMP(os2Msg->mp1)) {
-        case SC_MOVE:
-            win32sc = SC_MOVE_W;
-            break;
-        case SC_CLOSE:
-            win32sc = SC_CLOSE_W;
-            break;
-        case SC_MAXIMIZE:
-            win32sc = SC_MAXIMIZE_W;
-            break;
-        case SC_MINIMIZE:
-            win32sc = SC_MINIMIZE_W;
-            break;
-        case SC_NEXTFRAME:
-        case SC_NEXTWINDOW:
-            win32sc = SC_NEXTWINDOW_W;
-            break;
-        case SC_RESTORE:
-            win32sc = SC_RESTORE_W;
-            break;
-        case SC_TASKMANAGER:
-            win32sc = SC_TASKLIST_W;
-            break;
-        default:
-            goto dummymessage;
-        }
-        winMsg->message    = WINWM_SYSCOMMAND;
-        winMsg->wParam = (WPARAM)win32sc;
-        winMsg->lParam = MAKELONG((USHORT)x, (USHORT)y);
+            x = winMsg->pt.x;
+            y = winMsg->pt.y;
+        }
+        //When fOS2Look == 0, we display our own system menu (so no translation required)
+        if(fOS2Look) {
+            switch(SHORT1FROMMP(os2Msg->mp1)) {
+            case SC_MOVE:
+                win32sc = SC_MOVE_W;
+                break;
+            case SC_CLOSE:
+                win32sc = SC_CLOSE_W;
+                break;
+            case SC_MAXIMIZE:
+                win32sc = SC_MAXIMIZE_W;
+                break;
+            case SC_MINIMIZE:
+                win32sc = SC_MINIMIZE_W;
+                break;
+            case SC_NEXTFRAME:
+            case SC_NEXTWINDOW:
+                win32sc = SC_NEXTWINDOW_W;
+                break;
+            case SC_RESTORE:
+                win32sc = SC_RESTORE_W;
+                break;
+            case SC_TASKMANAGER:
+                win32sc = SC_TASKLIST_W;
+                break;
+            default:
+                goto dummymessage;
+            }
+        }
+        else    win32sc = (ULONG)os2Msg->mp1;
+
+        winMsg->message = WINWM_SYSCOMMAND;
+        winMsg->wParam  = (WPARAM)win32sc;
+        winMsg->lParam  = MAKELONG((USHORT)x, (USHORT)y);
         break;
     }

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.34 2000-01-09 14:37:09 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.35 2000-01-09 17:57:47 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -405 +405 @@
     }
 
+    case WM_COMMAND:
+    {
+        dprintf(("PMFRAME: WM_COMMAND %x %x %x", hwnd, mp1, mp2));
+        HWND hSysMenu = win32wnd->getSystemMenu();
+        USHORT id = (USHORT)(ULONG)mp1;
+        if(hSysMenu) {
+                if((int)WinSendMsg(hSysMenu, MM_ITEMPOSITIONFROMID, MPFROM2SHORT(id, TRUE), 0) != MIT_NONE) {
+                        return (MRESULT)WinPostMsg(win32wnd->getOS2WindowHandle(), WM_SYSCOMMAND, mp1, (MPARAM)1);
+                }
+        }
+        goto RunDefFrameProc;
+    } 
+
     case WM_DESTROY:
       #ifdef PMFRAMELOG

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.137 2000-01-09 16:52:54 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.138 2000-01-09 17:57:48 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2008 +2008 @@
         if(fRevert == FALSE) {
             OS2SysMenu = LoadMenuA(hInstanceUser32, (LPCSTR)"SYSMENU");
+            if(OS2SysMenu) {
+                OSLibWinSetSystemMenu(OS2SysMenu);
+            }
             return OS2SysMenu;
         }

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.69 2000-01-09 15:56:05 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.70 2000-01-09 17:57:49 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -152 +152 @@
          BOOL   SetMenu(ULONG hMenu);
          HMENU  GetSystemMenu(BOOL fRevert);
+         HMENU  getSystemMenu();
 
          BOOL   SetIcon(HICON hIcon);

trunk/src/user32/win32wbasepaint.cpp

@@ -1 @@
-/* $Id: win32wbasepaint.cpp,v 1.3 2000-01-09 16:52:55 sandervl Exp $ */
+/* $Id: win32wbasepaint.cpp,v 1.4 2000-01-09 17:57:50 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -43 +43 @@
 #include "initterm.h"
 
+#define SC_ABOUTODIN            (SC_SCREENSAVE+1)
+#define SC_PUTMARK              (SC_SCREENSAVE+2)
+
 #define HAS_DLGFRAME(style,exStyle) \
     (((exStyle) & WS_EX_DLGMODALFRAME) || \
@@ -83 +86 @@
 static HBITMAP hbitmapRestoreD = 0;
 static HMENU   hSysMenu = 0;
+
+static INT (* WINAPI ShellAboutA)(HWND,LPCSTR,LPCSTR,HICON) = 0;
 
 BYTE lpGrayMask[] = { 0xAA, 0xA0,
@@ -1015 +1020 @@
             hwndTitleBar = OSLibWinGetFrameControlHandle(getOS2FrameWindowHandle(), OSLIB_FID_TITLEBAR);
             OSLibWinQueryWindowRect(hwndTitleBar, &rect, RELATIVE_TO_SCREEN);
-            TrackPopupMenu((OS2SysMenu) ? OS2SysMenu : hSysMenu, TPM_LEFTALIGN|TPM_LEFTBUTTON,
-                           rect.left, rect.bottom+1,
-                           0, getWindowHandle(), NULL);
+            //Need to use Open32 api directly, as we want the msgs to go to the frame window
+            O32_TrackPopupMenu((OS2SysMenu) ? OS2SysMenu : hSysMenu, TPM_LEFTALIGN|TPM_LEFTBUTTON,
+                               rect.left, rect.bottom+1,
+                               0, getOS2FrameWindowHandle(), NULL);
         }
         //MENU_TrackMouseMenuBar( wndPtr, wParam & 0x000F, pt32 );
+        break;
+
+    case SC_SCREENSAVE:
+        if (wParam == SC_ABOUTODIN) {
+            if(ShellAboutA == 0) {
+                HINSTANCE hShell32 = LoadLibraryA("SHELL32");
+                if(hShell32 == 0)
+                    break;
+                *(VOID **)&ShellAboutA = (VOID *)GetProcAddress(hShell32, "ShellAboutA");
+            }
+            ShellAboutA(Win32Hwnd,"Odin","Odin alpha release compiled with IBM VAC++",0);
+        }
+        else
+        if (wParam == SC_PUTMARK)
+            dprintf(("Mark requested by user\n"));
         break;
 
@@ -1040 +1061 @@
         break;
 
-    case SC_SCREENSAVE:
-        if (wParam == SC_ABOUTWINE)
-            ShellAboutA(hwnd, "Odin", WINE_RELEASE_INFO, 0);
-        else
-        if (wParam == SC_PUTMARK)
-            dprintf(("Mark requested by user\n"));
-        break;
-
     case SC_HOTKEY:
     case SC_ARRANGE:
@@ -1059 +1072 @@
 //******************************************************************************
 //******************************************************************************
-
+HMENU Win32BaseWindow::getSystemMenu()
+{
+    if(!fOS2Look) {
+        return (OS2SysMenu) ? OS2SysMenu : hSysMenu;
+    }
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
+