Mercurial > emacs
comparison src/xmenu.c @ 39988:eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 17 Oct 2001 03:16:12 +0000 |
parents | 91951fb5b9e5 |
children | 5fda2888718a |
comparison
equal
deleted
inserted
replaced
39987:9c096889e4c6 | 39988:eac4e9ae201c |
---|---|
35 | 35 |
36 /* On 4.3 this loses if it comes after xterm.h. */ | 36 /* On 4.3 this loses if it comes after xterm.h. */ |
37 #include <signal.h> | 37 #include <signal.h> |
38 | 38 |
39 #include <stdio.h> | 39 #include <stdio.h> |
40 #define DOC_STRINGS_IN_COMMENTS | 40 |
41 #include "lisp.h" | 41 #include "lisp.h" |
42 #include "termhooks.h" | 42 #include "termhooks.h" |
43 #include "keyboard.h" | 43 #include "keyboard.h" |
44 #include "keymap.h" | 44 #include "keymap.h" |
45 #include "frame.h" | 45 #include "frame.h" |
654 } | 654 } |
655 } | 655 } |
656 } | 656 } |
657 | 657 |
658 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, | 658 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, |
659 /* Pop up a deck-of-cards menu and return user's selection. | 659 doc: /* Pop up a deck-of-cards menu and return user's selection. |
660 POSITION is a position specification. This is either a mouse button event | 660 POSITION is a position specification. This is either a mouse button event |
661 or a list ((XOFFSET YOFFSET) WINDOW) | 661 or a list ((XOFFSET YOFFSET) WINDOW) |
662 where XOFFSET and YOFFSET are positions in pixels from the top left | 662 where XOFFSET and YOFFSET are positions in pixels from the top left |
663 corner of WINDOW's frame. (WINDOW may be a frame object instead of a window.) | 663 corner of WINDOW's frame. (WINDOW may be a frame object instead of a window.) |
664 This controls the position of the center of the first line | 664 This controls the position of the center of the first line |
686 but a string can appear as an item--that makes a nonselectable line | 686 but a string can appear as an item--that makes a nonselectable line |
687 in the menu. | 687 in the menu. |
688 With this form of menu, the return value is VALUE from the chosen item. | 688 With this form of menu, the return value is VALUE from the chosen item. |
689 | 689 |
690 If POSITION is nil, don't display the menu at all, just precalculate the | 690 If POSITION is nil, don't display the menu at all, just precalculate the |
691 cached information about equivalent key sequences. */ | 691 cached information about equivalent key sequences. */) |
692 (position, menu)) | 692 (position, menu) |
693 Lisp_Object position, menu; | 693 Lisp_Object position, menu; |
694 { | 694 { |
695 Lisp_Object keymap, tem; | 695 Lisp_Object keymap, tem; |
696 int xpos = 0, ypos = 0; | 696 int xpos = 0, ypos = 0; |
697 Lisp_Object title; | 697 Lisp_Object title; |
879 } | 879 } |
880 | 880 |
881 #ifdef HAVE_MENUS | 881 #ifdef HAVE_MENUS |
882 | 882 |
883 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0, | 883 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0, |
884 /* Pop up a dialog box and return user's selection. | 884 doc: /* Pop up a dialog box and return user's selection. |
885 POSITION specifies which frame to use. | 885 POSITION specifies which frame to use. |
886 This is normally a mouse button event or a window or frame. | 886 This is normally a mouse button event or a window or frame. |
887 If POSITION is t, it means to use the frame the mouse is on. | 887 If POSITION is t, it means to use the frame the mouse is on. |
888 The dialog box appears in the middle of the specified frame. | 888 The dialog box appears in the middle of the specified frame. |
889 | 889 |
893 The return value is VALUE from the chosen item. | 893 The return value is VALUE from the chosen item. |
894 | 894 |
895 An ITEM may also be just a string--that makes a nonselectable item. | 895 An ITEM may also be just a string--that makes a nonselectable item. |
896 An ITEM may also be nil--that means to put all preceding items | 896 An ITEM may also be nil--that means to put all preceding items |
897 on the left of the dialog box and all following items on the right. | 897 on the left of the dialog box and all following items on the right. |
898 \(By default, approximately half appear on each side.) */ | 898 \(By default, approximately half appear on each side.) */) |
899 (position, contents)) | 899 (position, contents) |
900 Lisp_Object position, contents; | 900 Lisp_Object position, contents; |
901 { | 901 { |
902 struct frame * f = NULL; | 902 struct frame * f = NULL; |
903 Lisp_Object window; | 903 Lisp_Object window; |
904 | 904 |
2847 menu_items = Qnil; | 2847 menu_items = Qnil; |
2848 | 2848 |
2849 Qdebug_on_next_call = intern ("debug-on-next-call"); | 2849 Qdebug_on_next_call = intern ("debug-on-next-call"); |
2850 staticpro (&Qdebug_on_next_call); | 2850 staticpro (&Qdebug_on_next_call); |
2851 | 2851 |
2852 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame | 2852 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame, |
2853 /* Frame for which we are updating a menu. | 2853 doc: /* Frame for which we are updating a menu. |
2854 The enable predicate for a menu command should check this variable. */); | 2854 The enable predicate for a menu command should check this variable. */); |
2855 Vmenu_updating_frame = Qnil; | 2855 Vmenu_updating_frame = Qnil; |
2856 | 2856 |
2857 #ifdef USE_X_TOOLKIT | 2857 #ifdef USE_X_TOOLKIT |
2858 widget_id_tick = (1<<16); | 2858 widget_id_tick = (1<<16); |