comparison src/xmenu.c @ 9236:583bb9211b2b

(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the calls to popup_get_selection() provide the protection.

9235:a55d058e5e1a

/* Current depth within submenus.  */
static int menu_items_submenu_depth;

/* Flag which when set indicates a dialog or menu has been posted by
   Xt on behalf of one of the widget sets. */
static int popup_activated_flag;


/* Initialize the menu_items structure if we haven't already done so.
   Also mark it as currently empty.  */

    def1 = Fkey_binding (savedkey, Qnil);
  /* If not, update it.  */
  if (! EQ (def1, def)
      /* If the command is an alias for another
         (such as easymenu.el and lmenu.el set it up),
         check if the original command matches the cached command. */
      && !(SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
           && EQ (def1, XSYMBOL (def)->function))
      /* If something had no key binding before, don't recheck it--
	 doing that takes too much time and makes menus too slow.  */
      && !(!NILP (cachelist) && NILP (savedkey)))

}

#ifdef USE_X_TOOLKIT

/* Loop in Xt until the menu pulldown or dialog popup has been
   popped down (deactivated). */
void
popup_get_selection (initial_event)
     XEvent *initial_event;
{
  XEvent event;

  else
    XtAppNextEvent (Xt_app_con, &event);

  while (1)
    {
      BLOCK_INPUT;
      XtDispatchEvent (&event);
      UNBLOCK_INPUT;
      if (!popup_activated())
	break;
      XtAppNextEvent (Xt_app_con, &event);
    }
}

/* Detect if a dialog or menu has been posted. */
int
popup_activated ()
{
  return popup_activated_flag;
}

	}
    }
}

/* This callback is invoked when a dialog or menu is finished being
   used and has been unposted. */

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

      XtManageChild (x->menubar_widget);
      XtMapWidget (x->menubar_widget);
      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
    }

  /* Re-manage the text-area widget, and then thrash the sizes. */
  XtManageChild (x->edit_widget);
  lw_refigure_widget (x->column_widget, True);

  /* Force the pane widget to resize itself with the right values.  */
  EmacsFrameSetCharSize (x->edit_widget, columns, rows);

      /* The third arg is DEEP_P, which says to consider the entire
	 menu trees we supply, rather than just the menu bar item names.  */
      lw_modify_all_widgets (id, first_wv, 1);

      /* Re-enable the edit widget to resize. */
      lw_allow_resizing (f->display.x->widget, True);
    }
  else
    {
      menubar_widget = lw_create_widget ("menubar", "menubar", 

	  i += MENU_ITEMS_ITEM_LENGTH;
	}
    }

  /* Deal with the title, if it is non-nil. */
  if (!NILP (title))
    {
      widget_value *wv_title = malloc_widget_value ();
      widget_value *wv_sep1 = malloc_widget_value ();
      widget_value *wv_sep2 = malloc_widget_value ();

9236:583bb9211b2b

/* Current depth within submenus.  */
static int menu_items_submenu_depth;

/* Flag which when set indicates a dialog or menu has been posted by
   Xt on behalf of one of the widget sets.  */
static int popup_activated_flag;


/* Initialize the menu_items structure if we haven't already done so.
   Also mark it as currently empty.  */

    def1 = Fkey_binding (savedkey, Qnil);
  /* If not, update it.  */
  if (! EQ (def1, def)
      /* If the command is an alias for another
         (such as easymenu.el and lmenu.el set it up),
         check if the original command matches the cached command.  */
      && !(SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
           && EQ (def1, XSYMBOL (def)->function))
      /* If something had no key binding before, don't recheck it--
	 doing that takes too much time and makes menus too slow.  */
      && !(!NILP (cachelist) && NILP (savedkey)))

}

#ifdef USE_X_TOOLKIT

/* Loop in Xt until the menu pulldown or dialog popup has been
   popped down (deactivated).

   NOTE: All calls to popup_get_selection() should be protected
   with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */
void
popup_get_selection (initial_event)
     XEvent *initial_event;
{
  XEvent event;

  else
    XtAppNextEvent (Xt_app_con, &event);

  while (1)
    {
      XtDispatchEvent (&event);
      if (!popup_activated())
	break;
      XtAppNextEvent (Xt_app_con, &event);
    }
}

/* Detect if a dialog or menu has been posted.  */
int
popup_activated ()
{
  return popup_activated_flag;
}

	}
    }
}

/* This callback is invoked when a dialog or menu is finished being
   used and has been unposted.  */

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

      XtManageChild (x->menubar_widget);
      XtMapWidget (x->menubar_widget);
      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
    }

  /* Re-manage the text-area widget, and then thrash the sizes.  */
  XtManageChild (x->edit_widget);
  lw_refigure_widget (x->column_widget, True);

  /* Force the pane widget to resize itself with the right values.  */
  EmacsFrameSetCharSize (x->edit_widget, columns, rows);

      /* The third arg is DEEP_P, which says to consider the entire
	 menu trees we supply, rather than just the menu bar item names.  */
      lw_modify_all_widgets (id, first_wv, 1);

      /* Re-enable the edit widget to resize.  */
      lw_allow_resizing (f->display.x->widget, True);
    }
  else
    {
      menubar_widget = lw_create_widget ("menubar", "menubar", 

	  i += MENU_ITEMS_ITEM_LENGTH;
	}
    }

  /* Deal with the title, if it is non-nil.  */
  if (!NILP (title))
    {
      widget_value *wv_title = malloc_widget_value ();
      widget_value *wv_sep1 = malloc_widget_value ();
      widget_value *wv_sep2 = malloc_widget_value ();