comparison src/xmenu.c @ 7459:1a6156c8731e

(xmenu_show): New var mb_item. Use it to determine the menubar item that led to the menu. (Fx_popup_menu): Suppress duplicate test case in the way to determine whether the menu is handling a menu bar click.

7458:ac210d94f33f

	      x = Fcar (tem);
	      y = Fcdr (tem);

	      /* Determine whether this menu is handling a menu bar click.  */
	      tem = Fcar (Fcdr (Fcar (Fcdr (position))));
	      if (XTYPE (Fcar (position)) != Lisp_Cons
		  && CONSP (tem)
		  && EQ (Fcar (tem), Qmenu_bar))
		menubarp = 1;
	    }
	}

      CHECK_NUMBER (x, 0);

  /* Figure out which menu bar item, if any, this menu is for.  */
  if (menubarp)
    {
      int xbeg;
      int xend = 0;

      for (menubar_item = menubar->menu.old_stack[0]->contents;
	   menubar_item;
	   menubar_item = menubar_item->next)
	{
	  xbeg = xend;
	  xend += (string_width (menubar, menubar_item->name) 
		   + 2 * (menubar->menu.horizontal_spacing
			  + menubar->menu.shadow_thickness));
	  if (x >= xbeg && x < xend)
	    {
	      x = xbeg + 4;
	      y = 0;
	      /* Arrange to show a different menu if we move in the menu bar
		 to a different item.  */
	      this_menu_bar_item_beg = xbeg;
	      this_menu_bar_item_end = xend;
	    }

7459:1a6156c8731e

	      x = Fcar (tem);
	      y = Fcdr (tem);

	      /* Determine whether this menu is handling a menu bar click.  */
	      tem = Fcar (Fcdr (Fcar (Fcdr (position))));
	      if (CONSP (tem) && EQ (Fcar (tem), Qmenu_bar))
		menubarp = 1;
	    }
	}

      CHECK_NUMBER (x, 0);

  /* Figure out which menu bar item, if any, this menu is for.  */
  if (menubarp)
    {
      int xbeg;
      int xend = 0;
      widget_value *mb_item = 0;

      for (mb_item = menubar->menu.old_stack[0]->contents;
	   mb_item;
	   mb_item = mb_item->next)
	{
	  xbeg = xend;
	  xend += (string_width (menubar, mb_item->name) 
		   + 2 * (menubar->menu.horizontal_spacing
			  + menubar->menu.shadow_thickness));
	  if (x >= xbeg && x < xend)
	    {
	      x = xbeg + 4;
	      y = 0;
	      menubar_item = mb_item;
	      /* Arrange to show a different menu if we move in the menu bar
		 to a different item.  */
	      this_menu_bar_item_beg = xbeg;
	      this_menu_bar_item_end = xend;
	    }