Mercurial > emacs

comparison src/xmenu.c @ 90667:dbe3f29e61d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 505-522) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: etc/TUTORIAL.cn: Updated. - Merge from erc--emacs--22 * gnus--rel--5.10 (patch 164-167) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
author Miles Bader <miles@gnu.org>
date Tue, 21 Nov 2006 08:56:38 +0000
parents 02cf29720f31 e3259d353397
children 95d0cdf160ea
comparison
equal deleted inserted replaced
90666:00d54c8fa693 90667:dbe3f29e61d6
820 { 820 {
821 Lisp_Object keymap, tem; 821 Lisp_Object keymap, tem;
822 int xpos = 0, ypos = 0; 822 int xpos = 0, ypos = 0;
823 Lisp_Object title; 823 Lisp_Object title;
824 char *error_name = NULL; 824 char *error_name = NULL;
825 Lisp_Object selection; 825 Lisp_Object selection = Qnil;
826 FRAME_PTR f = NULL; 826 FRAME_PTR f = NULL;
827 Lisp_Object x, y, window; 827 Lisp_Object x, y, window;
828 int keymaps = 0; 828 int keymaps = 0;
829 int for_click = 0; 829 int for_click = 0;
830 int specpdl_count = SPECPDL_INDEX (); 830 int specpdl_count = SPECPDL_INDEX ();
1484 pending_menu_activation = 1; 1484 pending_menu_activation = 1;
1485 #endif 1485 #endif
1486 1486
1487 /* Ignore this if we get it a second time. */ 1487 /* Ignore this if we get it a second time. */
1488 f->output_data.x->saved_menu_event->type = 0; 1488 f->output_data.x->saved_menu_event->type = 0;
1489 }
1490
1491 /* Detect if a dialog or menu has been posted. */
1492
1493 int
1494 popup_activated ()
1495 {
1496 return popup_activated_flag;
1497 } 1489 }
1498 1490
1499 /* This callback is invoked when the user selects a menubar cascade 1491 /* This callback is invoked when the user selects a menubar cascade
1500 pushbutton, but before the pulldown menu is posted. */ 1492 pushbutton, but before the pulldown menu is posted. */
1501 1493
3760 3752
3761 #endif /* not USE_X_TOOLKIT */ 3753 #endif /* not USE_X_TOOLKIT */
3762 3754
3763 #endif /* HAVE_MENUS */ 3755 #endif /* HAVE_MENUS */
3764 3756
3757 /* Detect if a dialog or menu has been posted. */
3758
3759 int
3760 popup_activated ()
3761 {
3762 return popup_activated_flag;
3763 }
3765 3764
3766 /* The following is used by delayed window autoselection. */ 3765 /* The following is used by delayed window autoselection. */
3767 3766
3768 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, 3767 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,
3769 doc: /* Return t if a menu or popup dialog is active. */) 3768 doc: /* Return t if a menu or popup dialog is active. */)