[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xmenu.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xmenu.c [emacs-unicode-2] |
Date: |
Thu, 11 Nov 2004 22:18:52 -0500 |
Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.249.2.5 emacs/src/xmenu.c:1.249.2.6
*** emacs/src/xmenu.c:1.249.2.5 Thu Nov 4 08:55:31 2004
--- emacs/src/xmenu.c Fri Nov 12 02:52:55 2004
***************
*** 115,121 ****
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. */
--- 115,121 ----
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. */
***************
*** 157,162 ****
--- 157,164 ----
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.
***************
*** 1120,1126 ****
popped down (deactivated). This is used for x-popup-menu
and x-popup-dialog; it is not used for the menu bar.
- If DO_TIMERS is nonzero, run timers.
If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.
NOTE: All calls to popup_get_selection should be protected
--- 1122,1127 ----
***************
*** 1128,1144 ****
#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;
--- 1129,1150 ----
#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;
***************
*** 2484,2490 ****
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.
--- 2490,2496 ----
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.
***************
*** 2878,2884 ****
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);
}
--- 2884,2891 ----
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);
}