Changeset 1265 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 13, 1999, 4:24:49 PM (26 years ago)

Author:

sandervl

Message:

lots of changes

File:

• trunk/src/user32/win32wbase.cpp (modified) (9 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.39 1999-10-12 18:51:38 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.40 1999-10-13 14:24:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -43 +43 @@
 #define HAS_DLGFRAME(style,exStyle) \
     (((exStyle) & WS_EX_DLGMODALFRAME) || \
-     (((style) & WS_DLGFRAME) && !((style) & WS_BORDER)))
-
-#define HAS_THICKFRAME(style) \
+     (((style) & WS_DLGFRAME) && !((style) & WS_THICKFRAME)))
+
+#define HAS_THICKFRAME(style,exStyle) \
     (((style) & WS_THICKFRAME) && \
-     !(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME))
+     !((exStyle) & WS_EX_DLGMODALFRAME))
+
+#define HAS_THINFRAME(style) \
+    (((style) & WS_BORDER) || !((style) & (WS_CHILD | WS_POPUP)))
+
+#define HAS_BIGFRAME(style,exStyle) \
+    (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \
+     ((exStyle) & WS_EX_DLGMODALFRAME))
+
+#define HAS_ANYFRAME(style,exStyle) \
+    (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \
+     ((exStyle) & WS_EX_DLGMODALFRAME) || \
+     !((style) & (WS_CHILD | WS_POPUP)))
 
 #define HAS_3DFRAME(exStyle) \
@@ -436 +448 @@
   }
 
+  DWORD dwOSWinStyle, dwOSFrameStyle;
+
+  OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
+  dwExStyle = cs->dwExStyle;
+
+  //SvL: Add bordersize
+  cs->cy += 2*borderHeight;
+  cs->cx += 2*borderWidth;
+
   rectWindow.left   = cs->x;
   rectWindow.top    = cs->y;
@@ -441 +462 @@
   rectWindow.bottom = cs->y + cs->cy;
   rectClient        = rectWindow;
-
-  DWORD dwOSWinStyle, dwOSFrameStyle;
-
-  OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
-  dwExStyle = cs->dwExStyle;
 
 //CB: dwOSFrameStyle handled by OSLibWinConvertStyle
@@ -573 +589 @@
   maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
 
