comparison src/xmenu.c @ 8166:6fa3cd9b176d

(xmenu_show) [USE_X_TOOLKIT]: Keyboard input exits the menu. ButtonRelease does so if within Vdouble_click_time. Ignore mouse motion if button was already released. (menu_item_selection): Declare volatile, if __STDC__.

8165:02ee07034f11

	}
    }
  return Qnil;
}

static Lisp_Object *menu_item_selection;

static void
popup_selection_callback (widget, id, client_data)
     Widget widget;
     LWLIB_ID id;

   TITLE is the specified menu title.
   ERROR is a place to store an error message string in case of failure.
   (We return nil on failure, but the value doesn't actually matter.)  */

#ifdef USE_X_TOOLKIT

extern unsigned int x_mouse_grabbed;
extern Lisp_Object Vmouse_depressed;

static Lisp_Object

    pop_up_menu (mw, &dummy);
  }

  /* No need to check a second time since this is done in the XEvent loop.
     This slows done the execution.  */
#if 0
  /* Check again whether the mouse has moved to another menu bar item.  */
  if (check_mouse_other_menu_bar (f))
    {
      /* The mouse moved into a different menu bar item. 
	 We should bring up that item's menu instead.

  /* Process events that apply to the menu.  */
  while (1)
    {
      XEvent event;

      XtAppNextEvent (Xt_app_con, &event);
      if (event.type == ButtonRelease)
	{
	  XtDispatchEvent (&event);

		 has been set to grabbed. Reset it now.  */
	      x_mouse_grabbed &= ~(1 << event.xbutton.button);
	      if (!x_mouse_grabbed)
		Vmouse_depressed = Qnil;
	    }
	  break;
	}
      else if (event.type == Expose)
	process_expose_from_menu (event);
      else if (event.type == MotionNotify)
	{
	  int event_x = (event.xmotion.x_root
			 - (f->display.x->widget->core.x
			    + f->display.x->widget->core.border_width));
	  int event_y = (event.xmotion.y_root

	      break;
	    }
	}

      XtDispatchEvent (&event);
      if (XtWindowToWidget(XDISPLAY event.xany.window) != menu)
	{
	  queue_tmp
	    = (struct event_queue *) malloc (sizeof (struct event_queue));

	  if (queue_tmp != NULL) 

	      queue_tmp->event = event;
	      queue_tmp->next = queue;
	      queue = queue_tmp;
	    }
	}
    }

 pop_down:
  /* Unhighlight the menu bar item (if any) that led to this menu.  */
  if (menubarp)

8166:6fa3cd9b176d

	}
    }
  return Qnil;
}

#ifdef __STDC__
static Lisp_Object *volatile menu_item_selection;
#else
static Lisp_Object *menu_item_selection;
#endif

static void
popup_selection_callback (widget, id, client_data)
     Widget widget;
     LWLIB_ID id;

   TITLE is the specified menu title.
   ERROR is a place to store an error message string in case of failure.
   (We return nil on failure, but the value doesn't actually matter.)  */

#ifdef USE_X_TOOLKIT

extern unsigned last_event_timestamp;
extern Lisp_Object Vdouble_click_time;

extern unsigned int x_mouse_grabbed;
extern Lisp_Object Vmouse_depressed;

static Lisp_Object

    pop_up_menu (mw, &dummy);
  }

  /* No need to check a second time since this is done in the XEvent loop.
     This slows done the execution.  */
#ifdef XMENU_FOO
  /* Check again whether the mouse has moved to another menu bar item.  */
  if (check_mouse_other_menu_bar (f))
    {
      /* The mouse moved into a different menu bar item. 
	 We should bring up that item's menu instead.

  /* Process events that apply to the menu.  */
  while (1)
    {
      XEvent event;
      int queue_and_exit = 0;

      XtAppNextEvent (Xt_app_con, &event);
      if (event.type == ButtonRelease)
	{
	  XtDispatchEvent (&event);

		 has been set to grabbed. Reset it now.  */
	      x_mouse_grabbed &= ~(1 << event.xbutton.button);
	      if (!x_mouse_grabbed)
		Vmouse_depressed = Qnil;
	    }
	  if (! (menu_item_selection == 0
		 && (((XButtonEvent *) (&event))->time - last_event_timestamp
		     < XINT (Vdouble_click_time))))
	    break;
	}
      else if (event.type == ButtonPress)
	{
	  /* Any mouse button activity that doesn't select in the menu
	     should unpost the menu.  */
	  if (menu_item_selection == 0)
	    break;
	}
      else if (event.type == KeyPress)
	{
	  /* Exit the loop, but first queue this event for reuse.  */
	  queue_and_exit = 1;
	}
      else if (event.type == Expose)
	process_expose_from_menu (event);
      /* If the mouse moves to a different menu bar item, switch to
	 that item's menu.  But only if the button is still held down.  */
      else if (event.type == MotionNotify
	       && x_mouse_grabbed)
	{
	  int event_x = (event.xmotion.x_root
			 - (f->display.x->widget->core.x
			    + f->display.x->widget->core.border_width));
	  int event_y = (event.xmotion.y_root

	      break;
	    }
	}

      XtDispatchEvent (&event);
      if (queue_and_exit
	  || XtWindowToWidget (XDISPLAY event.xany.window) != menu)
	{
	  queue_tmp
	    = (struct event_queue *) malloc (sizeof (struct event_queue));

	  if (queue_tmp != NULL) 

	      queue_tmp->event = event;
	      queue_tmp->next = queue;
	      queue = queue_tmp;
	    }
	}
      if (queue_and_exit)
	break;
    }

 pop_down:
  /* Unhighlight the menu bar item (if any) that led to this menu.  */
  if (menubarp)