Changeset 808

Timestamp:

Sep 3, 1999, 5:09:46 PM (26 years ago)

Author:

sandervl

Message:

MDI child/client changes

Location:

trunk/src/user32/new

Files:

• user32.cpp (modified) (4 diffs)
• win32wbase.h (modified) (4 diffs)
• win32wmdichild.cpp (modified) (8 diffs)
• win32wmdiclient.cpp (modified) (11 diffs)
• win32wmdiclient.h (modified) (4 diffs)

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

@@ -1 @@
-/* $Id: user32.cpp,v 1.16 1999-09-01 19:12:21 phaller Exp $ */
+/* $Id: user32.cpp,v 1.17 1999-09-03 15:09:44 sandervl Exp $ */
 
 /*
@@ -1191 +1191 @@
 BOOL WIN32API SystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni)
 {
- BOOL rc;
+ BOOL rc = TRUE;
  NONCLIENTMETRICSA *cmetric = (NONCLIENTMETRICSA *)pvParam;
 
@@ -1197 +1197 @@
     case SPI_SCREENSAVERRUNNING:
         *(BOOL *)pvParam = FALSE;
-        rc = TRUE;
         break;
     case SPI_GETDRAGFULLWINDOWS:
         *(BOOL *)pvParam = FALSE;
-        rc = TRUE;
         break;
     case SPI_GETNONCLIENTMETRICS:
@@ -1225 +1223 @@
         cmetric->iMenuWidth       = 32; //TODO
         cmetric->iMenuHeight      = GetSystemMetrics(SM_CYMENU);
-        rc = TRUE;
-        break;
+        break;
+    case SPI_GETICONTITLELOGFONT:
+        break;
+
+    case SPI_GETBORDER:
+        *(INT *)pvParam = GetSystemMetrics( SM_CXFRAME );
+        break;
+
+    case SPI_GETWORKAREA:
+        SetRect( (RECT *)pvParam, 0, 0,
+                GetSystemMetrics( SM_CXSCREEN ),
+                GetSystemMetrics( SM_CYSCREEN )
+        );
+        break;
+
     case 104: //TODO: Undocumented
         rc = 16;

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

@@ -1 @@
-/* $Id: win32wbase.h,v 1.2 1999-08-31 10:36:23 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.3 1999-09-03 15:09:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -157 +157 @@
          BOOL   SetWindowText(LPSTR lpsz);
           BOOL  hasWindowName(LPSTR wndname, BOOL fUnicode = 0);
+Win32WndClass  *getClass()  { return windowClass; };
+        char   *getWindowNameA()              { return windowNameA; };
+Win32BaseWindow *getOwner()                   { return owner; };
 
        LRESULT  SendMessageA(ULONG msg, WPARAM wParam, LPARAM lParam);
@@ -167 +170 @@
          void   NotifyParent(UINT Msg, WPARAM wParam, LPARAM lParam);
 
-Win32WndClass  *getClass()  { return windowClass; };
-
     static HWND FindWindowEx(HWND hwndParent, HWND hwndChildAfter, LPSTR lpszClass, LPSTR lpszWindow,
                              BOOL fUnicode = 0);
@@ -199 +200 @@
        LRESULT  SendInternalMessageW(ULONG msg, WPARAM wParam, LPARAM lParam);
         void    Init();
-
-        char   *getWindowNameA()              { return windowNameA; };
 
         HWND    OS2Hwnd;

trunk/src/user32/new/win32wmdichild.cpp ¶

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.2 1999-08-31 17:14:51 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.3 1999-09-03 15:09:46 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -62 +62 @@
     {
     case WM_SETTEXT:
-            DefWindowProcA(Msg, wParam, lParam);
-            menuModifyItem();
-#if 0   
+        DefWindowProcA(Msg, wParam, lParam);
+        menuModifyItem();
         if( client->getMaximizedChild() == this )
-                    MDI_UpdateFrameText( clientWnd->parent, ci->self, MDI_REPAINTFRAME, NULL );
-#endif  
-            return 0;
+                client->updateFrameText(MDI_REPAINTFRAME, NULL);
+        return 0;
 
     case WM_GETMINMAXINFO:
@@ -77 +75 @@
 
     case WM_MENUCHAR:
-            /* MDI children don't have menu bars */
-            client->PostMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)LOWORD(wParam) );
+        /* MDI children don't have menu bars */
+        client->PostMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)LOWORD(wParam) );
         return 0x00010000L;
 
     case WM_CLOSE:
