comparison src/xmenu.c @ 58170:66ace4a9a250

(pop_down_menu): New function. (popup_get_selection, popup_widget_loop): Unwind protect to pop_down_menu. (popup_widget_loop): Add argument widget. (create_and_show_popup_menu, create_and_show_dialog): Pass new argument widget to popup_widget_loop.

58169:611113427737

     anyway, and with callbacks we would have three variants for timer handling
     instead of the small ifdefs below.  */

  while (
#ifdef USE_X_TOOLKIT
         XtAppPending (Xt_app_con)
#elif defined USE_GTK
         ! gtk_events_pending ()
#else
         ! XPending ((Display*) data)
#endif

#endif /* ! MSDOS */


#if defined (USE_X_TOOLKIT) || defined (USE_GTK)

/* Loop in Xt until the menu pulldown or dialog popup has been
   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 (initial_event)
        {

	    popup_activated_flag = 0;
        }

      x_dispatch_event (&event, event.xany.display);
    }
}

#endif /* USE_X_TOOLKIT */

#ifdef USE_GTK
/* Loop util popup_activated_flag is set to zero in a callback.
   Used for popup menus and dialogs. */
static void
popup_widget_loop (do_timers)
     int do_timers;
{
  ++popup_activated_flag;

  /* Process events in the Gtk event loop until done.  */
  while (popup_activated_flag)
    {
      if (do_timers) x_menu_wait_for_event (0);
      gtk_main_iteration ();
    }
}
#endif

/* Activate the menu bar of frame F.
   This is called from keyboard.c when it gets the

  /* Set this to one.  popup_widget_loop increases it by one, so it becomes
     two.  show_help_echo uses this to detect popup menus.  */
  popup_activated_flag = 1;
  /* Process events that apply to the menu.  */
  popup_widget_loop (1);

  gtk_widget_destroy (menu);

  /* Must reset this manually because the button release event is not passed
     to Emacs event loop. */

    {
      /* Display the menu.  */
      gtk_widget_show_all (menu);

      /* Process events that apply to the menu.  */
      popup_widget_loop (1);

      gtk_widget_destroy (menu);
    }
}

58170:66ace4a9a250

     anyway, and with callbacks we would have three variants for timer handling
     instead of the small ifdefs below.  */

  while (
#ifdef USE_X_TOOLKIT
         ! XtAppPending (Xt_app_con)
#elif defined USE_GTK
         ! gtk_events_pending ()
#else
         ! XPending ((Display*) data)
#endif

#endif /* ! MSDOS */


#if defined (USE_X_TOOLKIT) || defined (USE_GTK)

#ifdef USE_X_TOOLKIT

static Lisp_Object
pop_down_menu (dummy)
     int dummy;
{
  popup_activated_flag = 0;
}

/* Loop in Xt until the menu pulldown or dialog popup has been
   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.  */

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;

  int specpdl_count = SPECPDL_INDEX ();
  record_unwind_protect (pop_down_menu, Qnil);

  while (popup_activated_flag)
    {
       if (initial_event)
        {

	    popup_activated_flag = 0;
        }

      x_dispatch_event (&event, event.xany.display);
    }

  unbind_to (specpdl_count, Qnil);
}

#endif /* USE_X_TOOLKIT */

#ifdef USE_GTK
/* Loop util popup_activated_flag is set to zero in a callback.
   Used for popup menus and dialogs. */
static GtkWidget *current_menu;

static Lisp_Object
pop_down_menu (dummy)
     int dummy;
{
  if (current_menu)
    {
      gtk_widget_unmap (current_menu);
      current_menu = 0;
      popup_activated_flag = 0;
    }
}

static void
popup_widget_loop (do_timers, widget)
     int do_timers;
     GtkWidget *widget;
{
  int specpdl_count = SPECPDL_INDEX ();
  current_menu = widget;
  record_unwind_protect (pop_down_menu, Qnil);

  ++popup_activated_flag;

  /* Process events in the Gtk event loop until done.  */
  while (popup_activated_flag)
    {
      if (do_timers) x_menu_wait_for_event (0);
      gtk_main_iteration ();
    }

  unbind_to (specpdl_count, Qnil);
}
#endif

/* Activate the menu bar of frame F.
   This is called from keyboard.c when it gets the

  /* Set this to one.  popup_widget_loop increases it by one, so it becomes
     two.  show_help_echo uses this to detect popup menus.  */
  popup_activated_flag = 1;
  /* Process events that apply to the menu.  */
  popup_widget_loop (1, 0);

  gtk_widget_destroy (menu);

  /* Must reset this manually because the button release event is not passed
     to Emacs event loop. */

    {
      /* Display the menu.  */
      gtk_widget_show_all (menu);

      /* Process events that apply to the menu.  */
      popup_widget_loop (1, menu);

      gtk_widget_destroy (menu);
    }
}