Changeset 3153 for trunk/src/user32/menu.cpp

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

• trunk/src/user32/menu.cpp (modified) (16 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.18 2000-02-21 17:25:28 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.19 2000-03-18 16:13:34 cbratschi Exp $*/
 /*
  * Menu functions
@@ -9 +9 @@
  * Copyright 1999 Christoph Bratschi
  *
- * Corel version: 20000212
- * WINE version: 20000130
+ * Corel version: 20000317
+ * (WINE version: 20000130)
  *
  * Status:  ???
@@ -614 +614 @@
 
     if (((*hmenu)==0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL;
+    if (!menu) return NULL;
     if (wFlags & MF_BYPOSITION)
     {
@@ -1630 +1631 @@
         SetWindowPos( menu->hWnd, HWND_TOP, 0, 0, 0, 0,
                         SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
+        EnableWindow(menu->hWnd,TRUE);
         UpdateWindow( menu->hWnd );
         return TRUE;
@@ -2370 +2372 @@
        MENUITEM *item;
 
-            MENU_SwitchTracking( pmt, hPtMenu, id );
+            MENU_SwitchTracking( pmt, hPtMenu, id );
 
 
@@ -2376 +2378 @@
           Test to see if we are trying to popup a submenu or not.
           If we aren't, don't change the current menu pointer
-          and return.
+          and return.
        */
        if (!(menu = (POPUPMENU *)MENU_GetMenu( hPtMenu )))
        {
           pmt->hCurrentMenu = hPtMenu;
-          return TRUE;
+          return TRUE;
        }
 
@@ -2388 +2390 @@
        {
           pmt->hCurrentMenu = hPtMenu;
-          return TRUE;
+          return TRUE;
        }
 
@@ -2396 +2398 @@
        {
           pmt->hCurrentMenu =  hPtMenu;
-          return TRUE;
+          return TRUE;
        }
 
-
-       /*
-         If we made it this far, we want to pop up a submenu.  Before we pop it up,
-         we want a slight delay.  This is implemented by remembering the ID of the menu
-         where the mouse is currently positioned, and setting up a timer.  When the
-         timer fires (handled in MENU_TrackMenu() ), if the mouse is over the same
-         submenu item, we popup it up.  Otherwise, we do nothing.
+       /* Check to see if we are trying to popup a toplevel menu or a
+          submenu.  Only the submenu has a delay.
        */
-       KillTimer (pmt->hOwnerWnd, SUBMENU_POPUP_TIMERID); /* Just in case another timer was set up and not fired yet... */
-       if ( (SetTimer (pmt->hOwnerWnd, SUBMENU_POPUP_TIMERID, POPUP_MENU_DELAY, NULL)) != SUBMENU_POPUP_TIMERID)
+       if (uSubPWndLevel)
        {
-          /*
-            For some reason the timer wasn't set up properly... Revert to old
-            functionality.
-          */
-        
-          pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags,&pmt->pt);
+         /*
+           If we made it here, we want to pop up a submenu.  Before we pop it up,
+           we want a slight delay.  This is implemented by remembering the ID of the menu
+           where the mouse is currently positioned, and setting up a timer.  When the
+           timer fires (handled in MENU_TrackMenu() ), if the mouse is over the same
+           submenu item, we popup it up.  Otherwise, we do nothing.
+         */
+         KillTimer (pmt->hOwnerWnd, SUBMENU_POPUP_TIMERID); /* Just in case another timer was set up and not fired yet... */
+         if ( (SetTimer (pmt->hOwnerWnd, SUBMENU_POPUP_TIMERID, POPUP_MENU_DELAY, NULL)) != SUBMENU_POPUP_TIMERID)
+         {
+            /*
+              For some reason the timer wasn't set up properly... Revert to old
+              functionality.
+            */
+            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
+            return TRUE;
+         }
+       } else
+       {
+         /* We are trying to popup a top level menu... so no delay */
+
+          pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags,&pmt->pt);
           return TRUE;
-    }
+       }
 
        mouseOverMenuID = id;
@@ -2695 +2707 @@
     MTRACKER mt;
     BOOL enterIdleSent = FALSE;
+    BOOL bSysMenu;
 
     mt.trackFlags = 0;
@@ -2709 +2722 @@
     fEndMenu = FALSE;
     if (!(menu = MENU_GetMenu(hmenu))) return FALSE;
+
+    bSysMenu = IS_SYSTEM_MENU(menu);
 
     if (wFlags & TPM_BUTTONDOWN)
@@ -2754 +2769 @@
                 case WM_RBUTTONDOWN:
                     if (!(wFlags & TPM_RIGHTBUTTON)) break;
-                    /* fall through */
+                    goto buttondown;
                 case WM_LBUTTONDBLCLK:
+                    if (bSysMenu && (hmenu == mt.hTopMenu))
+                    {
+                        fEndMenu = TRUE;
+                        break;
+                    }
+                    /* fall through */
                 case WM_LBUTTONDOWN:
                     /* If the message belongs to the menu, removes it from the queue */
                     /* Else, end menu tracking */
+
+                 buttondown:
+                    /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
+                    mouseOverMenuID = -1;
                     fRemove = MENU_ButtonDown( &mt, hmenu, wFlags );
                     fEndMenu = !fRemove;
@@ -2770 +2795 @@
                     if (hmenu)
                     {
+                        /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
+                        mouseOverMenuID = -1;
                         executedMenuId = MENU_ButtonUp( &mt, hmenu, wFlags);
 
@@ -2791 +2818 @@
             } /* switch(msg.message) - mouse */
         }
-        else if (msg.message == WM_TIMER)
-        {
-           UINT id = -1;
+        else if (msg.message == WM_TIMER)
+        {
+           UINT id = -1;
            POPUPMENU *ptmenu = NULL;
 
            if (isTimerSet)
-           {
+           {
               /*
-                If we get here, an attempt was made to pop up a submenu.
-                (See MENU_MouseMove() )
-              */
-
-              /* Get the ID of the menu item the mouse is over now. */
-              if( hmenu )
+                If we get here, an attempt was made to pop up a submenu.
+                (See MENU_MouseMove() )
+              */
+
+              /* Get the ID of the menu item the mouse is over now. */
+              if( hmenu )
               {
                  ptmenu = (POPUPMENU *)MENU_GetMenu( hmenu );
@@ -2811 +2838 @@
                  else
                    MENU_FindItemByCoords( ptmenu, mt.pt, &id );
+
+                 /* If it is over the same item that set up the timer originally .... */
+                 if (mouseOverMenuID != -1 && mouseOverMenuID == id)
+                 {
+                   /* .... Pop up the menu */
+                   mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, hmenu, FALSE, wFlags,&mt.pt);
+                  }
               }
-        
-              /* If it is over the same item that set up the timer
-                 originally .... */
-              if (mouseOverMenuID == id)
-              {
-                 /* .... Pop up the menu */
-                 mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, hmenu, FALSE, wFlags,&mt.pt);
-              }
-        
-              /* Reset the timer so it doesn't fire again. (So we are ready for the next
-                 attempt to popup a submenu... ) */
-              KillTimer (mt.hOwnerWnd, 100);
-              isTimerSet = FALSE;
-           }
-        }
+
+              /* Reset the timer so it doesn't fire again. (So we are ready for the next
+                 attempt to popup a submenu... ) */
+              KillTimer(mt.hOwnerWnd,SUBMENU_POPUP_TIMERID);
+              isTimerSet = FALSE;
+           }
+        }
         else if ((msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST))
         {
@@ -2866 +2892 @@
                     break;
 
-                case VK_F1:
-                    {
-                        HELPINFO hi;
-                        hi.cbSize = sizeof(HELPINFO);
-                        hi.iContextType = HELPINFO_MENUITEM;
-                        if (menu->FocusedItem == NO_SELECTED_ITEM)
-                            hi.iCtrlId = 0;
-                        else    
-                            hi.iCtrlId = menu->items[menu->FocusedItem].wID;
-                        hi.hItemHandle = hmenu;
-                        hi.dwContextId = menu->dwContextHelpID;
-                        hi.MousePos = msg.pt;
-                        //TRACE_(winhelp)("Sending HELPINFO_MENUITEM to 0x%08x\n", hwnd);
-                        SendMessageA(hwnd, WM_HELP, 0, (LPARAM)&hi);
-                        break;
-                    }
+                case VK_F1:
+                    {
+                        HELPINFO hi;
+                        hi.cbSize = sizeof(HELPINFO);
+                        hi.iContextType = HELPINFO_MENUITEM;
+                        if (menu->FocusedItem == NO_SELECTED_ITEM)
+                            hi.iCtrlId = 0;
+                        else
+                            hi.iCtrlId = menu->items[menu->FocusedItem].wID;
+                        hi.hItemHandle = hmenu;
+                        hi.dwContextId = menu->dwContextHelpID;
+                        hi.MousePos = msg.pt;
+                        //TRACE_(winhelp)("Sending HELPINFO_MENUITEM to 0x%08x\n", hwnd);
+                        SendMessageA(hwnd, WM_HELP, 0, (LPARAM)&hi);
+                        break;
+                    }
 
                 default:
@@ -2929 +2955 @@
             }  /* switch(msg.message) - kbd */
         }
+        else if (msg.message == WM_SYSCOMMAND)
+        {
+                /* The user clicked on the system menu/button */
+        fEndMenu = TRUE;
+        break;
+        }
         else
         {