-  fCreated = TRUE; //Allow WM_SIZE messages now
   if(SendMessageA(WM_NCCREATE, 0, (LPARAM)cs) )
   {
-        //doesn't work right, messes up client rectangle
-#if 0
+        fCreated = TRUE; //Allow WM_SIZE messages now
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
-#endif
+
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
         dprintf(("Sending WM_CREATE"));
@@ -609 +623 @@
   SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
   return FALSE;
-}
-#if 0
-/***********************************************************************
- *           WINPOS_MinMaximize
- *
- * Fill in lpRect and return additional flags to be used with SetWindowPos().
- * This function assumes that 'cmd' is different from the current window
- * state.
- */
-UINT Win32BaseWindow::MinMaximize(UINT cmd, LPRECT lpRect )
-{
-    UINT swpFlags = 0;
-    POINT pt, size;
-    LPINTERNALPOS lpPos;
-
-    size.x = rectWindow.left; size.y = rectWindow.top;
-    lpPos = WINPOS_InitInternalPos( wndPtr, size, &rectWindow );
-
-    if (lpPos && !HOOK_CallHooks16(WH_CBT, HCBT_MINMAX, hwndSelf, cmd))
-    {
-    if( dwStyle & WS_MINIMIZE )
-    {
-        if( !SendMessageA(WM_QUERYOPEN, 0, 0L ) )
-        return (SWP_NOSIZE | SWP_NOMOVE);
-        swpFlags |= SWP_NOCOPYBITS;
-    }
-    switch( cmd )
-    {
-        case SW_MINIMIZE:
-         if( dwStyle & WS_MAXIMIZE)
-         {
-             flags |= WIN_RESTORE_MAX;
-             dwStyle &= ~WS_MAXIMIZE;
-                 }
-                 else
-             flags &= ~WIN_RESTORE_MAX;
-             dwStyle |= WS_MINIMIZE;
-
-#if 0
-         if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, TRUE ) )
-             swpFlags |= MINMAX_NOSWP;
-#endif
-
-         lpPos->ptIconPos = WINPOS_FindIconPos( wndPtr, lpPos->ptIconPos );
-
-         SetRect(lpRect, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
-             GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
-         swpFlags |= SWP_NOCOPYBITS;
-         break;
-
-        case SW_MAXIMIZE:
-                WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
-
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-             dwStyle &= ~WS_MINIMIZE;
-         }
-                 dwStyle |= WS_MAXIMIZE;
-
-         SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
-                    size.x, size.y );
-         break;
-
-        case SW_RESTORE:
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             dwStyle &= ~WS_MINIMIZE;
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-
-             if( flags & WIN_RESTORE_MAX)
-             {
-             /* Restore to maximized position */
-                         CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
-                         WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL);
-                         CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
-             dwStyle |= WS_MAXIMIZE;
-             SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y, size.x, size.y );
-             break;
-             }
-         }
-         else
-             if( !(dwStyle & WS_MAXIMIZE) ) return (UINT16)(-1);
-             else dwStyle &= ~WS_MAXIMIZE;
-
-         /* Restore to normal position */
-
-        *lpRect = lpPos->rectNormal;
-         lpRect->right -= lpRect->left;
-         lpRect->bottom -= lpRect->top;
-
-         break;
-    }
-    } else swpFlags |= SWP_NOSIZE | SWP_NOMOVE;
-    return swpFlags;
-}
-#endif
-/*******************************************************************
- *           GetMinMaxInfo
- *
- * Get the minimized and maximized information for a window.
- */
-void Win32BaseWindow::GetMinMaxInfo(POINT *maxSize, POINT *maxPos,
-                                POINT *minTrack, POINT *maxTrack )
-{
-    MINMAXINFO MinMax;
-    INT xinc, yinc;
-
-    /* Compute default values */
-
-    MinMax.ptMaxSize.x = GetSystemMetrics(SM_CXSCREEN);
-    MinMax.ptMaxSize.y = GetSystemMetrics(SM_CYSCREEN);
-    MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
-    MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
-    MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXSCREEN);
-    MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYSCREEN);
-
-    if (flags & WIN_MANAGED) xinc = yinc = 0;
-    else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
-    {
-        xinc = GetSystemMetrics(SM_CXDLGFRAME);
-        yinc = GetSystemMetrics(SM_CYDLGFRAME);
-    }
-    else
-    {
-        xinc = yinc = 0;
-        if (HAS_THICKFRAME(dwStyle))
-        {
-            xinc += GetSystemMetrics(SM_CXFRAME);
-            yinc += GetSystemMetrics(SM_CYFRAME);
-        }
-        if (dwStyle & WS_BORDER)
-        {
-            xinc += GetSystemMetrics(SM_CXBORDER);
-            yinc += GetSystemMetrics(SM_CYBORDER);
-        }
-    }
-    MinMax.ptMaxSize.x += 2 * xinc;
-    MinMax.ptMaxSize.y += 2 * yinc;
-
-#if 0
-    lpPos = (LPINTERNALPOS)GetPropA( hwndSelf, atomInternalPos );
-    if( lpPos && !EMPTYPOINT(lpPos->ptMaxPos) )
-        CONV_POINT16TO32( &lpPos->ptMaxPos, &MinMax.ptMaxPosition );
-    else
-    {
-#endif
-        MinMax.ptMaxPosition.x = -xinc;
-        MinMax.ptMaxPosition.y = -yinc;
-//    }
-
-    SendMessageA(WM_GETMINMAXINFO, 0, (LPARAM)&MinMax );
-
-      /* Some sanity checks */
-
-    dprintf(("GetMinMaxInfo: %ld %ld / %ld %ld / %ld %ld / %ld %ld\n",
-                      MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
-                      MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
-                      MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
-                      MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y));
-    MinMax.ptMaxTrackSize.x = MAX( MinMax.ptMaxTrackSize.x,
-                                   MinMax.ptMinTrackSize.x );
-    MinMax.ptMaxTrackSize.y = MAX( MinMax.ptMaxTrackSize.y,
-                                   MinMax.ptMinTrackSize.y );
-
-    if (maxSize)    *maxSize  = MinMax.ptMaxSize;
-    if (maxPos)     *maxPos   = MinMax.ptMaxPosition;
-    if (minTrack)   *minTrack = MinMax.ptMinTrackSize;
-    if (maxTrack)   *maxTrack = MinMax.ptMaxTrackSize;
-}
-/***********************************************************************
- *           WINPOS_SendNCCalcSize
- *
- * Send a WM_NCCALCSIZE message to a window.
- * All parameters are read-only except newClientRect.
- * oldWindowRect, oldClientRect and winpos must be non-NULL only
- * when calcValidRect is TRUE.
- */
-LONG Win32BaseWindow::SendNCCalcSize(BOOL calcValidRect, RECT *newWindowRect, RECT *oldWindowRect,
-                                 RECT *oldClientRect, WINDOWPOS *winpos,
-                                 RECT *newClientRect )
-{
-   NCCALCSIZE_PARAMS params;
-   WINDOWPOS winposCopy;
-   LONG result;
-
-   params.rgrc[0] = *newWindowRect;
-   if (calcValidRect)
-   {
-        winposCopy = *winpos;
-        params.rgrc[1] = *oldWindowRect;
-        params.rgrc[2] = *oldClientRect;
-        params.lppos = &winposCopy;
-   }
-   result = SendMessageA(WM_NCCALCSIZE, calcValidRect,
-                         (LPARAM)&params );
-   *newClientRect = params.rgrc[0];
-   return result;
 }
 //******************************************************************************
@@ -1611 +1418 @@
         return(TRUE);
 
+    case WM_NCCALCSIZE:
+        return NCHandleCalcSize(wParam, (NCCALCSIZE_PARAMS *)lParam);
+
     case WM_CTLCOLORMSGBOX:
     case WM_CTLCOLOREDIT:
@@ -2165 +1975 @@
    wpos.hwnd             = getWindowHandle();
 
+   //SvL: Add bordersize
+   wpos.cy              += 2*borderHeight;
+   wpos.cx              += 2*borderWidth;
+
    if(~fuFlags & (SWP_NOMOVE | SWP_NOSIZE))
    {
@@ -2198 +2012 @@
         if (swp.cy < minTrack.y) swp.cy = minTrack.y;
       }
-
       swp.hwnd = OS2HwndFrame;
    }