implemented multiline menu bars

svn path=/trunk/; revision=7883

reactos/lib/user32/include/menu.h

@@ -12,8 +12,6 @@ UINT
 MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw);
 BOOL
 MenuInit(VOID);
-ULONG
-MenuGetMenuBarHeight(HWND hWnd, ULONG MenuBarWidth, LONG OrgX, LONG OrgY);
 VOID
 MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt);
 VOID

reactos/lib/user32/windows/menu.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.44 2004/01/26 12:46:16 weiden Exp $
+/* $Id: menu.c,v 1.45 2004/01/26 23:22:48 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/menu.c
@@ -274,29 +274,6 @@ MenuInit(VOID)
 }
 
 
-ULONG
-MenuGetMenuBarHeight(HWND hWnd, ULONG MenuBarWidth, LONG OrgX, LONG OrgY)
-{
-  /*ULONG MenuId;
-  PPOPUP_MENU Menu;
-  RECT Rect;
-  HDC hDC;
-
-  MenuId = GetWindowLong(hWnd, GWL_ID);
-  Menu = MenuGetMenu((HMENU)MenuId);
-  if (Menu == NULL)
-    {
-      return(0);
-    }
-  hDC = GetDCEx(hWnd, 0, DCX_CACHE | DCX_WINDOW);
-  SelectObject(hDC, hMenuFont);
-  SetRect(&Rect, OrgX, OrgY, OrgX + MenuBarWidth, 
-	  OrgY + GetSystemMetrics(SM_CYMENU));
-  MenuMenuBarCalcSize(hDC, &Rect, Menu, hWnd);
-  ReleaseDC(hWnd, hDC);*/
-  return(GetSystemMetrics(SM_CYMENU));
-}
-
 static BOOL
 MeasureMenuItem(HWND hWnd, HMENU mnu, HDC hDC, MENUITEMINFOW *mii, RECT *mir, LPWSTR str)
 {
@@ -372,7 +349,7 @@ DrawMenuItem(HWND hWnd, HMENU mnu, HDC hDC, MENUITEMINFOW *mii, RECT *mir, LPWST
 UINT
 MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw)
 {
-  UINT height;
+  UINT bottom, line;
   HMENU mnu;
   HANDLE hHeap;
   PVOID Buf, hBuf;
@@ -381,26 +358,23 @@ MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw)
   SETMENUITEMRECT smir;
   RECT *omir, *mir = NULL;
   LPWSTR str;
-  
-  FillRect(hDC, Rect, GetSysColorBrush(COLOR_MENU));
 
-  height = Rect->bottom - Rect->top;
   mnu = GetMenu(hWnd); /* Fixme - pass menu handle as parameter */
   /* get menu item list size */
   BufSize = NtUserBuildMenuItemList(mnu, (VOID*)1, 0, 0);
   if(BufSize)
   {
-    /* FIXME cache menu bar items using NtUserDrawMenuBarTemp() 
-             instead of allocating and deallocating memory everytime */
-
     hHeap = GetProcessHeap();
     hBuf = HeapAlloc(hHeap, 0, BufSize);
     if(!hBuf)
-      return(Rect->bottom - Rect->top);
+      return 0;
     Buf = hBuf;
     /* copy menu items into buffer */
     Items = Items2 = NtUserBuildMenuItemList(mnu, Buf, BufSize, 0);
     
+    if(!Draw)
+    {
+    bottom = line = Rect->top;
     smir.fByPosition = TRUE;
     smir.uItem = 0;
     /* calculate menu item rectangles */
@@ -431,51 +405,74 @@ MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw)
         mir->top = Rect->top;
       }
       MeasureMenuItem(hWnd, mnu, hDC, mii, mir, str);
+      
+      if(mir->right > Rect->right)
+      {
+        mir->right -= (mir->left - Rect->left);
+        mir->left = Rect->left;
+        mir->top += line;
+        mir->bottom += line;
+        line = mir->bottom - mir->top;
+      }
+      
       smir.rcRect = *mir;
       NtUserSetMenuItemRect(mnu, &smir);
       
-      height = max(height, mir->top + mir->bottom);
+      bottom = max(bottom, mir->bottom);
+      line = max(line, mir->bottom - mir->top);
       /* DbgPrint("Measure menu item %ws: (%d, %d, %d, %d)\n", str, mir->left, mir->top, mir->right, mir->bottom); */
       Items--;
       smir.uItem++;
     }