-            client->SendMessageA(WM_MDIDESTROY,(WPARAM16)getWindowHandle(), 0L);
-            return 0;
+        client->SendMessageA(WM_MDIDESTROY,(WPARAM16)getWindowHandle(), 0L);
+        return 0;
 
     case WM_SETFOCUS:
-            if(client->getActiveChild() != this )
-                client->childActivate(this);
+        if(client->getActiveChild() != this )
+            client->childActivate(this);
         break;
 
     case WM_CHILDACTIVATE:
-            client->childActivate(this);
+        client->childActivate(this);
         return 0;
 
@@ -98 +96 @@
 
     case WM_SYSCOMMAND:
-            switch( wParam )
-            {
-                case SC_MOVE:
+        switch( wParam )
+        {
+        case SC_MOVE:
             if( client->getMaximizedChild() == this)
             {
@@ -106 +104 @@
             }
             break;
-            case SC_RESTORE:
-            case SC_MINIMIZE:
-                setStyle(getStyle() | WS_SYSMENU);
+        case SC_RESTORE:
+        case SC_MINIMIZE:
+            setStyle(getStyle() | WS_SYSMENU);
             break;
 
-                case SC_MAXIMIZE:
+        case SC_MAXIMIZE:
             if( client->getMaximizedChild() == this)
             {
-                          return client->SendMessageA(Msg, wParam, lParam);
+                  return client->SendMessageA(Msg, wParam, lParam);
             }
-                setStyle(getStyle() & ~WS_SYSMENU);
+            setStyle(getStyle() & ~WS_SYSMENU);
             break;
 
-                case SC_NEXTWINDOW:
-                     client->SendMessageA(WM_MDINEXT, 0, 0);
-                     return 0;
-
-                case SC_PREVWINDOW: //WM_MDINEXT??
-                     client->SendMessageA(WM_MDINEXT, 0, 0);
-                     return 0;
-            }
+        case SC_NEXTWINDOW:
+             client->SendMessageA(WM_MDINEXT, 0, 0);
+             return 0;
+
+        case SC_PREVWINDOW: //WM_MDINEXT??
+             client->SendMessageA(WM_MDINEXT, 0, 0);
+             return 0;
+        }
         break;
 
     case WM_SETVISIBLE:
+        if( client->getMaximizedChild()) {
+                client->setMdiFlags(client->getMdiFlags() & ~MDIF_NEEDUPDATE);
+        }
+        else    client->postUpdate(SB_BOTH+1);
+        break;
+
+    case WM_SIZE:
+        /* do not change */
+        if( client->getActiveChild() == this && wParam != SIZE_MAXIMIZED )
+        {
+            client->setActiveChild(NULL);
 #if 0
-        if( client->getMaximizedChild()) ci->mdiFlags &= ~MDIF_NEEDUPDATE;
-            else
-            MDI_PostUpdate(clientWnd->hwndSelf, ci, SB_BOTH+1);
+            MDI_RestoreFrameMenu( clientWnd->parent, hwnd);
 #endif
-        break;
-
-#if 0           
-    case WM_SIZE:
-            /* do not change */
-
-            if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED )
-            {
-                ci->hwndChildMaximized = 0;
-        
-                MDI_RestoreFrameMenu( clientWnd->parent, hwnd);
-            MDI_UpdateFrameText( clientWnd->parent, ci->self,
-                                 MDI_REPAINTFRAME, NULL );
-            }
-
-            if( wParam == SIZE_MAXIMIZED )
-            {
-                HWND16 hMaxChild = ci->hwndChildMaximized;
-
-                if( hMaxChild == hwnd ) break;
-
-                if( hMaxChild)
-                {       
-                    SendMessage16( hMaxChild, WM_SETREDRAW, FALSE, 0L );
-
-                    MDI_RestoreFrameMenu( clientWnd->parent, hMaxChild);
-                    ShowWindow16( hMaxChild, SW_SHOWNOACTIVATE);
-
-                    SendMessage16( hMaxChild, WM_SETREDRAW, TRUE, 0L );
-                }
-
-                ci->hwndChildMaximized = hwnd; /* !!! */
-                ci->hwndActiveChild = hwnd;
-
-                MDI_AugmentFrameMenu( ci, clientWnd->parent, hwnd);
-                MDI_UpdateFrameText( clientWnd->parent, ci->self,
-                                 MDI_REPAINTFRAME, NULL );
-            }
-
-            if( wParam == SIZE_MINIMIZED )
-            {
-                HWND16 switchTo = MDI_GetWindow(clientWnd, hwnd, TRUE, WS_MINIMIZE);
-
-                if( switchTo )
-                    SendMessage16( switchTo, WM_CHILDACTIVATE, 0, 0L);
-            }
-        
-            MDI_PostUpdate(clientWnd->hwndSelf, ci, SB_BOTH+1);
-            break;
+            client->updateFrameText(MDI_REPAINTFRAME, NULL );
+        }
+
+        if( wParam == SIZE_MAXIMIZED )
+        {
+            Win32MDIChildWindow *maxChild = client->getMaximizedChild();
+
+            if( maxChild == this ) break;
+
+            if( maxChild)
+            {
+                maxChild->SendMessageA(WM_SETREDRAW, FALSE, 0L );
+#if 0
+                MDI_RestoreFrameMenu( clientWnd->parent, hMaxChild);
 #endif
+                maxChild->ShowWindow(SW_SHOWNOACTIVATE);
+
+                maxChild->SendMessageA(WM_SETREDRAW, TRUE, 0L );
+            }
+
+            client->setMaximizedChild(this);
+            client->setActiveChild(this);
+
+#if 0
+            MDI_AugmentFrameMenu( ci, clientWnd->parent, hwnd);
+#endif
+            client->updateFrameText(MDI_REPAINTFRAME, NULL );
+        }
+
+        if( wParam == SIZE_MINIMIZED )
+        {
+            Win32MDIChildWindow *switchTo = client->getWindow(this, TRUE, WS_MINIMIZE);
+
+            if( switchTo )
+                switchTo->SendMessageA(WM_CHILDACTIVATE, 0, 0L);
+        }
+
+        client->postUpdate(SB_BOTH+1);
+        break;
 
 #if 0
     case WM_NEXTMENU:
