Changeset 5993 for trunk/src/user32

Timestamp:

Jun 13, 2001, 12:29:46 PM (24 years ago)

Author:

sandervl

Message:

OS/2 looks changes + fixes

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibwin.cpp (modified) (6 diffs)
• oslibwin.h (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.55 2001-05-19 11:16:01 sandervl Exp $
+; $Id: USER32.DEF,v 1.56 2001-06-13 10:29:44 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -693 +693 @@
     _checkOrigin@4                                               @2029 NONAME
 
+    _SetWindowAppearance@4                                       @2030 NONAME

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.99 2001-06-13 08:19:34 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.100 2001-06-13 10:29:44 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -123 +123 @@
       if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
           *OSFrameStyle = FCF_TITLEBAR;
-          if(dwStyle & WS_SYSMENU_W)
+          if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W))
           {
               *OSFrameStyle |= FCF_SYSMENU;
@@ -130 +130 @@
               *OSFrameStyle |= FCF_MINMAX;
           }
+          else
+          if(dwStyle & WS_SYSMENU_W) {
+              *OSFrameStyle |= FCF_CLOSEBUTTON;
+          }
       }
   }
@@ -136 +140 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect)
+BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
+                                   DWORD dwExStyle, HICON hSysMenuIcon)
 {
   SWP  swp[3];
@@ -149 +154 @@
   }
 
+#if 0
   hwndControl = WinWindowFromID(hwndFrame, FID_SYSMENU);
   if(hwndControl) {
@@ -165 +171 @@
       i++;
   }