-    height = max(height, GetSystemMetrics(SM_CYMENU));
+    bottom = max(bottom, Rect->top + GetSystemMetrics(SM_CYMENU));
-    
+    if(bottom - Rect->top > 0)
-    Buf = hBuf;
-    /* draw menu items */
-    while (Items2 > 0)
     {
-      mii = (LPMENUITEMINFOW)Buf;
+      if(NtUserSetMenuBarHeight(mnu, bottom - Rect->top) && Draw)
-      Buf += sizeof(MENUITEMINFOW);
-      mir = (LPRECT)Buf;
-      Buf += sizeof(RECT);
-      if(mii->cch)
       {
-        str = (LPWSTR)Buf;
+        /* FIXME - update frame */
-        Buf += (mii->cch + 1) * sizeof(WCHAR);
+      }
+    }
+    }
+    else
+    {
+      bottom = Rect->bottom;
+      FillRect(hDC, Rect, GetSysColorBrush(COLOR_MENU));
+      Buf = hBuf;
+      /* draw menu items */
+      while (Items2 > 0)
+      {
+        mii = (LPMENUITEMINFOW)Buf;
+        Buf += sizeof(MENUITEMINFOW);
+        mir = (LPRECT)Buf;
+        Buf += sizeof(RECT);
+        if(mii->cch)
+        {
+          str = (LPWSTR)Buf;
+          Buf += (mii->cch + 1) * sizeof(WCHAR);
+        }
+        else
+          str = NULL;
+        /* DbgPrint("Draw menu item %ws at (%d, %d, %d, %d)\n", str, mir->left, mir->top, mir->right, mir->bottom); */
+        DrawMenuItem(hWnd, mnu, hDC, mii, mir, str);
+        Items2--;
       }
-      else
-        str = NULL;
-      /* DbgPrint("Draw menu item %ws at (%d, %d, %d, %d)\n", str, mir->left, mir->top, mir->right, mir->bottom); */
-      DrawMenuItem(hWnd, mnu, hDC, mii, mir, str);
-      Items2--;
     }
     
     HeapFree(hHeap, 0, hBuf);
   }
 
-  return height;
+  return max(bottom - Rect->top, GetSystemMetrics(SM_CYMENU));
 }
 
 
 VOID
 MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt)