-            if( wParam == VK_LEFT )             /* switch to frame system menu */
+        if( wParam == VK_LEFT )     /* switch to frame system menu */
         {
             return MAKELONG( GetSubMenu(clientWnd->parent->hSysMenu, 0),
-                           clientWnd->parent->hwndSelf );
+               clientWnd->parent->hwndSelf );
             goto END;
         }
-            if( wParam == VK_RIGHT )    /* to frame menu bar */
+        if( wParam == VK_RIGHT )    /* to frame menu bar */
         {
             retvalue = MAKELONG( clientWnd->parent->wIDmenu,
-                           clientWnd->parent->hwndSelf );
+               clientWnd->parent->hwndSelf );
             goto END;
         }
 #endif
     case WM_SYSCHAR:
-            if (wParam == '-')
-            {
-                    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
-                    return 0;
-            }
+        if (wParam == '-')
+        {
+            SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+            return 0;
+        }
     }
     return DefWindowProcA(Msg, wParam, lParam);
@@ -214 +210 @@
 LRESULT Win32MDIChildWindow::DefMDIChildProcW(UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+ Win32MDIClientWindow *client = (Win32MDIClientWindow *)getParent();
+
     switch (Msg)
     {
     case WM_SETTEXT:
-            DefWindowProcW(Msg, wParam, lParam);
-            menuModifyItem();
-#if 0   
-            if( client->getMaximizedChild() == this )
-                    MDI_UpdateFrameText( clientWnd->parent, ci->self, MDI_REPAINTFRAME, NULL );
-#endif  
-            return 0;
-        
+        DefWindowProcW(Msg, wParam, lParam);
+        menuModifyItem();
+        if( client->getMaximizedChild() == this )
+                client->updateFrameText(MDI_REPAINTFRAME, NULL );
+
+        return 0;
+
     case WM_GETMINMAXINFO:
     case WM_MENUCHAR:
@@ -236 +233 @@
     case WM_NEXTMENU:
         return DefMDIChildProcA(Msg, wParam, lParam );
-        
+
     case WM_SYSCHAR:
         if (wParam == '-')
-            {
-                    SendMessageW(WM_SYSCOMMAND, SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
-                    return 0;
-            }
-            break;
+        {
+            SendMessageW(WM_SYSCOMMAND, SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+            return 0;
+        }
+        break;
     }
     return DefWindowProcW(Msg, wParam, lParam);
@@ -338 +335 @@
 #if 0
                     MDI_AugmentFrameMenu( ci, w->parent, hwnd );
-                    MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL );
+                    client->updateFrameText(MDI_REPAINTFRAME, NULL );
 #endif
                 }

trunk/src/user32/new/win32wmdiclient.cpp ¶

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.3 1999-08-31 17:14:52 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.4 1999-09-03 15:09:46 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -51 +51 @@
     idFirstChild       = 0;
     hWindowMenu        = 0;
+    sbRecalc           = 0;
 }
 //******************************************************************************