-  hwndControl = WinWindowFromID(hwndFrame, FID_TITLEBAR);
-  if(hwndControl) {
-      swp[i].hwnd = hwndControl;
-      swp[i].hwndInsertBehind = HWND_TOP;
-      swp[i].x  = pRect->xLeft;
-      swp[i].y  = pRect->yBottom;
-      if(pRect->yTop - pRect->yBottom > minmaxheight) {
-          swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+#else
+  if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W) && hSysMenuIcon) {
+      pRect->xLeft += minmaxwidth/2;
+  }
+#endif
+  if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
+      hwndControl = WinWindowFromID(hwndFrame, FID_TITLEBAR);
+      if(hwndControl) {
+          swp[i].hwnd = hwndControl;
+          swp[i].hwndInsertBehind = HWND_TOP;
+          swp[i].x  = pRect->xLeft;
+          swp[i].y  = pRect->yBottom;
+          if(pRect->yTop - pRect->yBottom > minmaxheight) {
+              swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+          }
+          swp[i].cx = pRect->xRight - pRect->xLeft;
+          if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W)) {
+              swp[i].cx -= minmaxwidth;
+          }
+          if(dwStyle & WS_SYSMENU_W) {
+              swp[i].cx -= minmaxwidth/2;
+          }
+          swp[i].cy = minmaxheight;
+          swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+          dprintf(("FID_TITLEBAR (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
+          pRect->xLeft += swp[i].cx;
+          i++;
       }
-      swp[i].cx = pRect->xRight - pRect->xLeft;
-      if(WinWindowFromID(hwndFrame, FID_MINMAX)) {
-          swp[i].cx -= (minmaxwidth + minmaxwidth/2);
+  }
+  if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W) || (dwStyle & WS_SYSMENU_W)) {
+      hwndControl = WinWindowFromID(hwndFrame, FID_MINMAX);
+      if(hwndControl) {
+          swp[i].hwnd = hwndControl;
+          swp[i].hwndInsertBehind = HWND_TOP;
+          swp[i].x  = pRect->xLeft;
+          swp[i].y  = pRect->yBottom;
+          if(pRect->yTop - pRect->yBottom > minmaxheight) {
+              swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
+          }
+          swp[i].cx = 0;
+          if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W)) {
+              swp[i].cx += minmaxwidth;
+          }
+          if(dwStyle & WS_SYSMENU_W) {
+              swp[i].cx += minmaxwidth/2;
+          }
+          swp[i].cy = minmaxheight;
+          swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+          dprintf(("FID_MINMAX (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
+          pRect->xLeft += swp[i].cx;
+          i++;
       }
-      swp[i].cy = minmaxheight;
-      swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
-      dprintf(("FID_TITLEBAR (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
-      pRect->xLeft += swp[i].cx;
-      i++;
-  }
-  hwndControl = WinWindowFromID(hwndFrame, FID_MINMAX);
-  if(hwndControl) {
-      swp[i].hwnd = hwndControl;
-      swp[i].hwndInsertBehind = HWND_TOP;
-      swp[i].x  = pRect->xLeft;
-      swp[i].y  = pRect->yBottom;
-      if(pRect->yTop - pRect->yBottom > minmaxheight) {
-          swp[i].y += pRect->yTop - pRect->yBottom - minmaxheight;
-      }
-      swp[i].cx = minmaxwidth + minmaxwidth/2;
-      swp[i].cy = minmaxheight;
-      swp[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
-      dprintf(("FID_MINMAX (%d,%d)(%d,%d)", swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
-      pRect->xLeft += swp[i].cx;
-      i++;
   }
   return WinSetMultWindowPos(GetThreadHAB(), swp, i);

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.56 2001-06-10 12:05:39 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.57 2001-06-13 10:29:44 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -47 +47 @@
 DWORD OSLibQueryWindowStyle(HWND hwnd);
 
-BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect);
+BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, DWORD dwExStyle, HICON hSysMenuIcon);
 
 #define OSLIB_QWL_USER -4

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.134 2001-06-10 12:05:39 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.135 2001-06-13 10:29:45 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -157 +157 @@
     return TRUE;
 } /* End of main */
+//******************************************************************************
+//menu.cpp
+BOOL MENU_Init();
+//******************************************************************************
+void WIN32API SetWindowAppearance(BOOL fLooks)
+{
+    if(fLooks) {
+        SYSCOLOR_Init(FALSE); //use OS/2 colors
+    }
+    fOS2Look = fLooks;
+    MENU_Init();
+}
 //******************************************************************************
 //Win32 window message handler

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.100 2001-06-12 17:02:36 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.101 2001-06-13 10:29:45 sandervl Exp $ */
 
 /*
@@ -633 +633 @@
         *(BOOL *)pvParam = FALSE; //CB: where is the Warp 4 setting stored?
         break;
+
     case SPI_GETNONCLIENTMETRICS:
     {
         LPNONCLIENTMETRICSA lpnm = (LPNONCLIENTMETRICSA)pvParam;
                 
-        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
+        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
         {
             memset(lpnm, 0, sizeof(NONCLIENTMETRICSA));
@@ -652 +653 @@
 
             LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont);
-            GetProfileStringA("Desktop", "MenuFont", "MS Sans Serif",
-                              lpLogFont->lfFaceName, LF_FACESIZE);
-
-            lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 13);
-            lpLogFont->lfWidth = 0;
-            lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
-            lpLogFont->lfWeight = FW_NORMAL;
+            if(fOS2Look) {
+                GetProfileStringA("Desktop", "MenuFont", "WarpSans",
+                                  lpLogFont->lfFaceName, LF_FACESIZE);
+                lpLogFont->lfWeight = FW_BOLD;
+                lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 16);
+                lpLogFont->lfWidth = 0;
+                lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+            }
+            else {
+                GetProfileStringA("Desktop", "MenuFont", "MS Sans Serif",
+                                  lpLogFont->lfFaceName, LF_FACESIZE);
+                lpLogFont->lfWeight = FW_NORMAL;
+                lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 13);
+                lpLogFont->lfWidth = 0;
+                lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+            }
             lpLogFont->lfItalic = FALSE;
             lpLogFont->lfStrikeOut = FALSE;
@@ -677 +687 @@
             lpnm->iMenuHeight      = GetSystemMetrics(SM_CYMENU);
             lpnm->iMenuWidth       = lpnm->iMenuHeight; //TODO
-        }
+          }
         else
-        {
+        {
             dprintf(("SPI_GETNONCLIENTMETRICS: size mismatch !! (is %d; should be %d)\n", lpnm->cbSize, sizeof(NONCLIENTMETRICSA)));
             /* FIXME: SetLastError? */

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.265 2001-06-12 17:02:41 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.266 2001-06-13 10:29:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1239 +1239 @@
       rectOS2.yBottom = height - rect.top;
       rectOS2.yTop    = height - rect.bottom;
-      OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2);
+      OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2, dwStyle, dwExStyle, IconForWindow(ICON_SMALL));
   }
   return rc;

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.33 2001-06-12 17:02:42 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.34 2001-06-13 10:29:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -888 +888 @@
   HBITMAP memBmp,oldBmp;
 
-  if(fOS2Look) return;
+  if(fOS2Look) {
+      if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
+      {
+         int size = GetSystemMetrics(SM_CYCAPTION);
+   
+         r2 = r;
+         r2.right  = r2.left + size;
+         r2.bottom = r2.top + size;
+         FillRect(hdc, &r2, GetSysColorBrush(COLOR_MENU));
+
+         DrawSysButton(hdc,&r);
+      }
+      return;
+  }
 
   memDC = CreateCompatibleDC(hdc);