(struct coding_system): Add member common_flags, delete

[bpt/emacs.git] / lwlib / xlwmenu.c

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index d80fa01..f6805e8 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -644,6 +644,9 @@ display_menu (mw, level, just_compute_p, highlighted_pos, hit, hit_return,
   int horizontal_p = mw->menu.horizontal && (level == 0);
   int highlighted_p;
   int just_compute_this_one_p;
+  /* This is set nonzero if the element containing HIGHLIGHTED_POS
+     is disabled, so that we do not return any subsequent element either.  */
+  int no_return = 0;
 
   if (level >= mw->menu.old_depth)
     abort ();
@@ -688,8 +691,14 @@ display_menu (mw, level, just_compute_p, highlighted_pos, hit, hit_return,
       if (hit
          && !*hit_return
          && (horizontal_p ? hit->x < where.x : hit->y < where.y)
-         && !all_dashes_p (val->name))
-       *hit_return = val;
+         && !all_dashes_p (val->name)
+         && !no_return)
+       {
+         if (val->enabled)
+           *hit_return = val;
+         else
+           no_return = 1;
+       }
 
       if (horizontal_p)
        where.y = 0;
@@ -912,12 +921,13 @@ motion_event_is_in_menu (mw, ev, level, relative_pos)
      XPoint* relative_pos;
 {
   window_state* ws = &mw->menu.windows [level];
-  int x = level == 0 ? ws->x : ws->x + mw->menu.shadow_thickness;
-  int y = level == 0 ? ws->y : ws->y + mw->menu.shadow_thickness;
+  int shadow = level == 0 ? 0 : mw->menu.shadow_thickness;
+  int x = ws->x + shadow;
+  int y = ws->y + shadow;
   relative_pos->x = ev->x_root - x;
   relative_pos->y = ev->y_root - y;
-  return (x < ev->x_root && ev->x_root < x + ws->width
-         && y < ev->y_root && ev->y_root < y + ws->height);
+  return (x - shadow < ev->x_root && ev->x_root < x + ws->width
+         && y - shadow < ev->y_root && ev->y_root < y + ws->height);
 }
 
 static Boolean