@@ -56 +57 @@
 Win32MDIClientWindow::~Win32MDIClientWindow()
 {
+    if(frameTitle)
+        HeapFree(GetProcessHeap(), 0, frameTitle);
 }
 //******************************************************************************
@@ -92 +95 @@
         setStyle(getStyle() | WS_CLIPCHILDREN);
 
-//        MDI_UpdateFrameText(frameWnd, hwnd, MDI_NOFRAMEREPAINT,frameWnd->text);
+        updateFrameText(MDI_NOFRAMEREPAINT, getParent()->getWindowNameA());
 
         AppendMenuA( hWindowMenu, MF_SEPARATOR, 0, NULL );
@@ -140 +143 @@
 
     case WM_MDIDESTROY:
-//        retvalue = MDIDestroyChild( w, ci, hwnd, (HWND)wParam, TRUE );
+        mdichild = (Win32MDIChildWindow *)GetWindowFromHandle((HWND)wParam);
+        if(mdichild) {
+            retvalue = destroyChild(mdichild, TRUE );
+        }
         goto END;
 
@@ -166 +172 @@
 
     case WM_MDINEXT: /* lParam != 0 means previous window */
-//        MDI_SwitchActiveChild(hwnd, (HWND)wParam, (lParam)? FALSE : TRUE );
+        mdichild = (Win32MDIChildWindow *)GetWindowFromHandle((HWND)wParam);
+        if(mdichild) {
+            switchActiveChild(mdichild, (lParam)? FALSE : TRUE );
+        }
         break;
+
 
     case WM_MDIRESTORE:
@@ -243 +253 @@
             ::MoveWindow(maximizedChild->getWindowHandle(), rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1);
         }
-#if 0
-        else
-            MDI_PostUpdate(hwnd, ci, SB_BOTH+1);
-#endif
+        else postUpdate(SB_BOTH+1);
         break;
 
@@ -281 +288 @@
     }
     return window->MDIClientWndProc(message, wParam, lParam);
