(x_window_to_menu_bar) [USE_LUCID]: New function.

(XTread_socket) [USE_LUCID] <Expose>: Handle events for
windows that are components of a Lucid menu bar.

2 files changed, 45 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f0ae3d17eac..282d0a2de2c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-30  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (x_window_to_menu_bar) [USE_LUCID]: New function.
+        (XTread_socket) <Expose> [USE_LUCID]: Handle events for 
+        windows that are components of a Lucid menu bar.
+
 2001-04-27  Gerd Moellmann  <gerd@gnu.org>
 
         * term.c (turn_on_face): Fix reverse video handling on terminals
diff --git a/src/xterm.c b/src/xterm.c
index 15ba1e9c6dc..118c1261ee9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8037,6 +8037,33 @@ x_window_to_scroll_bar (window_id)
 }
 
 
+#if defined USE_X_TOOLKIT && defined USE_LUCID
+
+/* Return the Lucid menu bar WINDOW is part of.  Return null
+   if WINDOW is not part of a menu bar.  */
+
+static Widget
+x_window_to_menu_bar (window)
+     Window window;
+{
+  Lisp_Object tail;
+  
+  for (tail = Vframe_list;
+       XGCTYPE (tail) == Lisp_Cons;
+       tail = XCDR (tail))
+    {
+      Lisp_Object frame = XCAR (tail);
+      Widget menu_bar = XFRAME (frame)->output_data.x->menubar_widget;
+      
+      if (menu_bar && xlwmenu_window_p (menu_bar, window))
+        return menu_bar;
+    }
+
+  return NULL;
+}
+
+#endif /* USE_X_TOOLKIT && USE_LUCID */
+
 
 /************************************************************************
                          Toolkit scroll bars
@@ -9990,6 +10017,18 @@ XTread_socket (sd, bufp, numchars, expected)
                 }
               else
                 {
+#if defined USE_X_TOOLKIT && defined USE_LUCID
+                  /* Submenus of the Lucid menu bar aren't widgets
+                     themselves, so there's no way to dispatch events
+                     to them.  Recognize this case separately.  */
+                  {
+                    Widget widget
+                      = x_window_to_menu_bar (event.xexpose.window);
+                    if (widget)
+                      xlwmenu_redisplay (widget);
+                  }
+#endif /* USE_X_TOOLKIT && USE_LUCID */
+                  
 #ifdef USE_TOOLKIT_SCROLL_BARS
                   /* Dispatch event to the widget.  */
                   goto OTHER;