Ticket #3571: 3571-Fix-menu-handling.patch

lib/widget/dialog.c

@@ -379 +379 @@
 dlg_mouse_event (WDialog * h, Gpm_Event * event)
 {
     Widget *wh = WIDGET (h);
-
-    GList *p, *first;
+    GList *p;
 
     /* close the dialog by mouse left click out of dialog area */
     if (mouse_close_dialog && !h->fullscreen && ((event->buttons & GPM_B_LEFT) != 0)
@@ -400 +399 @@
             return mou;
     }
 
-    first = h->current;
-    p = first;
-
+    /* Send the event to widgets in reverse stacking order: from the topmost to the bottomost. */
+    p = g_list_last (h->widgets);
     do
     {
         Widget *w = WIDGET (p->data);
 
-        p = dlg_widget_prev (h, p);
-
         if ((w->options & W_DISABLED) == 0 && w->mouse_callback != NULL)
         {
             /* put global cursor position to the widget */
@@ -418 +414 @@
             if (ret != MSG_NOT_HANDLED)
                 return ret;
         }
+
+        p = g_list_previous (p);
     }
-    while (p != first);
+    while (p != NULL);
 
     return MSG_NOT_HANDLED;
 }
@@ -1090 +1088 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-/**
- * Set widget at top of widget list and make it current.
- */
-
-void
-dlg_set_top_widget (void *w)
+static void
+dlg_set_top_or_bottom_widget (void *w, gboolean set_top)
 {
     Widget *widget = WIDGET (w);
     WDialog *h = widget->owner;
@@ -1111 +1105 @@
 
     /* widget reordering */
     h->widgets = g_list_remove_link (h->widgets, l);
-    h->widgets = g_list_concat (h->widgets, l);
-    h->current = l;
+    if (set_top)
+        h->widgets = g_list_concat (h->widgets, l);
+    else
+        h->widgets = g_list_concat (l, h->widgets);
+    h->current = l;             /* @FIXME: this is probably not needed. */
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Set widget at top of widget list and make it current.
+ */
+
+void
+dlg_set_top_widget (void *w)
+{
+    dlg_set_top_or_bottom_widget (w, TRUE);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Set widget at bottom of widget list (and make it current, albeit
+ * typically you'd want to switch to some other widget right after).
+ */
+
+void
+dlg_set_bottom_widget (void *w)
+{
+    dlg_set_top_or_bottom_widget (w, FALSE);
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/dialog.h

@@ -170 +170 @@
 /* Widget selection */
 void dlg_select_widget (void *w);
 void dlg_set_top_widget (void *w);
+void dlg_set_bottom_widget (void *w);
 void dlg_one_up (WDialog * h);
 void dlg_one_down (WDialog * h);
 gboolean dlg_focus (WDialog * h);

lib/widget/menu.c

@@ -309 +309 @@
     w->lines = 1;
     widget_want_hotkey (w, 0);
 
+    /* If the menubar is "invisible", moving it to the bottom of the stack
+     * makes it receive mouse events (and thereby activated) only if the
+     * widgets shown in its space ignore them. In other words, we make
+     * visible widgets take precedence over an invisible menubar. */
+    dlg_set_bottom_widget (menubar);
+
     dlg_select_by_id (w->owner, menubar->previous_widget);
     do_refresh ();
 }
@@ -580 +586 @@
         if (!menubar->is_active)
             return MSG_NOT_HANDLED;
 
-        /* Trick to get all the mouse events */
+        /* Trick to get mouse events from the whole screen. */
         w->lines = LINES;
 
         /* Trick to get all of the hotkeys */
@@ -718 +724 @@
             selected = menubar_get_menu_by_x_coord (menubar, event->x);
 
             if (!menubar->is_active)
-            {
                 /* menu bar is not active -- activate it */
-                menubar->previous_widget = dlg_get_current_widget_id (w->owner);
-                menubar->is_active = TRUE;
-                dlg_select_widget (w);
-            }
+                menubar_activate (menubar);
 
             menubar_remove (menubar);   /* if already shown */
             menubar_drop (menubar, selected);
@@ -999 +1001 @@
 }
 
 /* --------------------------------------------------------------------------------------------- */
+/**
+ * Activate the menu.
+ */
+
+void
+menubar_activate (WMenuBar * menubar)
+{
+    menubar->previous_widget = dlg_get_current_widget_id (WIDGET (menubar)->owner);
+    menubar->is_active = TRUE;
+
+    /* Make the menubar receive all mouse events before any other widget.
+     * See also comment in menubar_finish(). */
+    dlg_set_top_widget (menubar);
+}
+
+/* --------------------------------------------------------------------------------------------- */

lib/widget/menu.h

@@ -55 +55 @@
 void menubar_arrange (WMenuBar * menubar);
 
 WMenuBar *find_menubar (const WDialog * h);
+void menubar_activate (WMenuBar * menubar);
 
 /*** inline functions ****************************************************************************/
 

src/editor/editmenu.c

@@ -271 +271 @@
 
     if (!menubar->is_active)
     {
-        menubar->is_active = TRUE;
         menubar->is_dropped = (drop_menus != 0);
         if (which >= 0)
             menubar->selected = (guint) which;
-
-        menubar->previous_widget = dlg_get_current_widget_id (h);
-        dlg_select_widget (menubar);
+        menubar_activate (menubar);
     }
 }
 

src/filemanager/midnight.c

@@ -367 +367 @@
 static void
 menu_last_selected_cmd (void)
 {
-    the_menubar->is_active = TRUE;
     the_menubar->is_dropped = (drop_menus != 0);
-    the_menubar->previous_widget = dlg_get_current_widget_id (midnight_dlg);
-    dlg_select_widget (the_menubar);
+    menubar_activate (the_menubar);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -937 +935 @@
 
     create_panels ();
 
+    /* Note: the menu is the first widget we add to the dialog because
+     * an "invisible" menu has to be at the bottom of the stack. */
     add_widget (midnight_dlg, the_menubar);
     init_menu ();
 
@@ -1590 +1590 @@
 }
 
 /* --------------------------------------------------------------------------------------------- */
-
-/**
- * Handle mouse events of file manager screen.
- *
- * @param w Widget object (the file manager)
- * @param msg mouse event message
- * @param event mouse event data
- */
-static cb_ret_t
-midnight_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
-{
-    (void) w;
-    (void) msg;
-
-    if (msg == MSG_MOUSE_DOWN && event->y == 0)
-    {
-        /* menubar */
-        if (!the_menubar->is_active)
-            dlg_select_widget (WIDGET (the_menubar));
-    }
-
-    /* allow handle menu events */
-    return MSG_NOT_HANDLED;
-}
-
-/* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -1798 +1772 @@
 #endif
 
     midnight_dlg = dlg_create (FALSE, 0, 0, LINES, COLS, dialog_colors, midnight_callback,
-                               midnight_mouse_callback, "[main]", NULL, DLG_NONE);
+                               NULL, "[main]", NULL, DLG_NONE);
 
     /* Check if we were invoked as an editor or file viewer */
     if (mc_global.mc_run_mode != MC_RUN_FULL)