+}
+/**********************************************************************
+ *                      MDI_GetWindow
+ *
+ * returns "activateable" child different from the current or zero
+ */
+Win32MDIChildWindow *Win32MDIClientWindow::getWindow(Win32MDIChildWindow *actchild, BOOL bNext,
+                                                     DWORD dwStyleMask)
+{
+ Win32MDIChildWindow *lastchild = 0, *curchild;
+
+    dwStyleMask |= WS_DISABLED | WS_VISIBLE;
+
+    if( !actchild ) actchild = getActiveChild();
+    if( !actchild)  return 0;
+
+    for ( curchild = (Win32MDIChildWindow *)actchild->getNextChild(); ; curchild = (Win32MDIChildWindow *)curchild->getNextChild())
+    {
+        if (!curchild ) curchild = (Win32MDIChildWindow *)getFirstChild();
+
+        if ( curchild == actchild ) break; /* went full circle */
+
+        if (!curchild->getOwner() && (curchild->getStyle() & dwStyleMask) == WS_VISIBLE )
+        {
+                lastchild = curchild;
+                if ( bNext ) break;
+        }
+    }
+    return lastchild;
 }
 /**********************************************************************
@@ -406 +442 @@
             {
 //                MDI_RestoreFrameMenu(w_parent->parent, child);
-                  setMaximizedChild(NULL);
-//                MDI_UpdateFrameText(w_parent->parent,parent,TRUE,NULL);
+                setMaximizedChild(NULL);
+                updateFrameText(TRUE,NULL);
             }
             childActivate(0);
@@ -426 +462 @@
     return 0;
 }
+/**********************************************************************
+ *                      MDI_UpdateFrameText
+ *
+ * used when child window is maximized/restored
+ *
+ * Note: lpTitle can be NULL
+ */
+void Win32MDIClientWindow::updateFrameText(BOOL repaint, LPCSTR lpTitle )
+{
+    char   lpBuffer[MDI_MAXTITLELENGTH+1];
+
+    /* store new "default" title if lpTitle is not NULL */
+    if (lpTitle)
+    {
+        if (frameTitle) HeapFree( GetProcessHeap(), 0, frameTitle );
+        frameTitle = HEAP_strdupA( GetProcessHeap(), 0, lpTitle );
+    }
+
+    if (frameTitle)
+    {
+        Win32MDIChildWindow *childWnd = getMaximizedChild();
+
+        if( childWnd && childWnd->getWindowNameA() )
+        {
+            /* combine frame title and child title if possible */
+
+            LPCSTR lpBracket  = " - [";
+            int i_frame_text_length = strlen(frameTitle);
+            int i_child_text_length = strlen(childWnd->getWindowNameA());
+
+            lstrcpynA( lpBuffer, frameTitle, MDI_MAXTITLELENGTH);
+
+            if( i_frame_text_length + 6 < MDI_MAXTITLELENGTH )
+            {
+                strcat( lpBuffer, lpBracket );
+
+                if( i_frame_text_length + i_child_text_length + 6 < MDI_MAXTITLELENGTH )
+                {
+                    strcat( lpBuffer, childWnd->getWindowNameA());
+                    strcat( lpBuffer, "]" );
+                }
+                else
+                {
+                    lstrcpynA(lpBuffer + i_frame_text_length + 4,
+                              childWnd->getWindowNameA(), MDI_MAXTITLELENGTH - i_frame_text_length - 5 );
+                    strcat( lpBuffer, "]" );
+                }
+            }
+        }
+        else
+        {
+            strncpy(lpBuffer, frameTitle, MDI_MAXTITLELENGTH );
+            lpBuffer[MDI_MAXTITLELENGTH]='\0';
+        }
+    }
+    else
+    lpBuffer[0] = '\0';
+
+    getParent()->SetWindowText(lpBuffer);
+    if( repaint == MDI_REPAINTFRAME)
+        getParent()->SetWindowPos(0,0,0,0,0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER );
+}
+#if 0
+/**********************************************************************
+ *                              MDICascade
+ */
+LONG Win32MDIClientWindow::cascade()
+{
+    WND**       ppWnd;
+    UINT        total;
+
+    if (getMaximizedChild())
+        SendMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
+
+    if (nActiveChildren == 0) return 0;
+
+    if ((ppWnd = WIN_BuildWinArray(clientWnd, BWA_SKIPHIDDEN | BWA_SKIPOWNED |
+                                              BWA_SKIPICONIC, &total)))
+    {
+            WND**       heapPtr = ppWnd;
+            if( total )
+            {
+            INT delta = 0, n = 0;
+            POINT       pos[2];
+            if( total < ci->nActiveChildren )
+                delta = GetSystemMetrics(SM_CYICONSPACING) +
+                GetSystemMetrics(SM_CYICON);
+
+                /* walk the list (backwards) and move windows */
+            while (*ppWnd) ppWnd++;
+                    while (ppWnd != heapPtr)
+                    {
+                    ppWnd--;
+
+                        MDI_CalcDefaultChildPos(clientWnd, n++, pos, delta);
+                            SetWindowPos( (*ppWnd)->hwndSelf, 0, pos[0].x, pos[0].y,
+                                pos[1].x, pos[1].y,
+                                SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
+                    }
+            }
+            WIN_ReleaseWinArray(heapPtr);
+    }
+
+    if( total < ci->nActiveChildren )
+        ArrangeIconicWindows( clientWnd->hwndSelf );
+
+    return 0;
+}
+
+/**********************************************************************
+ *                                      MDITile
+ */
+void Win32MDIClientWindow::MDITile(WPARAM wParam )
+{
+    WND**       ppWnd;
+    UINT        total = 0;
+
+    if (getMaximizedChild())
+        SendMessageA(WM_MDIRESTORE, (WPARAM)getMaximizedChild()->getWindowHandle(), 0);
+
+    if (nActiveChildren == 0) return;
+
+    ppWnd = WIN_BuildWinArray(wndClient, BWA_SKIPHIDDEN | BWA_SKIPOWNED | BWA_SKIPICONIC |
+                ((wParam & MDITILE_SKIPDISABLED)? BWA_SKIPDISABLED : 0), &total );
+
+    TRACE("%u windows to tile\n", total);
+
+    if( ppWnd )
+    {
+        WND**   heapPtr = ppWnd;
+
+            if( total )
+            {
+            RECT        rect;
+            int         x, y, xsize, ysize;
+            int         rows, columns, r, c, i;
+
+            GetClientRect(wndClient->hwndSelf,&rect);
+            rows    = (int) sqrt((double)total);
+            columns = total / rows;
+
+            if( wParam & MDITILE_HORIZONTAL )  /* version >= 3.1 */
+            {
+                i = rows;
+                rows = columns;  /* exchange r and c */
+                columns = i;
+            }
+
+            if( total != ci->nActiveChildren)
+            {
+                y = rect.bottom - 2 * GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON);
+                rect.bottom = ( y - GetSystemMetrics(SM_CYICON) < rect.top )? rect.bottom: y;
+            }
+
+                ysize   = rect.bottom / rows;
+            xsize   = rect.right  / columns;
+
+            for (x = i = 0, c = 1; c <= columns && *ppWnd; c++)
+            {
+                if (c == columns)
+                        {
+                        rows  = total - i;
+                            ysize = rect.bottom / rows;
+                        }
+
+                        y = 0;
+                        for (r = 1; r <= rows && *ppWnd; r++, i++)
+                        {
+                            SetWindowPos((*ppWnd)->hwndSelf, 0, x, y, xsize, ysize,
+                                        SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
+                            y += ysize;
+                            ppWnd++;
+                        }
+                        x += xsize;
+                }
+        }
+        WIN_ReleaseWinArray(heapPtr);
+    }
+
+    if( total < ci->nActiveChildren ) ArrangeIconicWindows( wndClient->hwndSelf );
+}
+
+/* ----------------------- Frame window ---------------------------- */
+
+/**********************************************************************
+ *                                      MDI_AugmentFrameMenu
+ */
+BOOL Win32MDIClientWindow::augmentFrameMenu(HWND hChild )
+{
+    WND*        child = WIN_FindWndPtr(hChild);
+    HMENU       hSysPopup = 0;
+    HBITMAP hSysMenuBitmap = 0;
+
+    if( !frame->wIDmenu || !child->hSysMenu )
+    {
+        WIN_ReleaseWndPtr(child);
+        return 0;
+    }
+    WIN_ReleaseWndPtr(child);
+
+    /* create a copy of sysmenu popup and insert it into frame menu bar */
+
+    if (!(hSysPopup = LoadMenuA(GetModuleHandleA("USER32"), "SYSMENU")))
+        return 0;
+
+    TRACE("\tgot popup %04x in sysmenu %04x\n",
+                hSysPopup, child->hSysMenu);
+
+    AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
+                   SC_MINIMIZE, (LPSTR)(DWORD)HBMMENU_MBAR_MINIMIZE ) ;
+    AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
+                   SC_RESTORE, (LPSTR)(DWORD)HBMMENU_MBAR_RESTORE );
+
+  /* In Win 95 look, the system menu is replaced by the child icon */
+
+  if(TWEAK_WineLook > WIN31_LOOK)
+  {
+    HICON hIcon = GetClassLongA(hChild, GCL_HICONSM);
+    if (!hIcon)
+      hIcon = GetClassLongA(hChild, GCL_HICON);
+    if (hIcon)
+    {
+      HDC hMemDC;
+      HBITMAP hBitmap, hOldBitmap;
+      HBRUSH hBrush;
+      HDC hdc = GetDC(hChild);
+
+      if (hdc)
+      {
+        int cx, cy;
+        cx = GetSystemMetrics(SM_CXSMICON);
+        cy = GetSystemMetrics(SM_CYSMICON);
+        hMemDC = CreateCompatibleDC(hdc);
+        hBitmap = CreateCompatibleBitmap(hdc, cx, cy);
+        hOldBitmap = SelectObject(hMemDC, hBitmap);
+        SetMapMode(hMemDC, MM_TEXT);
+        hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU));
+        DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, hBrush, DI_NORMAL);
+        SelectObject (hMemDC, hOldBitmap);
+        DeleteObject(hBrush);
+        DeleteDC(hMemDC);
+        ReleaseDC(hChild, hdc);
+        hSysMenuBitmap = hBitmap;
+      }
+    }
+  }
+  else
+    hSysMenuBitmap = hBmpClose;
+
+    if( !InsertMenuA(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
+                    hSysPopup, (LPSTR)(DWORD)hSysMenuBitmap))
+    {
+        TRACE("not inserted\n");
+        DestroyMenu(hSysPopup);
+        return 0;
+    }
+
+    /* The close button is only present in Win 95 look */
+    if(TWEAK_WineLook > WIN31_LOOK)
+    {
+        AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
+                       SC_CLOSE, (LPSTR)(DWORD)HBMMENU_MBAR_CLOSE );
+    }
+
+    EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED);
+    SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE);
+
+    /* redraw menu */
+    DrawMenuBar(frame->hwndSelf);
+
+    return 1;
+}
+
+/**********************************************************************
+ *                                      MDI_RestoreFrameMenu
+ */
+static BOOL MDI_RestoreFrameMenu( WND *frameWnd, HWND hChild )
+{
+    MENUITEMINFOA menuInfo;
+    INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
+    UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ;
+
+    TRACE("frameWnd %p,child %04x\n",frameWnd,hChild);
+
+    if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
+        return 0;
+
+    /*
+     * Remove the system menu, If that menu is the icon of the window
+     * as it is in win95, we have to delete the bitmap.
+     */
+    menuInfo.cbSize = sizeof(MENUITEMINFOA);
+    menuInfo.fMask  = MIIM_DATA | MIIM_TYPE;
+
+    GetMenuItemInfoA(frameWnd->wIDmenu,
+                     0,
+                     TRUE,
+                     &menuInfo);
+
+    RemoveMenu(frameWnd->wIDmenu,0,MF_BYPOSITION);
+
+    if ( (menuInfo.fType & MFT_BITMAP)           &&
+         (LOWORD(menuInfo.dwTypeData)!=0)        &&
+         (LOWORD(menuInfo.dwTypeData)!=hBmpClose) )
+    {
+      DeleteObject((HBITMAP)LOWORD(menuInfo.dwTypeData));
+    }
+
+    if(TWEAK_WineLook > WIN31_LOOK)
+    {
+        /* close */
+        DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    }
+    /* restore */
+    DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    /* minimize */
+    DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+
+    DrawMenuBar(frameWnd->hwndSelf);
+
+    return 1;
+}
+#endif
 /* -------- Miscellaneous service functions ----------
  *
- *                      MDI_GetChildByID
+ *          MDI_GetChildByID
  */
 Win32MDIChildWindow *Win32MDIClientWindow::getChildByID(INT id)