-{DbgPrint("MenuTrackMouseMenuBar at %i, %i\n", Pt.x, Pt.y);
+{
   int Item = NtUserMenuItemFromPoint(hWnd, GetMenu(hWnd), Pt.x, Pt.y);
   
   if(Item > -1)
   {
-  
+    /* FIXME */
   }
 }
 

reactos/lib/user32/windows/nonclient.c

@@ -420,12 +420,13 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
    
    if(!(Style & WS_MINIMIZE))
    {
+     HMENU menu = GetMenu(hWnd);
      /* Draw menu bar */
-     if (UserHasMenu(hWnd, Style))
+     if (menu && !(Style & WS_CHILD))
      {
         TempRect = CurrentRect;
-        TempRect.bottom = TempRect.top + GetSystemMetrics(SM_CYMENU);
+        TempRect.bottom = TempRect.top + (UINT)NtUserSetMenuBarHeight(menu, 0);
-        CurrentRect.top += MenuDrawMenuBar(hDC, &TempRect, hWnd, FALSE);
+        CurrentRect.top += MenuDrawMenuBar(hDC, &TempRect, hWnd, TRUE);
      }
      
      if (ExStyle & WS_EX_CLIENTEDGE)
@@ -477,6 +478,7 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
    DWORD Style = GetClassLongW(hWnd, GCL_STYLE);
    DWORD ExStyle;
    SIZE WindowBorders;
+   RECT OrigRect = *Rect;
 
    if (CalcSizeStruct)
    {
@@ -496,6 +498,9 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
     
    if (!(Style & WS_MINIMIZE))
    {
+      ULONG menuheight;
+      HMENU menu = GetMenu(hWnd);
+      
       UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE);
       InflateRect(Rect, -WindowBorders.cx, -WindowBorders.cy);
       if ((Style & WS_CAPTION) == WS_CAPTION)
@@ -506,8 +511,21 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
             Rect->top += GetSystemMetrics(SM_CYCAPTION);
       }
 
-      if (UserHasMenu(hWnd, Style))
+      if (menu && !(Style & WS_CHILD))
-         Rect->top += MenuGetMenuBarHeight(hWnd, Rect->right - Rect->left, Rect->left, Rect->top);
+      {
+         HDC hDC = GetWindowDC(hWnd);
+         if(hDC)
+         {
+           RECT CliRect = *Rect;
+           CliRect.bottom -= OrigRect.top;
+           CliRect.right -= OrigRect.left;
+           CliRect.left -= OrigRect.left;
+           CliRect.top -= OrigRect.top;
+           menuheight = (ULONG)MenuDrawMenuBar(hDC, &CliRect, hWnd, FALSE);
+           ReleaseDC(hWnd, hDC);
+           Rect->top += max(menuheight, GetSystemMetrics(SM_CYMENU));
+         }
+      }
 
       if (ExStyle & WS_EX_CLIENTEDGE)
       {

reactos/subsys/win32k/ntuser/menu.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.42 2004/01/26 12:46:16 weiden Exp $
+/* $Id: menu.c,v 1.43 2004/01/26 23:22:48 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1042,16 +1042,45 @@ IntGetMenuDefaultItem(PMENU_OBJECT MenuObject, UINT fByPos, UINT gmdiFlags,
   return res;
 }
 
+VOID FASTCALL
+IntInitTracking(PWINDOW_OBJECT WindowObject, PMENU_OBJECT MenuObject, BOOL Popup,
+                UINT Flags)
+{
+  /* FIXME - hide caret */
+  
+  if(!(Flags & TPM_NONOTIFY))
+    IntSendMessage(WindowObject->Self, WM_SETCURSOR, (WPARAM)WindowObject->Self, HTCAPTION);
+  
+  /* FIXME - send WM_SETCURSOR message */
+  
+  if(!(Flags & TPM_NONOTIFY))
+    IntSendMessage(WindowObject->Self, WM_INITMENU, (WPARAM)MenuObject->Self, 0);
+}
+
+VOID FASTCALL
+IntExitTracking(PWINDOW_OBJECT WindowObject, PMENU_OBJECT MenuObject, BOOL Popup,
+                UINT Flags)
+{
+  if(!(Flags & TPM_NONOTIFY))
+    IntSendMessage(WindowObject->Self, WM_EXITMENULOOP, 0 /* FIXME */, 0);
+  
+  /* FIXME - Show caret again */
+}
+
+INT FASTCALL
+IntTrackMenu(PMENU_OBJECT MenuObject, PWINDOW_OBJECT WindowObject, INT x, INT y,
+             RECT lprect)
+{
+  return 0;
+}
 
 BOOL FASTCALL
 IntTrackPopupMenu(PMENU_OBJECT MenuObject, PWINDOW_OBJECT WindowObject,
                   UINT Flags, POINT *Pos, UINT MenuPos, RECT *ExcludeRect)
 {
-
+  IntInitTracking(WindowObject, MenuObject, TRUE, Flags);
-/* FIXME */
-DbgPrint("IntTrackPopupMenu: unimplemented\n");
-SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED);
   
+  IntExitTracking(WindowObject, MenuObject, TRUE, Flags);
   return FALSE;
 }
 

reactos/subsys/win32k/ntuser/misc.c

@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.45 2004/01/26 12:46:16 weiden Exp $
+/* $Id: misc.c,v 1.46 2004/01/26 23:22:48 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -202,9 +202,14 @@ NtUserCallTwoParam(
       PMENU_OBJECT MenuObject = IntGetMenuObject((HMENU)Param1);
       if(!MenuObject)
         return 0;
+      
       if(Param2 > 0)
+      {
+        Ret = (MenuObject->Height == (int)Param2);
         MenuObject->Height = (int)Param2;
-      Ret = (DWORD)MenuObject->Height;
+      }
+      else
+        Ret = (DWORD)MenuObject->Height;
       IntReleaseMenuObject(MenuObject);
       return Ret;
     }