comparison src/xmenu.c @ 57965:9b14127a651a

* eval.c (Feval): Remove check for INPUT_BLOCKED_P. * xmenu.c (popup_get_selection, create_and_show_popup_menu) (create_and_show_dialog): Revert change from 2004-10-31.

57964:05c49cd7076a

extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
extern XtAppContext Xt_app_con;

static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
                                     LWLIB_ID, int));

/* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */

#define HAVE_BOXES 1
#endif /* USE_X_TOOLKIT */

static void keymap_panes P_ ((Lisp_Object *, int, int));
static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
				     int, int));
static void list_of_panes P_ ((Lisp_Object));
static void list_of_items P_ ((Lisp_Object));


/* This holds a Lisp vector that holds the results of decoding
   the keymaps or alist-of-alists that specify a menu.

   popped down (deactivated).  This is used for x-popup-menu
   and x-popup-dialog; it is not used for the menu bar.

   If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.

   This function used to have a DO_TIMERS argument which was
   1 in the dialog case, and caused it to run Lisp-level timers.
   That was unsafe so we removed it, but does anyone remember
   why menus and dialogs were treated differently?

   NOTE: All calls to popup_get_selection should be protected
   with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */

#ifdef USE_X_TOOLKIT
static void
popup_get_selection (initial_event, dpyinfo, id, down_on_keypress)
     XEvent *initial_event;
     struct x_display_info *dpyinfo;
     LWLIB_ID id;
     int down_on_keypress;
{
  XEvent event;

  while (popup_activated_flag)
    {
      if (initial_event)
        {
          event = *initial_event;
          initial_event = 0;
        }
      else

  /* Display the menu.  */
  lw_popup_menu (menu, (XEvent *) &dummy);
  popup_activated_flag = 1;

  /* Process events that apply to the menu.  */
  popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0);

  /* fp turned off the following statement and wrote a comment
     that it is unnecessary--that the menu has already disappeared.
     Nowadays the menu disappears ok, all right, but
     we need to delete the widgets or multiple ones will pile up.  */

    /* xdialog_show_unwind is responsible for popping the dialog box down.  */
    record_unwind_protect (xdialog_show_unwind,
                           Fcons (make_number (dialog_id >> (fact)),
                                  make_number (dialog_id & ~(-1 << (fact)))));

    popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id, 1);

    unbind_to (count, Qnil);
  }
}

57965:9b14127a651a

extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
extern XtAppContext Xt_app_con;

static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
                                     LWLIB_ID, int, int));

/* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */

#define HAVE_BOXES 1
#endif /* USE_X_TOOLKIT */

static void keymap_panes P_ ((Lisp_Object *, int, int));
static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
				     int, int));
static void list_of_panes P_ ((Lisp_Object));
static void list_of_items P_ ((Lisp_Object));

extern EMACS_TIME timer_check P_ ((int));


/* This holds a Lisp vector that holds the results of decoding
   the keymaps or alist-of-alists that specify a menu.

   popped down (deactivated).  This is used for x-popup-menu
   and x-popup-dialog; it is not used for the menu bar.

   If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.

   NOTE: All calls to popup_get_selection should be protected
   with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */

#ifdef USE_X_TOOLKIT
static void
popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
     XEvent *initial_event;
     struct x_display_info *dpyinfo;
     LWLIB_ID id;
     int do_timers;
     int down_on_keypress;
{
  XEvent event;

  while (popup_activated_flag)
    {
       /* If we have no events to run, consider timers.  */ 	 
       if (do_timers && !XtAppPending (Xt_app_con)) 	 
         timer_check (1); 	 

       if (initial_event)
        {
          event = *initial_event;
          initial_event = 0;
        }
      else

  /* Display the menu.  */
  lw_popup_menu (menu, (XEvent *) &dummy);
  popup_activated_flag = 1;

  /* Process events that apply to the menu.  */
  popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0, 0);

  /* fp turned off the following statement and wrote a comment
     that it is unnecessary--that the menu has already disappeared.
     Nowadays the menu disappears ok, all right, but
     we need to delete the widgets or multiple ones will pile up.  */

    /* xdialog_show_unwind is responsible for popping the dialog box down.  */
    record_unwind_protect (xdialog_show_unwind,
                           Fcons (make_number (dialog_id >> (fact)),
                                  make_number (dialog_id & ~(-1 << (fact)))));

    popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f),
                         dialog_id, 1, 1);

    unbind_to (count, Qnil);
  }
}