@@ -438 +799 @@
 
     return 0;
+}
+
+void Win32MDIClientWindow::postUpdate(WORD recalc)
+{
+    if( !(mdiFlags & MDIF_NEEDUPDATE) )
+    {
+        mdiFlags |= MDIF_NEEDUPDATE;
+        PostMessageA(WM_MDICALCCHILDSCROLL, 0, 0);
+    }
+    sbRecalc = recalc;
 }
 //******************************************************************************

trunk/src/user32/new/win32wmdiclient.h ¶

@@ -1 @@
-/* $Id: win32wmdiclient.h,v 1.3 1999-08-31 17:14:52 sandervl Exp $ */
+/* $Id: win32wmdiclient.h,v 1.4 1999-09-03 15:09:46 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -17 +17 @@
 #define MDICLIENTCLASSNAMEA "MDICLIENT"
 #define MDICLIENTCLASSNAMEW L"MDICLIENT"
+
+#define MDIF_NEEDUPDATE         0x0001
 
 //******************************************************************************
@@ -37 +39 @@
                void  setActiveChild(Win32MDIChildWindow *newchild) { activeChild = newchild; };
 
+Win32MDIChildWindow *getWindow(Win32MDIChildWindow *actchild, BOOL bNext, DWORD dwStyleMask);
+
 Win32MDIChildWindow *getChildByID(INT id);
+               void postUpdate(WORD recalc);
 
            int  getNrOfChildren()                { return nActiveChildren; };
            int  incNrActiveChildren()            { return ++nActiveChildren; };
            int  decNrActiveChildren()            { return --nActiveChildren; };
+
+           int  getMdiFlags()                    { return mdiFlags; };
+           void setMdiFlags(int newflags)        { mdiFlags = newflags; };
+
+           void updateFrameText(BOOL repaint, LPCSTR lpTitle );
 
            LONG childActivate(Win32MDIChildWindow *child);
@@ -58 +68 @@
         int     nActiveChildren;
         int     nTotalCreated;
+        int     sbRecalc;
         LPSTR   frameTitle;
         DWORD   mdiFlags;