Mercurial > emacs
annotate src/xmenu.c @ 62090:cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Thu, 05 May 2005 22:31:36 +0000 |
| parents | 76ffd04afaae |
| children | 0c2ce5566afa b151ec53c504 |
| rev | line source |
|---|---|
| 118 | 1 /* X Communication module for terminals which understand the X protocol. |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
2 Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004, |
|
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
3 2005 Free Software Foundation, Inc. |
| 118 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
|
1437
36ef55ecb265
* frame.c (make_frame_without_minibuffer, Fwindow_frame): Use
Jim Blandy <jimb@redhat.com>
parents:
1304
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
| 118 | 10 any later version. |
| 11 | |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 118 | 21 |
|
40239
5fda2888718a
Spell the name of Emacs properly (GNU Emacs instead of gnuemacs).
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
22 /* X pop-up deck-of-cards menu facility for GNU Emacs. |
| 118 | 23 * |
| 24 * Written by Jon Arnold and Roman Budzianowski | |
| 25 * Mods and rewrite by Robert Krawitz | |
| 26 * | |
| 27 */ | |
| 28 | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
29 /* Modified by Fred Pierresteguy on December 93 |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
30 to make the popup menus and menubar use the Xt. */ |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
31 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
32 /* Rewritten for clarity and GC protection by rms in Feb 94. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
33 |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26036
diff
changeset
|
34 #include <config.h> |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26036
diff
changeset
|
35 |
| 118 | 36 /* On 4.3 this loses if it comes after xterm.h. */ |
| 37 #include <signal.h> | |
|
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7871
diff
changeset
|
38 |
|
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7871
diff
changeset
|
39 #include <stdio.h> |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
40 |
| 118 | 41 #include "lisp.h" |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
42 #include "termhooks.h" |
|
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32179
diff
changeset
|
43 #include "keyboard.h" |
|
39690
38c1890338cc
(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
44 #include "keymap.h" |
| 770 | 45 #include "frame.h" |
| 118 | 46 #include "window.h" |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2209
diff
changeset
|
47 #include "blockinput.h" |
| 12661 | 48 #include "buffer.h" |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
49 #include "charset.h" |
|
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
50 #include "coding.h" |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
51 #include "sysselect.h" |
| 118 | 52 |
|
10502
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
53 #ifdef MSDOS |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
54 #include "msdos.h" |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
55 #endif |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
56 |
| 9572 | 57 #ifdef HAVE_X_WINDOWS |
| 118 | 58 /* This may include sys/types.h, and that somehow loses |
| 59 if this is not done before the other system files. */ | |
| 60 #include "xterm.h" | |
| 9572 | 61 #endif |
| 118 | 62 |
| 63 /* Load sys/types.h if not already loaded. | |
| 64 In some systems loading it twice is suicidal. */ | |
| 65 #ifndef makedev | |
| 66 #include <sys/types.h> | |
| 67 #endif | |
| 68 | |
| 69 #include "dispextern.h" | |
| 70 | |
| 9572 | 71 #ifdef HAVE_X_WINDOWS |
| 51404 | 72 /* Defining HAVE_MULTILINGUAL_MENU would mean that the toolkit menu |
| 73 code accepts the Emacs internal encoding. */ | |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
74 #undef HAVE_MULTILINGUAL_MENU |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
75 #ifdef USE_X_TOOLKIT |
|
36958
0b580e75db8c
Include widget.h only if USE_X_TOOLKIT is defined.
Eli Zaretskii <eliz@gnu.org>
parents:
36938
diff
changeset
|
76 #include "widget.h" |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
77 #include <X11/Xlib.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
78 #include <X11/IntrinsicP.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
79 #include <X11/CoreP.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
80 #include <X11/StringDefs.h> |
|
8414
8a8d2cdd4218
(xmenu_show): Ignore any geometry resource from the user.
Richard M. Stallman <rms@gnu.org>
parents:
8269
diff
changeset
|
81 #include <X11/Shell.h> |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
82 #ifdef USE_LUCID |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
83 #include <X11/Xaw/Paned.h> |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
84 #endif /* USE_LUCID */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
85 #include "../lwlib/lwlib.h" |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
86 #else /* not USE_X_TOOLKIT */ |
| 49322 | 87 #ifndef USE_GTK |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
88 #include "../oldXMenu/XMenu.h" |
| 49322 | 89 #endif |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
90 #endif /* not USE_X_TOOLKIT */ |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
91 #endif /* HAVE_X_WINDOWS */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
92 |
| 118 | 93 #ifndef TRUE |
| 94 #define TRUE 1 | |
| 95 #define FALSE 0 | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
96 #endif /* no TRUE */ |
| 118 | 97 |
|
16656
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
98 Lisp_Object Vmenu_updating_frame; |
|
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
99 |
|
12625
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
100 Lisp_Object Qdebug_on_next_call; |
|
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
101 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
102 extern Lisp_Object Qmenu_bar; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
103 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
104 extern Lisp_Object QCtoggle, QCradio; |
|
12298
7c4b729e4b21
(menu_item_equiv_key): Do reconsider a command that had
Richard M. Stallman <rms@gnu.org>
parents:
12196
diff
changeset
|
105 |
| 12661 | 106 extern Lisp_Object Voverriding_local_map; |
| 107 extern Lisp_Object Voverriding_local_map_menu_flag; | |
| 108 | |
| 109 extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; | |
| 110 | |
| 111 extern Lisp_Object Qmenu_bar_update_hook; | |
| 112 | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
113 #ifdef USE_X_TOOLKIT |
|
57814
1f473607c4a9
* xmenu.c: Add prototypes for forward function declarations.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56959
diff
changeset
|
114 extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
115 extern XtAppContext Xt_app_con; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
116 |
|
57814
1f473607c4a9
* xmenu.c: Add prototypes for forward function declarations.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56959
diff
changeset
|
117 static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **)); |
|
1f473607c4a9
* xmenu.c: Add prototypes for forward function declarations.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56959
diff
changeset
|
118 static void popup_get_selection P_ ((XEvent *, struct x_display_info *, |
|
59156
03a6e350cf4d
(popup_get_selection): Remove parameter down_on_keypress.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59155
diff
changeset
|
119 LWLIB_ID, int)); |
| 24993 | 120 |
|
40239
5fda2888718a
Spell the name of Emacs properly (GNU Emacs instead of gnuemacs).
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
121 /* Define HAVE_BOXES if menus can handle radio and toggle buttons. */ |
| 24993 | 122 |
| 123 #define HAVE_BOXES 1 | |
| 49322 | 124 #endif /* USE_X_TOOLKIT */ |
| 125 | |
| 126 #ifdef USE_GTK | |
| 127 #include "gtkutil.h" | |
| 128 #define HAVE_BOXES 1 | |
|
57814
1f473607c4a9
* xmenu.c: Add prototypes for forward function declarations.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56959
diff
changeset
|
129 extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); |
|
1f473607c4a9
* xmenu.c: Add prototypes for forward function declarations.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56959
diff
changeset
|
130 static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **)); |
| 24993 | 131 #endif |
| 132 | |
| 51404 | 133 /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU |
| 134 isn't defined. The use of HAVE_MULTILINGUAL_MENU could probably be | |
| 135 confined to an extended version of this with sections of code below | |
| 136 using it unconditionally. */ | |
| 137 #ifdef USE_GTK | |
| 138 /* gtk just uses utf-8. */ | |
| 139 # define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str) | |
|
60658
2b7e54e81973
(ENCODE_MENU_STRING) [HAVE_X_I18N]: Use ENCODE_SYSTEM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60583
diff
changeset
|
140 #elif defined HAVE_X_I18N |
|
2b7e54e81973
(ENCODE_MENU_STRING) [HAVE_X_I18N]: Use ENCODE_SYSTEM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60583
diff
changeset
|
141 # define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str) |
| 51404 | 142 #else |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
143 # define ENCODE_MENU_STRING(str) string_make_unibyte (str) |
| 51404 | 144 #endif |
| 145 | |
| 24993 | 146 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |
| 147 Lisp_Object, Lisp_Object, Lisp_Object, | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
148 Lisp_Object, Lisp_Object)); |
| 36933 | 149 static int update_frame_menubar P_ ((struct frame *)); |
| 150 static Lisp_Object xmenu_show P_ ((struct frame *, int, int, int, int, | |
| 151 Lisp_Object, char **)); | |
| 152 static void keymap_panes P_ ((Lisp_Object *, int, int)); | |
| 153 static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object, | |
| 154 int, int)); | |
| 155 static void list_of_panes P_ ((Lisp_Object)); | |
| 156 static void list_of_items P_ ((Lisp_Object)); | |
|
48912
b0b74923fe41
(popup_get_selection): Now static. New arg DO_TIMERS.
Richard M. Stallman <rms@gnu.org>
parents:
48329
diff
changeset
|
157 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
158 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
159 /* This holds a Lisp vector that holds the results of decoding |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
160 the keymaps or alist-of-alists that specify a menu. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
161 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
162 It describes the panes and items within the panes. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
163 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
164 Each pane is described by 3 elements in the vector: |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
165 t, the pane name, the pane's prefix key. |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
166 Then follow the pane's items, with 5 elements per item: |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
167 the item string, the enable flag, the item's value, |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
168 the definition, and the equivalent keyboard key's description string. |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
169 |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
170 In some cases, multiple levels of menus may be described. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
171 A single vector slot containing nil indicates the start of a submenu. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
172 A single vector slot containing lambda indicates the end of a submenu. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
173 The submenu follows a menu item which is the way to reach the submenu. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
174 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
175 A single vector slot containing quote indicates that the |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
176 following items should appear on the right of a dialog box. |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
177 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
178 Using a Lisp vector to hold this information while we decode it |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
179 takes care of protecting all the data from GC. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
180 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
181 #define MENU_ITEMS_PANE_NAME 1 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
182 #define MENU_ITEMS_PANE_PREFIX 2 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
183 #define MENU_ITEMS_PANE_LENGTH 3 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
184 |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
185 enum menu_item_idx |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
186 { |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
187 MENU_ITEMS_ITEM_NAME = 0, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
188 MENU_ITEMS_ITEM_ENABLE, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
189 MENU_ITEMS_ITEM_VALUE, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
190 MENU_ITEMS_ITEM_EQUIV_KEY, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
191 MENU_ITEMS_ITEM_DEFINITION, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
192 MENU_ITEMS_ITEM_TYPE, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
193 MENU_ITEMS_ITEM_SELECTED, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
194 MENU_ITEMS_ITEM_HELP, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
195 MENU_ITEMS_ITEM_LENGTH |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
196 }; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
197 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
198 static Lisp_Object menu_items; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
199 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
200 /* If non-nil, means that the global vars defined here are already in use. |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
201 Used to detect cases where we try to re-enter this non-reentrant code. */ |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
202 static Lisp_Object menu_items_inuse; |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
203 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
204 /* Number of slots currently allocated in menu_items. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
205 static int menu_items_allocated; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
206 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
207 /* This is the index in menu_items of the first empty slot. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
208 static int menu_items_used; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
209 |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
210 /* The number of panes currently recorded in menu_items, |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
211 excluding those within submenus. */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
212 static int menu_items_n_panes; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
213 |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
214 /* Current depth within submenus. */ |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
215 static int menu_items_submenu_depth; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
216 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
217 /* Flag which when set indicates a dialog or menu has been posted by |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
218 Xt on behalf of one of the widget sets. */ |
| 49322 | 219 static int popup_activated_flag; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
220 |
| 12661 | 221 static int next_menubar_widget_id; |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
222 |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
223 /* This is set nonzero after the user activates the menu bar, and set |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
224 to zero again after the menu bars are redisplayed by prepare_menu_bar. |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
225 While it is nonzero, all calls to set_frame_menubar go deep. |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
226 |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
227 I don't understand why this is needed, but it does seem to be |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
228 needed on Motif, according to Marcus Daniels <marcus@sysc.pdx.edu>. */ |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
229 |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
230 int pending_menu_activation; |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
231 |
| 12661 | 232 #ifdef USE_X_TOOLKIT |
| 233 | |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
234 /* Return the frame whose ->output_data.x->id equals ID, or 0 if none. */ |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
235 |
| 12661 | 236 static struct frame * |
| 237 menubar_id_to_frame (id) | |
| 238 LWLIB_ID id; | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
239 { |
| 12661 | 240 Lisp_Object tail, frame; |
| 241 FRAME_PTR f; | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
242 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
243 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
244 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
245 frame = XCAR (tail); |
| 12661 | 246 if (!GC_FRAMEP (frame)) |
| 247 continue; | |
| 248 f = XFRAME (frame); | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26088
diff
changeset
|
249 if (!FRAME_WINDOW_P (f)) |
| 12661 | 250 continue; |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
251 if (f->output_data.x->id == id) |
| 12661 | 252 return f; |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
253 } |
| 12661 | 254 return 0; |
| 255 } | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
256 |
| 12661 | 257 #endif |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
258 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
259 /* Initialize the menu_items structure if we haven't already done so. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
260 Also mark it as currently empty. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
261 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
262 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
263 init_menu_items () |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
264 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
265 if (NILP (menu_items)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
266 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
267 menu_items_allocated = 60; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
268 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
269 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
270 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
271 if (!NILP (menu_items_inuse)) |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
272 error ("Trying to use a menu from within a menu-entry"); |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
273 menu_items_inuse = Qt; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
274 menu_items_used = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
275 menu_items_n_panes = 0; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
276 menu_items_submenu_depth = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
277 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
278 |
|
41769
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
279 /* Call at the end of generating the data in menu_items. */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
280 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
281 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
282 finish_menu_items () |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
283 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
284 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
285 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
286 static Lisp_Object |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
287 unuse_menu_items (dummy) |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
288 Lisp_Object dummy; |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
289 { |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
290 return menu_items_inuse = Qnil; |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
291 } |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
292 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
293 /* Call when finished using the data for the current menu |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
294 in menu_items. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
295 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
296 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
297 discard_menu_items () |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
298 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
299 /* Free the structure if it is especially large. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
300 Otherwise, hold on to it, to save time. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
301 if (menu_items_allocated > 200) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
302 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
303 menu_items = Qnil; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
304 menu_items_allocated = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
305 } |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
306 xassert (NILP (menu_items_inuse)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
307 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
308 |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
309 /* Make the menu_items vector twice as large. */ |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
310 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
311 static void |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
312 grow_menu_items () |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
313 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
314 Lisp_Object old; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
315 int old_size = menu_items_allocated; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
316 old = menu_items; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
317 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
318 menu_items_allocated *= 2; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
319 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
320 bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents, |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
321 old_size * sizeof (Lisp_Object)); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
322 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
323 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
324 /* Begin a submenu. */ |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
325 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
326 static void |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
327 push_submenu_start () |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
328 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
329 if (menu_items_used + 1 > menu_items_allocated) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
330 grow_menu_items (); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
331 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
332 XVECTOR (menu_items)->contents[menu_items_used++] = Qnil; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
333 menu_items_submenu_depth++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
334 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
335 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
336 /* End a submenu. */ |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
337 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
338 static void |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
339 push_submenu_end () |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
340 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
341 if (menu_items_used + 1 > menu_items_allocated) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
342 grow_menu_items (); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
343 |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
344 XVECTOR (menu_items)->contents[menu_items_used++] = Qlambda; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
345 menu_items_submenu_depth--; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
346 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
347 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
348 /* Indicate boundary between left and right. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
349 |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
350 static void |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
351 push_left_right_boundary () |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
352 { |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
353 if (menu_items_used + 1 > menu_items_allocated) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
354 grow_menu_items (); |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
355 |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
356 XVECTOR (menu_items)->contents[menu_items_used++] = Qquote; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
357 } |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
358 |
|
40239
5fda2888718a
Spell the name of Emacs properly (GNU Emacs instead of gnuemacs).
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
359 /* Start a new menu pane in menu_items. |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
360 NAME is the pane name. PREFIX_VEC is a prefix key for this pane. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
361 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
362 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
363 push_menu_pane (name, prefix_vec) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
364 Lisp_Object name, prefix_vec; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
365 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
366 if (menu_items_used + MENU_ITEMS_PANE_LENGTH > menu_items_allocated) |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
367 grow_menu_items (); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
368 |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
369 if (menu_items_submenu_depth == 0) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
370 menu_items_n_panes++; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
371 XVECTOR (menu_items)->contents[menu_items_used++] = Qt; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
372 XVECTOR (menu_items)->contents[menu_items_used++] = name; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
373 XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
374 } |
| 118 | 375 |
| 24993 | 376 /* Push one menu item into the current pane. NAME is the string to |
| 377 display. ENABLE if non-nil means this item can be selected. KEY | |
| 378 is the key generated by choosing this item, or nil if this item | |
| 379 doesn't really have a definition. DEF is the definition of this | |
| 380 item. EQUIV is the textual description of the keyboard equivalent | |
| 381 for this item (or nil if none). TYPE is the type of this menu | |
| 382 item, one of nil, `toggle' or `radio'. */ | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
383 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
384 static void |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
385 push_menu_item (name, enable, key, def, equiv, type, selected, help) |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
386 Lisp_Object name, enable, key, def, equiv, type, selected, help; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
387 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
388 if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated) |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
389 grow_menu_items (); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
390 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
391 XVECTOR (menu_items)->contents[menu_items_used++] = name; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
392 XVECTOR (menu_items)->contents[menu_items_used++] = enable; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
393 XVECTOR (menu_items)->contents[menu_items_used++] = key; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
394 XVECTOR (menu_items)->contents[menu_items_used++] = equiv; |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
395 XVECTOR (menu_items)->contents[menu_items_used++] = def; |
| 24993 | 396 XVECTOR (menu_items)->contents[menu_items_used++] = type; |
| 397 XVECTOR (menu_items)->contents[menu_items_used++] = selected; | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
398 XVECTOR (menu_items)->contents[menu_items_used++] = help; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
399 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
400 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
401 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long, |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
402 and generate menu panes for them in menu_items. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
403 If NOTREAL is nonzero, |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
404 don't bother really computing whether an item is enabled. */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
405 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
406 static void |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
407 keymap_panes (keymaps, nmaps, notreal) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
408 Lisp_Object *keymaps; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
409 int nmaps; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
410 int notreal; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
411 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
412 int mapno; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
413 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
414 init_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
415 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
416 /* Loop over the given keymaps, making a pane for each map. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
417 But don't make a pane that is empty--ignore that map instead. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
418 P is the number of panes we have made so far. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
419 for (mapno = 0; mapno < nmaps; mapno++) |
|
30420
3ed29d254c6c
(keymap_panes): Pass the keymap's prompt as the pane
Eli Zaretskii <eliz@gnu.org>
parents:
30363
diff
changeset
|
420 single_keymap_panes (keymaps[mapno], |
|
39690
38c1890338cc
(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
421 Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
422 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
423 finish_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
424 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
425 |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
426 /* Args passed between single_keymap_panes and single_menu_item. */ |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
427 struct skp |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
428 { |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
429 Lisp_Object pending_maps; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
430 int maxdepth, notreal; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
431 int notbuttons; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
432 }; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
433 |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
434 static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |
|
50938
20b3d6c3c7e5
(single_menu_item): Change last parameter to void* to
Andreas Schwab <schwab@suse.de>
parents:
50803
diff
changeset
|
435 void *)); |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
436 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
437 /* This is a recursive subroutine of keymap_panes. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
438 It handles one keymap, KEYMAP. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
439 The other arguments are passed along |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
440 or point to local variables of the previous function. |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
441 If NOTREAL is nonzero, only check for equivalent key bindings, don't |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
442 evaluate expressions in menu items and don't make any menu. |
|
16752
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
443 |
|
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
444 If we encounter submenus deeper than MAXDEPTH levels, ignore them. */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
445 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
446 static void |
|
16752
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
447 single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
448 Lisp_Object keymap; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
449 Lisp_Object pane_name; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
450 Lisp_Object prefix; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
451 int notreal; |
|
16752
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
452 int maxdepth; |
| 118 | 453 { |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
454 struct skp skp; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
455 struct gcpro gcpro1; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
456 |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
457 skp.pending_maps = Qnil; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
458 skp.maxdepth = maxdepth; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
459 skp.notreal = notreal; |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
460 skp.notbuttons = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
461 |
|
16752
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
462 if (maxdepth <= 0) |
|
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
463 return; |
|
6409ef81a2a8
(single_keymap_panes): New arg DEPTH.
Richard M. Stallman <rms@gnu.org>
parents:
16729
diff
changeset
|
464 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
465 push_menu_pane (pane_name, prefix); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
466 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
467 #ifndef HAVE_BOXES |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
468 /* Remember index for first item in this pane so we can go back and |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
469 add a prefix when (if) we see the first button. After that, notbuttons |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
470 is set to 0, to mark that we have seen a button and all non button |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
471 items need a prefix. */ |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
472 skp.notbuttons = menu_items_used; |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
473 #endif |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
474 |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
475 GCPRO1 (skp.pending_maps); |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
476 map_keymap (keymap, single_menu_item, Qnil, &skp, 1); |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
477 UNGCPRO; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
478 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
479 /* Process now any submenus which want to be panes at this level. */ |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
480 while (CONSP (skp.pending_maps)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
481 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
482 Lisp_Object elt, eltcdr, string; |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
483 elt = XCAR (skp.pending_maps); |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
484 eltcdr = XCDR (elt); |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
485 string = XCAR (eltcdr); |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
486 /* We no longer discard the @ from the beginning of the string here. |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
487 Instead, we do this in xmenu_show. */ |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
488 single_keymap_panes (Fcar (elt), string, |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
489 XCDR (eltcdr), notreal, maxdepth - 1); |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
490 skp.pending_maps = XCDR (skp.pending_maps); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
491 } |
| 118 | 492 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
493 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
494 /* This is a subroutine of single_keymap_panes that handles one |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
495 keymap entry. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
496 KEY is a key in a keymap and ITEM is its binding. |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
497 SKP->PENDING_MAPS_PTR is a list of keymaps waiting to be made into |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
498 separate panes. |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
499 If SKP->NOTREAL is nonzero, only check for equivalent key bindings, don't |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
500 evaluate expressions in menu items and don't make any menu. |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
501 If we encounter submenus deeper than SKP->MAXDEPTH levels, ignore them. |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
502 SKP->NOTBUTTONS is only used when simulating toggle boxes and radio |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
503 buttons. It keeps track of if we have seen a button in this menu or |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
504 not. */ |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
505 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
506 static void |
|
50938
20b3d6c3c7e5
(single_menu_item): Change last parameter to void* to
Andreas Schwab <schwab@suse.de>
parents:
50803
diff
changeset
|
507 single_menu_item (key, item, dummy, skp_v) |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
508 Lisp_Object key, item, dummy; |
|
50938
20b3d6c3c7e5
(single_menu_item): Change last parameter to void* to
Andreas Schwab <schwab@suse.de>
parents:
50803
diff
changeset
|
509 void *skp_v; |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
510 { |
|
25730
db88a4b84d91
(single_menu_item, Fx_popup_menu, Fx_popup_menu,
Gerd Moellmann <gerd@gnu.org>
parents:
25680
diff
changeset
|
511 Lisp_Object map, item_string, enabled; |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
512 struct gcpro gcpro1, gcpro2; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
513 int res; |
|
50938
20b3d6c3c7e5
(single_menu_item): Change last parameter to void* to
Andreas Schwab <schwab@suse.de>
parents:
50803
diff
changeset
|
514 struct skp *skp = skp_v; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
515 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
516 /* Parse the menu item and leave the result in item_properties. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
517 GCPRO2 (key, item); |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
518 res = parse_menu_item (item, skp->notreal, 0); |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
519 UNGCPRO; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
520 if (!res) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
521 return; /* Not a menu item. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
522 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
523 map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP]; |
| 58171 | 524 |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
525 if (skp->notreal) |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
526 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
527 /* We don't want to make a menu, just traverse the keymaps to |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
528 precompute equivalent key bindings. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
529 if (!NILP (map)) |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
530 single_keymap_panes (map, Qnil, key, 1, skp->maxdepth - 1); |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
531 return; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
532 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
533 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
534 enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
535 item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
536 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
537 if (!NILP (map) && SREF (item_string, 0) == '@') |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
538 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
539 if (!NILP (enabled)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
540 /* An enabled separate pane. Remember this to handle it later. */ |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
541 skp->pending_maps = Fcons (Fcons (map, Fcons (item_string, key)), |
|
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
542 skp->pending_maps); |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
543 return; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
544 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
545 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
546 #ifndef HAVE_BOXES |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
547 /* Simulate radio buttons and toggle boxes by putting a prefix in |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
548 front of them. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
549 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
550 Lisp_Object prefix = Qnil; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
551 Lisp_Object type = XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
552 if (!NILP (type)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
553 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
554 Lisp_Object selected |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
555 = XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
556 |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
557 if (skp->notbuttons) |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
558 /* The first button. Line up previous items in this menu. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
559 { |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
560 int index = skp->notbuttons; /* Index for first item this menu. */ |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
561 int submenu = 0; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
562 Lisp_Object tem; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
563 while (index < menu_items_used) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
564 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
565 tem |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
566 = XVECTOR (menu_items)->contents[index + MENU_ITEMS_ITEM_NAME]; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
567 if (NILP (tem)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
568 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
569 index++; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
570 submenu++; /* Skip sub menu. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
571 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
572 else if (EQ (tem, Qlambda)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
573 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
574 index++; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
575 submenu--; /* End sub menu. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
576 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
577 else if (EQ (tem, Qt)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
578 index += 3; /* Skip new pane marker. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
579 else if (EQ (tem, Qquote)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
580 index++; /* Skip a left, right divider. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
581 else |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
582 { |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
583 if (!submenu && SREF (tem, 0) != '\0' |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
584 && SREF (tem, 0) != '-') |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
585 XVECTOR (menu_items)->contents[index + MENU_ITEMS_ITEM_NAME] |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
586 = concat2 (build_string (" "), tem); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
587 index += MENU_ITEMS_ITEM_LENGTH; |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
588 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
589 } |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
590 skp->notbuttons = 0; |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
591 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
592 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
593 /* Calculate prefix, if any, for this item. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
594 if (EQ (type, QCtoggle)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
595 prefix = build_string (NILP (selected) ? "[ ] " : "[X] "); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
596 else if (EQ (type, QCradio)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
597 prefix = build_string (NILP (selected) ? "( ) " : "(*) "); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
598 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
599 /* Not a button. If we have earlier buttons, then we need a prefix. */ |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
600 else if (!skp->notbuttons && SREF (item_string, 0) != '\0' |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
601 && SREF (item_string, 0) != '-') |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
602 prefix = build_string (" "); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
603 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
604 if (!NILP (prefix)) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
605 item_string = concat2 (prefix, item_string); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
606 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
607 #endif /* not HAVE_BOXES */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
608 |
| 49322 | 609 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
610 if (!NILP (map)) |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
611 /* Indicate visually that this is a submenu. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
612 item_string = concat2 (item_string, build_string (" >")); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
613 #endif |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
614 |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
615 push_menu_item (item_string, enabled, key, |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
616 XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF], |
| 24993 | 617 XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ], |
| 618 XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE], | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
619 XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED], |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
620 XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]); |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
621 |
| 49322 | 622 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
623 /* Display a submenu using the toolkit. */ |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
624 if (! (NILP (map) || NILP (enabled))) |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
625 { |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
626 push_submenu_start (); |
|
50803
140fa7af01db
(struct skp): New struct, to pass args through map_keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49651
diff
changeset
|
627 single_keymap_panes (map, Qnil, key, 0, skp->maxdepth - 1); |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
628 push_submenu_end (); |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
629 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
630 #endif |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
631 } |
|
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
632 |
| 14036 | 633 /* Push all the panes and items of a menu described by the |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
634 alist-of-alists MENU. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
635 This handles old-fashioned calls to x-popup-menu. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
636 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
637 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
638 list_of_panes (menu) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
639 Lisp_Object menu; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
640 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
641 Lisp_Object tail; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
642 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
643 init_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
644 |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
645 for (tail = menu; CONSP (tail); tail = XCDR (tail)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
646 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
647 Lisp_Object elt, pane_name, pane_data; |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
648 elt = XCAR (tail); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
649 pane_name = Fcar (elt); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
650 CHECK_STRING (pane_name); |
| 51404 | 651 push_menu_pane (ENCODE_MENU_STRING (pane_name), Qnil); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
652 pane_data = Fcdr (elt); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
653 CHECK_CONS (pane_data); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
654 list_of_items (pane_data); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
655 } |
| 118 | 656 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
657 finish_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
658 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
659 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
660 /* Push the items in a single pane defined by the alist PANE. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
661 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
662 static void |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
663 list_of_items (pane) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
664 Lisp_Object pane; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
665 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
666 Lisp_Object tail, item, item1; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
667 |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
668 for (tail = pane; CONSP (tail); tail = XCDR (tail)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
669 { |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
670 item = XCAR (tail); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
671 if (STRINGP (item)) |
| 51404 | 672 push_menu_item (ENCODE_MENU_STRING (item), Qnil, Qnil, Qt, |
| 673 Qnil, Qnil, Qnil, Qnil); | |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
674 else if (CONSP (item)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
675 { |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
676 item1 = XCAR (item); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
677 CHECK_STRING (item1); |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
678 push_menu_item (ENCODE_MENU_STRING (item1), Qt, XCDR (item), |
| 51404 | 679 Qt, Qnil, Qnil, Qnil, Qnil); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
680 } |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
681 else |
|
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
682 push_left_right_boundary (); |
|
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
683 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
684 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
685 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
686 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
687 #ifdef HAVE_X_WINDOWS |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
688 /* Return the mouse position in *X and *Y. The coordinates are window |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
689 relative for the edit window in frame F. |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
690 This is for Fx_popup_menu. The mouse_position_hook can not |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
691 be used for X, as it returns window relative coordinates |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
692 for the window where the mouse is in. This could be the menu bar, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
693 the scroll bar or the edit window. Fx_popup_menu needs to be |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
694 sure it is the edit window. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
695 static void |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
696 mouse_position_for_popup (f, x, y) |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
697 FRAME_PTR f; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
698 int *x; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
699 int *y; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
700 { |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
701 Window root, dummy_window; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
702 int dummy; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
703 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
704 BLOCK_INPUT; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
705 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
706 XQueryPointer (FRAME_X_DISPLAY (f), |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
707 DefaultRootWindow (FRAME_X_DISPLAY (f)), |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
708 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
709 /* The root window which contains the pointer. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
710 &root, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
711 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
712 /* Window pointer is on, not used */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
713 &dummy_window, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
714 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
715 /* The position on that root window. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
716 x, y, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
717 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
718 /* x/y in dummy_window coordinates, not used. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
719 &dummy, &dummy, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
720 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
721 /* Modifier keys and pointer buttons, about which |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
722 we don't care. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
723 (unsigned int *) &dummy); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
724 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
725 UNBLOCK_INPUT; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
726 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
727 /* xmenu_show expects window coordinates, not root window |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
728 coordinates. Translate. */ |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
729 *x -= f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
730 *y -= f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
731 } |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
732 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
733 #endif /* HAVE_X_WINDOWS */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
734 |
|
6424
b3d22929b7c1
(Fx_popup_dialog, Fx_popup_menu): Require 2 args.
Richard M. Stallman <rms@gnu.org>
parents:
6406
diff
changeset
|
735 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, |
| 40993 | 736 doc: /* Pop up a deck-of-cards menu and return user's selection. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
737 POSITION is a position specification. This is either a mouse button event |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
738 or a list ((XOFFSET YOFFSET) WINDOW) |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
739 where XOFFSET and YOFFSET are positions in pixels from the top left |
|
62012
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
740 corner of WINDOW. (WINDOW may be a window or a frame object.) |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
741 This controls the position of the top left of the menu as a whole. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
742 If POSITION is t, it means to use the current mouse position. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
743 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
744 MENU is a specifier for a menu. For the simplest case, MENU is a keymap. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
745 The menu items come from key bindings that have a menu string as well as |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
746 a definition; actually, the "definition" in such a key binding looks like |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
747 \(STRING . REAL-DEFINITION). To give the menu a title, put a string into |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
748 the keymap as a top-level element. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
749 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
750 If REAL-DEFINITION is nil, that puts a nonselectable string in the menu. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
751 Otherwise, REAL-DEFINITION should be a valid key binding definition. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
752 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
753 You can also use a list of keymaps as MENU. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
754 Then each keymap makes a separate pane. |
|
62012
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
755 |
|
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
756 When MENU is a keymap or a list of keymaps, the return value is the |
|
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
757 list of events corresponding to the user's choice. Note that |
|
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
758 `x-popup-menu' does not actually execute the command bound to that |
|
76ffd04afaae
(Fx_popup_menu): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61984
diff
changeset
|
759 sequence of events. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
760 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
761 Alternatively, you can specify a menu of multiple panes |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
762 with a list of the form (TITLE PANE1 PANE2...), |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
763 where each pane is a list of form (TITLE ITEM1 ITEM2...). |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
764 Each ITEM is normally a cons cell (STRING . VALUE); |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
765 but a string can appear as an item--that makes a nonselectable line |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
766 in the menu. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
767 With this form of menu, the return value is VALUE from the chosen item. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
768 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
769 If POSITION is nil, don't display the menu at all, just precalculate the |
|
62090
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
770 cached information about equivalent key sequences. |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
771 |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
772 If the user gets rid of the menu without making a valid choice, for |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
773 instance by clicking the mouse away from a valid choice or by typing |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
774 keyboard input, then this normally results in a quit and |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
775 `x-popup-menu' does not return. But if POSITION is a mouse button |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
776 event (indicating that the user invoked the menu with the mouse) then |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
777 no quit occurs and `x-popup-menu' returns nil. */) |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
778 (position, menu) |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
779 Lisp_Object position, menu; |
| 118 | 780 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
781 Lisp_Object keymap, tem; |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31465
diff
changeset
|
782 int xpos = 0, ypos = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
783 Lisp_Object title; |
|
61620
8449711f0c1c
(Fx_popup_menu): Initialize error_name to NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
61619
diff
changeset
|
784 char *error_name = NULL; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
785 Lisp_Object selection; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
786 FRAME_PTR f = NULL; |
| 118 | 787 Lisp_Object x, y, window; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
788 int keymaps = 0; |
|
10757
2829c9840b0e
(xmenu_show, both versions): New arg for_click.
Richard M. Stallman <rms@gnu.org>
parents:
10716
diff
changeset
|
789 int for_click = 0; |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
790 int specpdl_count = SPECPDL_INDEX (); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
791 struct gcpro gcpro1; |
| 118 | 792 |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
793 #ifdef HAVE_MENUS |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
794 if (! NILP (position)) |
|
2147
1b6e54507323
(Fx_popup_menu): Allow a frame instead of a window, in arg.
Richard M. Stallman <rms@gnu.org>
parents:
2135
diff
changeset
|
795 { |
| 49322 | 796 int get_current_pos_p = 0; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
797 check_x (); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
798 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
799 /* Decode the first argument: find the window and the coordinates. */ |
|
11614
fdd0d5bdd8c6
(popup_get_selection): Use x_non_menubar_window_to_frame.
Karl Heuer <kwzh@gnu.org>
parents:
11528
diff
changeset
|
800 if (EQ (position, Qt) |
|
32179
15fe3fd7b8fc
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
Dave Love <fx@gnu.org>
parents:
31829
diff
changeset
|
801 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) |
|
15fe3fd7b8fc
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
Dave Love <fx@gnu.org>
parents:
31829
diff
changeset
|
802 || EQ (XCAR (position), Qtool_bar)))) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
803 { |
| 49322 | 804 get_current_pos_p = 1; |
| 805 } | |
| 806 else | |
| 807 { | |
| 808 tem = Fcar (position); | |
| 809 if (CONSP (tem)) | |
| 810 { | |
| 811 window = Fcar (Fcdr (position)); | |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
812 x = XCAR (tem); |
|
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
813 y = Fcar (XCDR (tem)); |
| 49322 | 814 } |
| 815 else | |
| 816 { | |
| 817 for_click = 1; | |
| 818 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ | |
| 819 window = Fcar (tem); /* POSN_WINDOW (tem) */ | |
| 820 tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */ | |
| 821 x = Fcar (tem); | |
| 822 y = Fcdr (tem); | |
| 823 } | |
| 824 | |
| 825 /* If a click happens in an external tool bar or a detached | |
| 826 tool bar, x and y is NIL. In that case, use the current | |
| 827 mouse position. This happens for the help button in the | |
| 828 tool bar. Ideally popup-menu should pass NIL to | |
| 829 this function, but it doesn't. */ | |
| 830 if (NILP (x) && NILP (y)) | |
| 831 get_current_pos_p = 1; | |
| 832 } | |
| 833 | |
| 834 if (get_current_pos_p) | |
| 835 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
836 /* Use the mouse's current position. */ |
|
25680
841eb01263ef
(Fx_popup_menu): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
837 FRAME_PTR new_f = SELECTED_FRAME (); |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
838 #ifdef HAVE_X_WINDOWS |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
839 /* Can't use mouse_position_hook for X since it returns |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
840 coordinates relative to the window the mouse is in, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
841 we need coordinates relative to the edit widget always. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
842 if (new_f != 0) |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
843 { |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
844 int cur_x, cur_y; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
845 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
846 mouse_position_for_popup (new_f, &cur_x, &cur_y); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
847 /* cur_x/y may be negative, so use make_number. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
848 x = make_number (cur_x); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
849 y = make_number (cur_y); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
850 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
851 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
852 #else /* not HAVE_X_WINDOWS */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
853 Lisp_Object bar_window; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
854 enum scroll_bar_part part; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
855 unsigned long time; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
856 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
857 if (mouse_position_hook) |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
858 (*mouse_position_hook) (&new_f, 1, &bar_window, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
859 &part, &x, &y, &time); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
860 #endif /* not HAVE_X_WINDOWS */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
861 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
862 if (new_f != 0) |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
863 XSETFRAME (window, new_f); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
864 else |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
865 { |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
866 window = selected_window; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
867 XSETFASTINT (x, 0); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
868 XSETFASTINT (y, 0); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
869 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
870 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
871 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
872 CHECK_NUMBER (x); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
873 CHECK_NUMBER (y); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
874 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
875 /* Decode where to put the menu. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
876 |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
877 if (FRAMEP (window)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
878 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
879 f = XFRAME (window); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
880 xpos = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
881 ypos = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
882 } |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
883 else if (WINDOWP (window)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
884 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
885 CHECK_LIVE_WINDOW (window); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
886 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
887 |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
888 xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window)); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
889 ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
890 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
891 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
892 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
893 but I don't want to make one now. */ |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
894 CHECK_WINDOW (window); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
895 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
896 xpos += XINT (x); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
897 ypos += XINT (y); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
898 } |
|
16656
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
899 Vmenu_updating_frame = Qnil; |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
900 #endif /* HAVE_MENUS */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
901 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
902 record_unwind_protect (unuse_menu_items, Qnil); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
903 title = Qnil; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
904 GCPRO1 (title); |
|
4627
340c18d50337
(Fx_popup_menu): Adjust coords so they are relative to the inner window.
Richard M. Stallman <rms@gnu.org>
parents:
3747
diff
changeset
|
905 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
906 /* Decode the menu items from what was specified. */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
907 |
|
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32179
diff
changeset
|
908 keymap = get_keymap (menu, 0, 0); |
|
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32179
diff
changeset
|
909 if (CONSP (keymap)) |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
910 { |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
911 /* We were given a keymap. Extract menu info from the keymap. */ |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
912 Lisp_Object prompt; |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
913 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
914 /* Extract the detailed info to make one pane. */ |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
915 keymap_panes (&menu, 1, NILP (position)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
916 |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
917 /* Search for a string appearing directly as an element of the keymap. |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
918 That string is the title of the menu. */ |
|
39690
38c1890338cc
(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
919 prompt = Fkeymap_prompt (keymap); |
|
16411
939831bf2103
(Fx_popup_menu): Give the menu a title when the menu is a single keymap.
Richard M. Stallman <rms@gnu.org>
parents:
15943
diff
changeset
|
920 if (NILP (title) && !NILP (prompt)) |
|
939831bf2103
(Fx_popup_menu): Give the menu a title when the menu is a single keymap.
Richard M. Stallman <rms@gnu.org>
parents:
15943
diff
changeset
|
921 title = prompt; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
922 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
923 /* Make that be the pane title of the first pane. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
924 if (!NILP (prompt) && menu_items_n_panes >= 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
925 XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
926 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
927 keymaps = 1; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
928 } |
|
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32179
diff
changeset
|
929 else if (CONSP (menu) && KEYMAPP (XCAR (menu))) |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
930 { |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
931 /* We were given a list of keymaps. */ |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
932 int nmaps = XFASTINT (Flength (menu)); |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
933 Lisp_Object *maps |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
934 = (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object)); |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
935 int i; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
936 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
937 title = Qnil; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
938 |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
939 /* The first keymap that has a prompt string |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
940 supplies the menu title. */ |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
941 for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem)) |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
942 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
943 Lisp_Object prompt; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
944 |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
945 maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0); |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
946 |
|
39690
38c1890338cc
(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
947 prompt = Fkeymap_prompt (keymap); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
948 if (NILP (title) && !NILP (prompt)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
949 title = prompt; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
950 } |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
951 |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
952 /* Extract the detailed info to make one pane. */ |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
953 keymap_panes (maps, nmaps, NILP (position)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
954 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
955 /* Make the title be the pane title of the first pane. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
956 if (!NILP (title) && menu_items_n_panes >= 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
957 XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
958 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
959 keymaps = 1; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
960 } |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
961 else |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
962 { |
|
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
963 /* We were given an old-fashioned menu. */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
964 title = Fcar (menu); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
965 CHECK_STRING (title); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
966 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
967 list_of_panes (Fcdr (menu)); |
|
1828
1463592a6463
* xmenu.c (Fx_popup_menu): Don't forget to turn the frame-relative
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
968 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
969 keymaps = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
970 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
971 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
972 unbind_to (specpdl_count, Qnil); |
|
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
973 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
974 if (NILP (position)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
975 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
976 discard_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
977 UNGCPRO; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
978 return Qnil; |
| 118 | 979 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
980 |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
981 #ifdef HAVE_MENUS |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
982 /* Display them in a menu. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
983 BLOCK_INPUT; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
984 |
|
11491
272baf4a077a
(xmenu_show, xdialog_show): Delete menubarp arg.
Richard M. Stallman <rms@gnu.org>
parents:
11449
diff
changeset
|
985 selection = xmenu_show (f, xpos, ypos, for_click, |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
986 keymaps, title, &error_name); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
987 UNBLOCK_INPUT; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
988 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
989 discard_menu_items (); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
990 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
991 UNGCPRO; |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
992 #endif /* HAVE_MENUS */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
993 |
| 118 | 994 if (error_name) error (error_name); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
995 return selection; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
996 } |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
997 |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
998 #ifdef HAVE_MENUS |
|
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
999 |
|
6424
b3d22929b7c1
(Fx_popup_dialog, Fx_popup_menu): Require 2 args.
Richard M. Stallman <rms@gnu.org>
parents:
6406
diff
changeset
|
1000 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0, |
| 40993 | 1001 doc: /* Pop up a dialog box and return user's selection. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1002 POSITION specifies which frame to use. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1003 This is normally a mouse button event or a window or frame. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1004 If POSITION is t, it means to use the frame the mouse is on. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1005 The dialog box appears in the middle of the specified frame. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1006 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1007 CONTENTS specifies the alternatives to display in the dialog box. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1008 It is a list of the form (TITLE ITEM1 ITEM2...). |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1009 Each ITEM is a cons cell (STRING . VALUE). |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1010 The return value is VALUE from the chosen item. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1011 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1012 An ITEM may also be just a string--that makes a nonselectable item. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1013 An ITEM may also be nil--that means to put all preceding items |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
1014 on the left of the dialog box and all following items on the right. |
|
62090
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
1015 \(By default, approximately half appear on each side.) |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
1016 |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
1017 If the user gets rid of the dialog box without making a valid choice, |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
1018 for instance using the window manager, then this produces a quit and |
|
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
1019 `x-popup-dialog' does not return. */) |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
1020 (position, contents) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1021 Lisp_Object position, contents; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1022 { |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1023 FRAME_PTR f = NULL; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1024 Lisp_Object window; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1025 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1026 check_x (); |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1027 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1028 /* Decode the first argument: find the window or frame to use. */ |
|
11907
0f03ad1cac1e
(Fx_popup_dialog): Treat (menu-bar) like t, for POSITION.
Karl Heuer <kwzh@gnu.org>
parents:
11898
diff
changeset
|
1029 if (EQ (position, Qt) |
|
32179
15fe3fd7b8fc
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
Dave Love <fx@gnu.org>
parents:
31829
diff
changeset
|
1030 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) |
|
15fe3fd7b8fc
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
Dave Love <fx@gnu.org>
parents:
31829
diff
changeset
|
1031 || EQ (XCAR (position), Qtool_bar)))) |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1032 { |
|
6653
14a0a3fe93fd
(Fx_popup_dialog): If POSITION is t, use selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
6625
diff
changeset
|
1033 #if 0 /* Using the frame the mouse is on may not be right. */ |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1034 /* Use the mouse's current position. */ |
|
25680
841eb01263ef
(Fx_popup_menu): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
1035 FRAME_PTR new_f = SELECTED_FRAME (); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1036 Lisp_Object bar_window; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1037 enum scroll_bar_part part; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1038 unsigned long time; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1039 Lisp_Object x, y; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1040 |
|
11125
dc78213dd2b3
(Fx_popup_menu): Pass 1 for `insist' arg.
Richard M. Stallman <rms@gnu.org>
parents:
10835
diff
changeset
|
1041 (*mouse_position_hook) (&new_f, 1, &bar_window, &part, &x, &y, &time); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1042 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1043 if (new_f != 0) |
|
9339
8a59acc95eea
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
Karl Heuer <kwzh@gnu.org>
parents:
9336
diff
changeset
|
1044 XSETFRAME (window, new_f); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1045 else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1046 window = selected_window; |
|
6653
14a0a3fe93fd
(Fx_popup_dialog): If POSITION is t, use selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
6625
diff
changeset
|
1047 #endif |
|
11907
0f03ad1cac1e
(Fx_popup_dialog): Treat (menu-bar) like t, for POSITION.
Karl Heuer <kwzh@gnu.org>
parents:
11898
diff
changeset
|
1048 window = selected_window; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1049 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1050 else if (CONSP (position)) |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1051 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1052 Lisp_Object tem; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1053 tem = Fcar (position); |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
1054 if (CONSP (tem)) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1055 window = Fcar (Fcdr (position)); |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
1056 else |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
1057 { |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1058 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1059 window = Fcar (tem); /* POSN_WINDOW (tem) */ |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1060 } |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1061 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1062 else if (WINDOWP (position) || FRAMEP (position)) |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1063 window = position; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1064 else |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1065 window = Qnil; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1066 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1067 /* Decode where to put the menu. */ |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1068 |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
1069 if (FRAMEP (window)) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1070 f = XFRAME (window); |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
1071 else if (WINDOWP (window)) |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1072 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
1073 CHECK_LIVE_WINDOW (window); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1074 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1075 } |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1076 else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1077 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1078 but I don't want to make one now. */ |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
1079 CHECK_WINDOW (window); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1080 |
| 49322 | 1081 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1082 /* Display a menu with these alternatives |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1083 in the middle of frame F. */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1084 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1085 Lisp_Object x, y, frame, newpos; |
|
9339
8a59acc95eea
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
Karl Heuer <kwzh@gnu.org>
parents:
9336
diff
changeset
|
1086 XSETFRAME (frame, f); |
|
8a59acc95eea
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
Karl Heuer <kwzh@gnu.org>
parents:
9336
diff
changeset
|
1087 XSETINT (x, x_pixel_width (f) / 2); |
|
8a59acc95eea
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
Karl Heuer <kwzh@gnu.org>
parents:
9336
diff
changeset
|
1088 XSETINT (y, x_pixel_height (f) / 2); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1089 newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil)); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1090 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1091 return Fx_popup_menu (newpos, |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1092 Fcons (Fcar (contents), Fcons (contents, Qnil))); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1093 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1094 #else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1095 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1096 Lisp_Object title; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1097 char *error_name; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1098 Lisp_Object selection; |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
1099 int specpdl_count = SPECPDL_INDEX (); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1100 |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1101 /* Decode the dialog items from what was specified. */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1102 title = Fcar (contents); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
1103 CHECK_STRING (title); |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
1104 record_unwind_protect (unuse_menu_items, Qnil); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1105 |
|
53545
ed3e26153ee9
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53325
diff
changeset
|
1106 if (NILP (Fcar (Fcdr (contents)))) |
|
ed3e26153ee9
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53325
diff
changeset
|
1107 /* No buttons specified, add an "Ok" button so users can pop down |
|
ed3e26153ee9
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53325
diff
changeset
|
1108 the dialog. Also, the lesstif/motif version crashes if there are |
|
ed3e26153ee9
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53325
diff
changeset
|
1109 no buttons. */ |
|
ed3e26153ee9
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53325
diff
changeset
|
1110 contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil)); |
| 58171 | 1111 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1112 list_of_panes (Fcons (contents, Qnil)); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1113 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1114 /* Display them in a dialog box. */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1115 BLOCK_INPUT; |
|
11502
7ecd4aa33faa
(Fx_popup_dialog): Don't pass menubarp arg to xdialog_show.
Karl Heuer <kwzh@gnu.org>
parents:
11491
diff
changeset
|
1116 selection = xdialog_show (f, 0, title, &error_name); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1117 UNBLOCK_INPUT; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1118 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
1119 unbind_to (specpdl_count, Qnil); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1120 discard_menu_items (); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1121 |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1122 if (error_name) error (error_name); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1123 return selection; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
1124 } |
|
6325
d6817c9c0413
Undo previous change. Instead:
Richard M. Stallman <rms@gnu.org>
parents:
6324
diff
changeset
|
1125 #endif |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1126 } |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1127 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1128 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1129 #ifndef MSDOS |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1130 |
|
58202
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1131 /* Set menu_items_inuse so no other popup menu or dialog is created. */ |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1132 |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1133 void |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1134 x_menu_set_in_use (in_use) |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1135 int in_use; |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1136 { |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1137 menu_items_inuse = in_use ? Qt : Qnil; |
|
58283
c163562b2d59
* xmenu.c (x_menu_in_use): Removed.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58216
diff
changeset
|
1138 popup_activated_flag = in_use; |
|
58202
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1139 } |
|
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1140 |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1141 /* Wait for an X event to arrive or for a timer to expire. */ |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1142 |
|
58202
54c649507b74
* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58197
diff
changeset
|
1143 void |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1144 x_menu_wait_for_event (void *data) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1145 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1146 extern EMACS_TIME timer_check P_ ((int)); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1147 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1148 /* Another way to do this is to register a timer callback, that can be |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1149 done in GTK and Xt. But we have to do it like this when using only X |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1150 anyway, and with callbacks we would have three variants for timer handling |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1151 instead of the small ifdefs below. */ |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1152 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1153 while ( |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1154 #ifdef USE_X_TOOLKIT |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1155 ! XtAppPending (Xt_app_con) |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1156 #elif defined USE_GTK |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1157 ! gtk_events_pending () |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1158 #else |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1159 ! XPending ((Display*) data) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1160 #endif |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1161 ) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1162 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1163 EMACS_TIME next_time = timer_check (1); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1164 long secs = EMACS_SECS (next_time); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1165 long usecs = EMACS_USECS (next_time); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1166 SELECT_TYPE read_fds; |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1167 struct x_display_info *dpyinfo; |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1168 int n = 0; |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1169 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1170 FD_ZERO (&read_fds); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1171 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1172 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1173 int fd = ConnectionNumber (dpyinfo->display); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1174 FD_SET (fd, &read_fds); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1175 if (fd > n) n = fd; |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1176 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1177 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1178 if (secs < 0 || (secs == 0 && usecs == 0)) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1179 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1180 /* Sometimes timer_check returns -1 (no timers) even if there are |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1181 timers. So do a timeout anyway. */ |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1182 EMACS_SET_SECS (next_time, 1); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1183 EMACS_SET_USECS (next_time, 0); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1184 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1185 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1186 select (n + 1, &read_fds, (SELECT_TYPE *)0, (SELECT_TYPE *)0, &next_time); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1187 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1188 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1189 #endif /* ! MSDOS */ |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1190 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1191 |
| 49322 | 1192 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1193 |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1194 #ifdef USE_X_TOOLKIT |
|
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1195 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1196 /* Loop in Xt until the menu pulldown or dialog popup has been |
| 13821 | 1197 popped down (deactivated). This is used for x-popup-menu |
|
48912
b0b74923fe41
(popup_get_selection): Now static. New arg DO_TIMERS.
Richard M. Stallman <rms@gnu.org>
parents:
48329
diff
changeset
|
1198 and x-popup-dialog; it is not used for the menu bar. |
|
b0b74923fe41
(popup_get_selection): Now static. New arg DO_TIMERS.
Richard M. Stallman <rms@gnu.org>
parents:
48329
diff
changeset
|
1199 |
|
11954
4117d74ba254
(popup_get_selection): Force deactivation if key pressed.
Karl Heuer <kwzh@gnu.org>
parents:
11918
diff
changeset
|
1200 NOTE: All calls to popup_get_selection should be protected |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
1201 with BLOCK_INPUT, UNBLOCK_INPUT wrappers. */ |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1202 |
|
48912
b0b74923fe41
(popup_get_selection): Now static. New arg DO_TIMERS.
Richard M. Stallman <rms@gnu.org>
parents:
48329
diff
changeset
|
1203 static void |
|
59156
03a6e350cf4d
(popup_get_selection): Remove parameter down_on_keypress.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59155
diff
changeset
|
1204 popup_get_selection (initial_event, dpyinfo, id, do_timers) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1205 XEvent *initial_event; |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1206 struct x_display_info *dpyinfo; |
|
11954
4117d74ba254
(popup_get_selection): Force deactivation if key pressed.
Karl Heuer <kwzh@gnu.org>
parents:
11918
diff
changeset
|
1207 LWLIB_ID id; |
|
57965
9b14127a651a
* eval.c (Feval): Remove check for INPUT_BLOCKED_P.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57928
diff
changeset
|
1208 int do_timers; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1209 { |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1210 XEvent event; |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1211 |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1212 while (popup_activated_flag) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1213 { |
| 59107 | 1214 if (initial_event) |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1215 { |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1216 event = *initial_event; |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1217 initial_event = 0; |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1218 } |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1219 else |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1220 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1221 if (do_timers) x_menu_wait_for_event (0); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1222 XtAppNextEvent (Xt_app_con, &event); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1223 } |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1224 |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
1225 /* Make sure we don't consider buttons grabbed after menu goes. |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1226 And make sure to deactivate for any ButtonRelease, |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1227 even if XtDispatchEvent doesn't do that. */ |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1228 if (event.type == ButtonRelease |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1229 && dpyinfo->display == event.xbutton.display) |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
1230 { |
|
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
1231 dpyinfo->grabbed &= ~(1 << event.xbutton.button); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1232 #ifdef USE_MOTIF /* Pretending that the event came from a |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1233 Btn1Down seems the only way to convince Motif to |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1234 activate its callbacks; setting the XmNmenuPost |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1235 isn't working. --marcus@sysc.pdx.edu. */ |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1236 event.xbutton.button = 1; |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1237 /* Motif only pops down menus when no Ctrl, Alt or Mod |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1238 key is pressed and the button is released. So reset key state |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1239 so Motif thinks this is the case. */ |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1240 event.xbutton.state = 0; |
|
15839
e66ccb471d26
(xmenu_show): Set dummy.state.
Richard M. Stallman <rms@gnu.org>
parents:
15807
diff
changeset
|
1241 #endif |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
1242 } |
|
59155
6690f246cffe
* xmenu.c (popup_get_selection): Only pop down dialogs
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59107
diff
changeset
|
1243 /* Pop down on C-g and Escape. */ |
|
11954
4117d74ba254
(popup_get_selection): Force deactivation if key pressed.
Karl Heuer <kwzh@gnu.org>
parents:
11918
diff
changeset
|
1244 else if (event.type == KeyPress |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
1245 && dpyinfo->display == event.xbutton.display) |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1246 { |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1247 KeySym keysym = XLookupKeysym (&event.xkey, 0); |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
1248 |
|
59155
6690f246cffe
* xmenu.c (popup_get_selection): Only pop down dialogs
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59107
diff
changeset
|
1249 if ((keysym == XK_g && (event.xkey.state & ControlMask) != 0) |
|
6690f246cffe
* xmenu.c (popup_get_selection): Only pop down dialogs
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59107
diff
changeset
|
1250 || keysym == XK_Escape) /* Any escape, ignore modifiers. */ |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
1251 popup_activated_flag = 0; |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1252 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1253 |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
1254 x_dispatch_event (&event, event.xany.display); |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1255 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1256 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1257 |
| 49322 | 1258 #endif /* USE_X_TOOLKIT */ |
| 1259 | |
| 1260 #ifdef USE_GTK | |
| 1261 /* Loop util popup_activated_flag is set to zero in a callback. | |
| 1262 Used for popup menus and dialogs. */ | |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1263 |
| 49322 | 1264 static void |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1265 popup_widget_loop (do_timers, widget) |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1266 int do_timers; |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
1267 GtkWidget *widget; |
| 49322 | 1268 { |
| 1269 ++popup_activated_flag; | |
| 1270 | |
| 1271 /* Process events in the Gtk event loop until done. */ | |
| 1272 while (popup_activated_flag) | |
| 1273 { | |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
1274 if (do_timers) x_menu_wait_for_event (0); |
| 49322 | 1275 gtk_main_iteration (); |
| 1276 } | |
| 1277 } | |
| 1278 #endif | |
| 1279 | |
| 12661 | 1280 /* Activate the menu bar of frame F. |
| 1281 This is called from keyboard.c when it gets the | |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42588
diff
changeset
|
1282 MENU_BAR_ACTIVATE_EVENT out of the Emacs event queue. |
| 12661 | 1283 |
| 1284 To activate the menu bar, we use the X button-press event | |
|
15710
85d87cd0f655
(x_activate_menubar): Allow any event, not just ButtonPress.
Karl Heuer <kwzh@gnu.org>
parents:
15628
diff
changeset
|
1285 that was saved in saved_menu_event. |
| 12661 | 1286 That makes the toolkit do its thing. |
| 1287 | |
| 1288 But first we recompute the menu bar contents (the whole tree). | |
| 1289 | |
| 1290 The reason for saving the button event until here, instead of | |
| 1291 passing it to the toolkit right away, is that we can safely | |
| 1292 execute Lisp code. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1293 |
| 21514 | 1294 void |
| 12661 | 1295 x_activate_menubar (f) |
| 1296 FRAME_PTR f; | |
| 1297 { | |
|
15710
85d87cd0f655
(x_activate_menubar): Allow any event, not just ButtonPress.
Karl Heuer <kwzh@gnu.org>
parents:
15628
diff
changeset
|
1298 if (!f->output_data.x->saved_menu_event->type) |
| 12661 | 1299 return; |
| 1300 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1301 #ifdef USE_GTK |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
1302 if (! xg_win_to_widget (FRAME_X_DISPLAY (f), |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
1303 f->output_data.x->saved_menu_event->xany.window)) |
| 49322 | 1304 return; |
| 1305 #endif | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1306 |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1307 set_frame_menubar (f, 0, 1); |
| 12661 | 1308 BLOCK_INPUT; |
| 49322 | 1309 #ifdef USE_GTK |
| 1310 XPutBackEvent (f->output_data.x->display_info->display, | |
| 1311 f->output_data.x->saved_menu_event); | |
| 1312 popup_activated_flag = 1; | |
| 1313 #else | |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
1314 XtDispatchEvent (f->output_data.x->saved_menu_event); |
| 49322 | 1315 #endif |
| 12661 | 1316 UNBLOCK_INPUT; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1317 #ifdef USE_MOTIF |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1318 if (f->output_data.x->saved_menu_event->type == ButtonRelease) |
|
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1319 pending_menu_activation = 1; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1320 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1321 |
| 12661 | 1322 /* Ignore this if we get it a second time. */ |
|
15710
85d87cd0f655
(x_activate_menubar): Allow any event, not just ButtonPress.
Karl Heuer <kwzh@gnu.org>
parents:
15628
diff
changeset
|
1323 f->output_data.x->saved_menu_event->type = 0; |
| 12661 | 1324 } |
| 1325 | |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
1326 /* Detect if a dialog or menu has been posted. */ |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1327 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1328 int |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1329 popup_activated () |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1330 { |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1331 return popup_activated_flag; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1332 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1333 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1334 /* This callback is invoked when the user selects a menubar cascade |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1335 pushbutton, but before the pulldown menu is posted. */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1336 |
| 49322 | 1337 #ifndef USE_GTK |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1338 static void |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1339 popup_activate_callback (widget, id, client_data) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1340 Widget widget; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1341 LWLIB_ID id; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1342 XtPointer client_data; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1343 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1344 popup_activated_flag = 1; |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1345 } |
| 49322 | 1346 #endif |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1347 |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1348 /* This callback is invoked when a dialog or menu is finished being |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1349 used and has been unposted. */ |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1350 |
| 49322 | 1351 #ifdef USE_GTK |
| 1352 static void | |
| 1353 popup_deactivate_callback (widget, client_data) | |
| 1354 GtkWidget *widget; | |
| 1355 gpointer client_data; | |
| 1356 { | |
| 1357 popup_activated_flag = 0; | |
| 1358 } | |
| 1359 #else | |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1360 static void |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1361 popup_deactivate_callback (widget, id, client_data) |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1362 Widget widget; |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1363 LWLIB_ID id; |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1364 XtPointer client_data; |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1365 { |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
1366 popup_activated_flag = 0; |
| 118 | 1367 } |
| 49322 | 1368 #endif |
| 1369 | |
| 1370 | |
| 1371 /* Function that finds the frame for WIDGET and shows the HELP text | |
| 1372 for that widget. | |
| 1373 F is the frame if known, or NULL if not known. */ | |
| 1374 static void | |
| 1375 show_help_event (f, widget, help) | |
| 1376 FRAME_PTR f; | |
| 1377 xt_or_gtk_widget widget; | |
| 1378 Lisp_Object help; | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1379 { |
| 49322 | 1380 Lisp_Object frame; |
| 1381 | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1382 if (f) |
|
30472
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
1383 { |
|
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
1384 XSETFRAME (frame, f); |
|
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
1385 kbd_buffer_store_help_event (frame, help); |
|
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
1386 } |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1387 else |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1388 { |
|
53325
8e8832ef3963
(show_help_event): Remove unused code.
Kim F. Storm <storm@cua.dk>
parents:
53069
diff
changeset
|
1389 #if 0 /* This code doesn't do anything useful. ++kfs */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1390 /* WIDGET is the popup menu. It's parent is the frame's |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1391 widget. See which frame that is. */ |
| 49322 | 1392 xt_or_gtk_widget frame_widget = XtParent (widget); |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1393 Lisp_Object tail; |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1394 |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1395 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1396 { |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1397 frame = XCAR (tail); |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1398 if (GC_FRAMEP (frame) |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1399 && (f = XFRAME (frame), |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1400 FRAME_X_P (f) && f->output_data.x->widget == frame_widget)) |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1401 break; |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1402 } |
|
53325
8e8832ef3963
(show_help_event): Remove unused code.
Kim F. Storm <storm@cua.dk>
parents:
53069
diff
changeset
|
1403 #endif |
|
30472
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
1404 show_help_echo (help, Qnil, Qnil, Qnil, 1); |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1405 } |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1406 } |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1407 |
| 49322 | 1408 /* Callback called when menu items are highlighted/unhighlighted |
| 1409 while moving the mouse over them. WIDGET is the menu bar or menu | |
| 1410 popup widget. ID is its LWLIB_ID. CALL_DATA contains a pointer to | |
| 1411 the data structure for the menu item, or null in case of | |
| 1412 unhighlighting. */ | |
| 1413 | |
| 1414 #ifdef USE_GTK | |
| 1415 void | |
| 1416 menu_highlight_callback (widget, call_data) | |
| 1417 GtkWidget *widget; | |
| 1418 gpointer call_data; | |
| 1419 { | |
| 1420 xg_menu_item_cb_data *cb_data; | |
| 1421 Lisp_Object help; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1422 |
| 49322 | 1423 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (widget), |
| 1424 XG_ITEM_DATA); | |
| 1425 if (! cb_data) return; | |
| 1426 | |
| 1427 help = call_data ? cb_data->help : Qnil; | |
| 1428 | |
| 1429 /* If popup_activated_flag is greater than 1 we are in a popup menu. | |
| 1430 Don't show help for them, they won't appear before the | |
| 1431 popup is popped down. */ | |
| 1432 if (popup_activated_flag <= 1) | |
| 1433 show_help_event (cb_data->cl_data->f, widget, help); | |
| 1434 } | |
| 1435 #else | |
| 1436 void | |
| 1437 menu_highlight_callback (widget, id, call_data) | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1438 Widget widget; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1439 LWLIB_ID id; |
| 49322 | 1440 void *call_data; |
| 1441 { | |
| 1442 struct frame *f; | |
| 1443 Lisp_Object help; | |
| 1444 | |
| 1445 widget_value *wv = (widget_value *) call_data; | |
| 1446 | |
| 1447 help = wv ? wv->help : Qnil; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1448 |
| 49322 | 1449 /* Determine the frame for the help event. */ |
| 1450 f = menubar_id_to_frame (id); | |
| 1451 | |
| 1452 show_help_event (f, widget, help); | |
| 1453 } | |
| 1454 #endif | |
| 1455 | |
| 1456 /* Find the menu selection and store it in the keyboard buffer. | |
| 1457 F is the frame the menu is on. | |
| 1458 MENU_BAR_ITEMS_USED is the length of VECTOR. | |
|
59912
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1459 VECTOR is an array of menu events for the whole menu. */ |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1460 |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1461 static void |
| 49322 | 1462 find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data) |
| 1463 FRAME_PTR f; | |
| 1464 int menu_bar_items_used; | |
| 1465 Lisp_Object vector; | |
| 1466 void *client_data; | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1467 { |
|
11655
a9f93ce6e1b4
(xmenu_show, menubar_selection_callback): Move declaration
Karl Heuer <kwzh@gnu.org>
parents:
11614
diff
changeset
|
1468 Lisp_Object prefix, entry; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1469 Lisp_Object *subprefix_stack; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1470 int submenu_depth = 0; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1471 int i; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1472 |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31465
diff
changeset
|
1473 entry = Qnil; |
| 49322 | 1474 subprefix_stack = (Lisp_Object *) alloca (menu_bar_items_used * sizeof (Lisp_Object)); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1475 prefix = Qnil; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1476 i = 0; |
| 49322 | 1477 |
| 1478 while (i < menu_bar_items_used) | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1479 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1480 if (EQ (XVECTOR (vector)->contents[i], Qnil)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1481 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1482 subprefix_stack[submenu_depth++] = prefix; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1483 prefix = entry; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1484 i++; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1485 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1486 else if (EQ (XVECTOR (vector)->contents[i], Qlambda)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1487 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1488 prefix = subprefix_stack[--submenu_depth]; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1489 i++; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1490 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1491 else if (EQ (XVECTOR (vector)->contents[i], Qt)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1492 { |
|
10799
1745fca9370a
(menubar_selection_callback): frame_or_window field of a menu-bar event now
Karl Heuer <kwzh@gnu.org>
parents:
10757
diff
changeset
|
1493 prefix = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1494 i += MENU_ITEMS_PANE_LENGTH; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1495 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1496 else |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1497 { |
|
10799
1745fca9370a
(menubar_selection_callback): frame_or_window field of a menu-bar event now
Karl Heuer <kwzh@gnu.org>
parents:
10757
diff
changeset
|
1498 entry = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE]; |
|
11266
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1499 /* The EMACS_INT cast avoids a warning. There's no problem |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1500 as long as pointers have enough bits to hold small integers. */ |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1501 if ((int) (EMACS_INT) client_data == i) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1502 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1503 int j; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1504 struct input_event buf; |
|
10799
1745fca9370a
(menubar_selection_callback): frame_or_window field of a menu-bar event now
Karl Heuer <kwzh@gnu.org>
parents:
10757
diff
changeset
|
1505 Lisp_Object frame; |
|
51575
45724e359a61
(find_and_call_menu_selection): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51404
diff
changeset
|
1506 EVENT_INIT (buf); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1507 |
|
10799
1745fca9370a
(menubar_selection_callback): frame_or_window field of a menu-bar event now
Karl Heuer <kwzh@gnu.org>
parents:
10757
diff
changeset
|
1508 XSETFRAME (frame, f); |
|
30181
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1509 buf.kind = MENU_BAR_EVENT; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1510 buf.frame_or_window = frame; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1511 buf.arg = frame; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1512 kbd_buffer_store_event (&buf); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1513 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1514 for (j = 0; j < submenu_depth; j++) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1515 if (!NILP (subprefix_stack[j])) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1516 { |
|
30181
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1517 buf.kind = MENU_BAR_EVENT; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1518 buf.frame_or_window = frame; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1519 buf.arg = subprefix_stack[j]; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1520 kbd_buffer_store_event (&buf); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1521 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1522 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1523 if (!NILP (prefix)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1524 { |
|
30181
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1525 buf.kind = MENU_BAR_EVENT; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1526 buf.frame_or_window = frame; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1527 buf.arg = prefix; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1528 kbd_buffer_store_event (&buf); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1529 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1530 |
|
30181
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1531 buf.kind = MENU_BAR_EVENT; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1532 buf.frame_or_window = frame; |
|
770a280db6ee
(menu_highlight_callback): Store help string in the
Gerd Moellmann <gerd@gnu.org>
parents:
30144
diff
changeset
|
1533 buf.arg = entry; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1534 kbd_buffer_store_event (&buf); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1535 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1536 return; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1537 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1538 i += MENU_ITEMS_ITEM_LENGTH; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1539 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1540 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1541 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1542 |
| 49322 | 1543 |
| 1544 #ifdef USE_GTK | |
| 1545 /* Gtk calls callbacks just because we tell it what item should be | |
| 1546 selected in a radio group. If this variable is set to a non-zero | |
| 1547 value, we are creating menus and don't want callbacks right now. | |
| 1548 */ | |
| 1549 static int xg_crazy_callback_abort; | |
| 1550 | |
| 1551 /* This callback is called from the menu bar pulldown menu | |
| 1552 when the user makes a selection. | |
| 1553 Figure out what the user chose | |
| 1554 and put the appropriate events into the keyboard buffer. */ | |
| 1555 static void | |
| 1556 menubar_selection_callback (widget, client_data) | |
| 1557 GtkWidget *widget; | |
| 1558 gpointer client_data; | |
| 1559 { | |
| 1560 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; | |
| 1561 | |
| 1562 if (xg_crazy_callback_abort) | |
| 1563 return; | |
| 1564 | |
| 1565 if (! cb_data || ! cb_data->cl_data || ! cb_data->cl_data->f) | |
| 1566 return; | |
| 1567 | |
|
59912
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1568 /* When a menu is popped down, X generates a focus event (i.e. focus |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1569 goes back to the frame below the menu). Since GTK buffers events, |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1570 we force it out here before the menu selection event. Otherwise |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1571 sit-for will exit at once if the focus event follows the menu selection |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1572 event. */ |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1573 |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1574 BLOCK_INPUT; |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1575 while (gtk_events_pending ()) |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1576 gtk_main_iteration (); |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1577 UNBLOCK_INPUT; |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
1578 |
| 49322 | 1579 find_and_call_menu_selection (cb_data->cl_data->f, |
| 1580 cb_data->cl_data->menu_bar_items_used, | |
| 1581 cb_data->cl_data->menu_bar_vector, | |
| 1582 cb_data->call_data); | |
| 1583 } | |
| 1584 | |
| 1585 #else /* not USE_GTK */ | |
| 1586 | |
| 1587 /* This callback is called from the menu bar pulldown menu | |
| 1588 when the user makes a selection. | |
| 1589 Figure out what the user chose | |
| 1590 and put the appropriate events into the keyboard buffer. */ | |
| 1591 static void | |
| 1592 menubar_selection_callback (widget, id, client_data) | |
| 1593 Widget widget; | |
| 1594 LWLIB_ID id; | |
| 1595 XtPointer client_data; | |
| 1596 { | |
| 1597 FRAME_PTR f; | |
| 1598 | |
| 1599 f = menubar_id_to_frame (id); | |
| 1600 if (!f) | |
| 1601 return; | |
| 1602 find_and_call_menu_selection (f, f->menu_bar_items_used, | |
| 1603 f->menu_bar_vector, client_data); | |
| 1604 } | |
| 1605 #endif /* not USE_GTK */ | |
| 1606 | |
|
14553
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1607 /* Allocate a widget_value, blocking input. */ |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1608 |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1609 widget_value * |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1610 xmalloc_widget_value () |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1611 { |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1612 widget_value *value; |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1613 |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1614 BLOCK_INPUT; |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1615 value = malloc_widget_value (); |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1616 UNBLOCK_INPUT; |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1617 |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1618 return value; |
|
00521a7aaa75
(xmalloc_widget_value): Define only if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
14548
diff
changeset
|
1619 } |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
1620 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1621 /* This recursively calls free_widget_value on the tree of widgets. |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1622 It must free all data that was malloc'ed for these widget_values. |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1623 In Emacs, many slots are pointers into the data of Lisp_Strings, and |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1624 must be left alone. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1625 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1626 void |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1627 free_menubar_widget_value_tree (wv) |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1628 widget_value *wv; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1629 { |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1630 if (! wv) return; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1631 |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1632 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1633 |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1634 if (wv->contents && (wv->contents != (widget_value*)1)) |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1635 { |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1636 free_menubar_widget_value_tree (wv->contents); |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1637 wv->contents = (widget_value *) 0xDEADBEEF; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1638 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1639 if (wv->next) |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1640 { |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1641 free_menubar_widget_value_tree (wv->next); |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1642 wv->next = (widget_value *) 0xDEADBEEF; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1643 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1644 BLOCK_INPUT; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1645 free_widget_value (wv); |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1646 UNBLOCK_INPUT; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1647 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1648 |
|
48270
b6f3eaeb71e5
(parse_single_submenu): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48113
diff
changeset
|
1649 /* Set up data in menu_items for a menu bar item |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1650 whose event type is ITEM_KEY (with string ITEM_NAME) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1651 and whose contents come from the list of keymaps MAPS. */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1652 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1653 static int |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1654 parse_single_submenu (item_key, item_name, maps) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1655 Lisp_Object item_key, item_name, maps; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1656 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1657 Lisp_Object length; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1658 int len; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1659 Lisp_Object *mapvec; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1660 int i; |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1661 int top_level_items = 0; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1662 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1663 length = Flength (maps); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1664 len = XINT (length); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1665 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1666 /* Convert the list MAPS into a vector MAPVEC. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1667 mapvec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1668 for (i = 0; i < len; i++) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1669 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1670 mapvec[i] = Fcar (maps); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1671 maps = Fcdr (maps); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1672 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1673 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1674 /* Loop over the given keymaps, making a pane for each map. |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1675 But don't make a pane that is empty--ignore that map instead. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1676 for (i = 0; i < len; i++) |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1677 { |
|
48270
b6f3eaeb71e5
(parse_single_submenu): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48113
diff
changeset
|
1678 if (!KEYMAPP (mapvec[i])) |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1679 { |
|
15311
a9ed91ec0700
(single_submenu): Handle non-keymap lists like symbols.
Richard M. Stallman <rms@gnu.org>
parents:
15107
diff
changeset
|
1680 /* Here we have a command at top level in the menu bar |
|
a9ed91ec0700
(single_submenu): Handle non-keymap lists like symbols.
Richard M. Stallman <rms@gnu.org>
parents:
15107
diff
changeset
|
1681 as opposed to a submenu. */ |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1682 top_level_items = 1; |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1683 push_menu_pane (Qnil, Qnil); |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1684 push_menu_item (item_name, Qt, item_key, mapvec[i], |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1685 Qnil, Qnil, Qnil, Qnil); |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1686 } |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1687 else |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1688 { |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1689 Lisp_Object prompt; |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1690 prompt = Fkeymap_prompt (mapvec[i]); |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1691 single_keymap_panes (mapvec[i], |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1692 !NILP (prompt) ? prompt : item_name, |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1693 item_key, 0, 10); |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1694 } |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1695 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1696 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1697 return top_level_items; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1698 } |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1699 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1700 /* Create a tree of widget_value objects |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1701 representing the panes and items |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1702 in menu_items starting at index START, up to index END. */ |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1703 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1704 static widget_value * |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1705 digest_single_submenu (start, end, top_level_items) |
|
48329
0d792a35828b
(unuse_menu_items, digest_single_submenu):
Dave Love <fx@gnu.org>
parents:
48270
diff
changeset
|
1706 int start, end, top_level_items; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1707 { |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1708 widget_value *wv, *prev_wv, *save_wv, *first_wv; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1709 int i; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1710 int submenu_depth = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1711 widget_value **submenu_stack; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1712 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1713 submenu_stack |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1714 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *)); |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1715 wv = xmalloc_widget_value (); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1716 wv->name = "menu"; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1717 wv->value = 0; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1718 wv->enabled = 1; |
| 24993 | 1719 wv->button_type = BUTTON_TYPE_NONE; |
|
42586
3d2b46b8e1bf
(single_submenu): Initialize wv->help to Qnil.
Jason Rumney <jasonr@gnu.org>
parents:
42583
diff
changeset
|
1720 wv->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1721 first_wv = wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1722 save_wv = 0; |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1723 prev_wv = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1724 |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1725 /* Loop over all panes and items made by the preceding call |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1726 to parse_single_submenu and construct a tree of widget_value objects. |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1727 Ignore the panes and items used by previous calls to |
|
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1728 digest_single_submenu, even though those are also in menu_items. */ |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1729 i = start; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1730 while (i < end) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1731 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1732 if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1733 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1734 submenu_stack[submenu_depth++] = save_wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1735 save_wv = prev_wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1736 prev_wv = 0; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1737 i++; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1738 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1739 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1740 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1741 prev_wv = save_wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1742 save_wv = submenu_stack[--submenu_depth]; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1743 i++; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1744 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1745 else if (EQ (XVECTOR (menu_items)->contents[i], Qt) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1746 && submenu_depth != 0) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1747 i += MENU_ITEMS_PANE_LENGTH; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1748 /* Ignore a nil in the item list. |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1749 It's meaningful only for dialog boxes. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1750 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1751 i += 1; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1752 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1753 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1754 /* Create a new pane. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1755 Lisp_Object pane_name, prefix; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1756 char *pane_string; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1757 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1758 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1759 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1760 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1761 #ifndef HAVE_MULTILINGUAL_MENU |
|
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1762 if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1763 { |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
1764 pane_name = ENCODE_MENU_STRING (pane_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1765 AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1766 } |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1767 #endif |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1768 pane_string = (NILP (pane_name) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1769 ? "" : (char *) SDATA (pane_name)); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1770 /* If there is just one top-level pane, put all its items directly |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1771 under the top-level menu. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1772 if (menu_items_n_panes == 1) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1773 pane_string = ""; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1774 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1775 /* If the pane has a meaningful name, |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1776 make the pane a top-level menu item |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1777 with its items as a submenu beneath it. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1778 if (strcmp (pane_string, "")) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1779 { |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1780 wv = xmalloc_widget_value (); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1781 if (save_wv) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1782 save_wv->next = wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1783 else |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1784 first_wv->contents = wv; |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1785 wv->lname = pane_name; |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1786 /* Set value to 1 so update_submenu_strings can handle '@' */ |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1787 wv->value = (char *)1; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1788 wv->enabled = 1; |
| 24993 | 1789 wv->button_type = BUTTON_TYPE_NONE; |
|
42586
3d2b46b8e1bf
(single_submenu): Initialize wv->help to Qnil.
Jason Rumney <jasonr@gnu.org>
parents:
42583
diff
changeset
|
1790 wv->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1791 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1792 save_wv = wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1793 prev_wv = 0; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1794 i += MENU_ITEMS_PANE_LENGTH; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1795 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1796 else |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1797 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1798 /* Create a new item within current pane. */ |
| 24993 | 1799 Lisp_Object item_name, enable, descrip, def, type, selected; |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1800 Lisp_Object help; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1801 |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1802 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1803 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1804 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1805 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1806 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1807 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1808 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); |
| 24993 | 1809 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1810 #ifndef HAVE_MULTILINGUAL_MENU |
| 24993 | 1811 if (STRING_MULTIBYTE (item_name)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1812 { |
| 51404 | 1813 item_name = ENCODE_MENU_STRING (item_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1814 AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1815 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1816 |
| 24993 | 1817 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1818 { |
| 51404 | 1819 descrip = ENCODE_MENU_STRING (descrip); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1820 AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1821 } |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
1822 #endif /* not HAVE_MULTILINGUAL_MENU */ |
| 24993 | 1823 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1824 wv = xmalloc_widget_value (); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1825 if (prev_wv) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1826 prev_wv->next = wv; |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1827 else |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1828 save_wv->contents = wv; |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1829 |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1830 wv->lname = item_name; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1831 if (!NILP (descrip)) |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1832 wv->lkey = descrip; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1833 wv->value = 0; |
|
11266
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1834 /* The EMACS_INT cast avoids a warning. There's no problem |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1835 as long as pointers have enough bits to hold small integers. */ |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1836 wv->call_data = (!NILP (def) ? (void *) (EMACS_INT) i : 0); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1837 wv->enabled = !NILP (enable); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1838 |
| 24993 | 1839 if (NILP (type)) |
| 1840 wv->button_type = BUTTON_TYPE_NONE; | |
| 1841 else if (EQ (type, QCradio)) | |
| 1842 wv->button_type = BUTTON_TYPE_RADIO; | |
| 1843 else if (EQ (type, QCtoggle)) | |
| 1844 wv->button_type = BUTTON_TYPE_TOGGLE; | |
| 1845 else | |
| 1846 abort (); | |
| 1847 | |
| 1848 wv->selected = !NILP (selected); | |
|
41769
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1849 if (! STRINGP (help)) |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1850 help = Qnil; |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1851 |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1852 wv->help = help; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1853 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1854 prev_wv = wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1855 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1856 i += MENU_ITEMS_ITEM_LENGTH; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1857 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1858 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1859 |
|
12432
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1860 /* If we have just one "menu item" |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1861 that was originally a button, return it by itself. */ |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1862 if (top_level_items && first_wv->contents && first_wv->contents->next == 0) |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1863 { |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1864 wv = first_wv->contents; |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1865 free_widget_value (first_wv); |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1866 return wv; |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1867 } |
|
a46766b7288a
(single_submenu): Handle commands appearing directly in the menu bar.
Richard M. Stallman <rms@gnu.org>
parents:
12361
diff
changeset
|
1868 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1869 return first_wv; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1870 } |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1871 |
|
56848
7201186afcb7
Fix typo in comment string.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56847
diff
changeset
|
1872 /* Walk through the widget_value tree starting at FIRST_WV and update |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1873 the char * pointers from the corresponding lisp values. |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1874 We do this after building the whole tree, since GC may happen while the |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1875 tree is constructed, and small strings are relocated. So we must wait |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1876 until no GC can happen before storing pointers into lisp values. */ |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1877 static void |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1878 update_submenu_strings (first_wv) |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1879 widget_value *first_wv; |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1880 { |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1881 widget_value *wv; |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1882 |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1883 for (wv = first_wv; wv; wv = wv->next) |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1884 { |
|
56959
dc35c2e20d41
(update_submenu_strings): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56848
diff
changeset
|
1885 if (STRINGP (wv->lname)) |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1886 { |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1887 wv->name = SDATA (wv->lname); |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1888 |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1889 /* Ignore the @ that means "separate pane". |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1890 This is a kludge, but this isn't worth more time. */ |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1891 if (wv->value == (char *)1) |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1892 { |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1893 if (wv->name[0] == '@') |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1894 wv->name++; |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1895 wv->value = 0; |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1896 } |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1897 } |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1898 |
|
56959
dc35c2e20d41
(update_submenu_strings): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56848
diff
changeset
|
1899 if (STRINGP (wv->lkey)) |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1900 wv->key = SDATA (wv->lkey); |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1901 |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1902 if (wv->contents) |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1903 update_submenu_strings (wv->contents); |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1904 } |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1905 } |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
1906 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1907 |
| 36933 | 1908 /* Recompute all the widgets of frame F, when the menu bar has been |
| 1909 changed. Value is non-zero if widgets were updated. */ | |
| 1910 | |
| 1911 static int | |
|
6481
55236c5bca7c
(update_frame_menubar): Function renamed from update_one_frame_psheets.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6439
diff
changeset
|
1912 update_frame_menubar (f) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1913 FRAME_PTR f; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1914 { |
| 49322 | 1915 #ifdef USE_GTK |
| 1916 return xg_update_frame_menubar (f); | |
| 1917 #else | |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1918 struct x_output *x = f->output_data.x; |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1919 int columns, rows; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1920 |
| 36933 | 1921 if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) |
| 1922 return 0; | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1923 |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1924 BLOCK_INPUT; |
| 36933 | 1925 /* Save the size of the frame because the pane widget doesn't accept |
| 1926 to resize itself. So force it. */ | |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
1927 columns = FRAME_COLS (f); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
1928 rows = FRAME_LINES (f); |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1929 |
| 36933 | 1930 /* Do the voodoo which means "I'm changing lots of things, don't try |
| 1931 to refigure sizes until I'm done." */ | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1932 lw_refigure_widget (x->column_widget, False); |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1933 |
| 36933 | 1934 /* The order in which children are managed is the top to bottom |
| 1935 order in which they are displayed in the paned window. First, | |
| 1936 remove the text-area widget. */ | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1937 XtUnmanageChild (x->edit_widget); |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1938 |
| 36933 | 1939 /* Remove the menubar that is there now, and put up the menubar that |
| 1940 should be there. */ | |
| 1941 XtManageChild (x->menubar_widget); | |
| 1942 XtMapWidget (x->menubar_widget); | |
| 1943 XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, NULL); | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1944 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
1945 /* Re-manage the text-area widget, and then thrash the sizes. */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1946 XtManageChild (x->edit_widget); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1947 lw_refigure_widget (x->column_widget, True); |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1948 |
|
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1949 /* Force the pane widget to resize itself with the right values. */ |
|
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
1950 EmacsFrameSetCharSize (x->edit_widget, columns, rows); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1951 UNBLOCK_INPUT; |
| 49322 | 1952 #endif |
| 36933 | 1953 return 1; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1954 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1955 |
|
12018
f5d820ad7a13
(set_frame_menubar): Always call update_frame_menubar.
Karl Heuer <kwzh@gnu.org>
parents:
11954
diff
changeset
|
1956 /* Set the contents of the menubar widgets of frame F. |
|
f5d820ad7a13
(set_frame_menubar): Always call update_frame_menubar.
Karl Heuer <kwzh@gnu.org>
parents:
11954
diff
changeset
|
1957 The argument FIRST_TIME is currently ignored; |
|
f5d820ad7a13
(set_frame_menubar): Always call update_frame_menubar.
Karl Heuer <kwzh@gnu.org>
parents:
11954
diff
changeset
|
1958 it is set the first time this is called, from initialize_frame_menubar. */ |
|
f5d820ad7a13
(set_frame_menubar): Always call update_frame_menubar.
Karl Heuer <kwzh@gnu.org>
parents:
11954
diff
changeset
|
1959 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1960 void |
| 12661 | 1961 set_frame_menubar (f, first_time, deep_p) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1962 FRAME_PTR f; |
|
6605
f5b781f33789
(set_frame_menubar): New arg, first_time.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6526
diff
changeset
|
1963 int first_time; |
| 12661 | 1964 int deep_p; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1965 { |
| 49322 | 1966 xt_or_gtk_widget menubar_widget = f->output_data.x->menubar_widget; |
| 1967 #ifdef USE_X_TOOLKIT | |
| 1968 LWLIB_ID id; | |
| 1969 #endif | |
|
25730
db88a4b84d91
(single_menu_item, Fx_popup_menu, Fx_popup_menu,
Gerd Moellmann <gerd@gnu.org>
parents:
25680
diff
changeset
|
1970 Lisp_Object items; |
|
9725
98d374d51f4d
(set_frame_menubar): Don't copy string during GC risk.
Karl Heuer <kwzh@gnu.org>
parents:
9649
diff
changeset
|
1971 widget_value *wv, *first_wv, *prev_wv = 0; |
|
56959
dc35c2e20d41
(update_submenu_strings): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56848
diff
changeset
|
1972 int i, last_i = 0; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1973 int *submenu_start, *submenu_end; |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1974 int *submenu_top_level_items, *submenu_n_panes; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1975 |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1976 |
|
16656
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
1977 XSETFRAME (Vmenu_updating_frame, f); |
|
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
1978 |
| 49322 | 1979 #ifdef USE_X_TOOLKIT |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1980 if (f->output_data.x->id == 0) |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1981 f->output_data.x->id = next_menubar_widget_id++; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1982 id = f->output_data.x->id; |
| 49322 | 1983 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1984 |
| 12661 | 1985 if (! menubar_widget) |
| 1986 deep_p = 1; | |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1987 else if (pending_menu_activation && !deep_p) |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1988 deep_p = 1; |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1989 /* Make the first call for any given frame always go deep. */ |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1990 else if (!f->output_data.x->saved_menu_event && !deep_p) |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1991 { |
|
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1992 deep_p = 1; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1993 f->output_data.x->saved_menu_event = (XEvent*)xmalloc (sizeof (XEvent)); |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
1994 f->output_data.x->saved_menu_event->type = 0; |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
1995 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1996 |
|
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1997 #ifdef USE_GTK |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1998 /* If we have detached menus, we must update deep so detached menus |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1999 also gets updated. */ |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2000 deep_p = deep_p || xg_have_tear_offs (); |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2001 #endif |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2002 |
| 12661 | 2003 if (deep_p) |
| 2004 { | |
| 2005 /* Make a widget-value tree representing the entire menu trees. */ | |
| 2006 | |
| 2007 struct buffer *prev = current_buffer; | |
| 2008 Lisp_Object buffer; | |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45803
diff
changeset
|
2009 int specpdl_count = SPECPDL_INDEX (); |
| 12661 | 2010 int previous_menu_items_used = f->menu_bar_items_used; |
| 2011 Lisp_Object *previous_items | |
| 2012 = (Lisp_Object *) alloca (previous_menu_items_used | |
| 2013 * sizeof (Lisp_Object)); | |
|
12634
eec80ea06395
(set_frame_menubar): If the Lisp-level menu bar menus
Richard M. Stallman <rms@gnu.org>
parents:
12625
diff
changeset
|
2014 |
|
17554
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
2015 /* If we are making a new widget, its contents are empty, |
|
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
2016 do always reinitialize them. */ |
|
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
2017 if (! menubar_widget) |
|
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
2018 previous_menu_items_used = 0; |
|
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
2019 |
| 12661 | 2020 buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer; |
| 2021 specbind (Qinhibit_quit, Qt); | |
| 2022 /* Don't let the debugger step into this code | |
| 2023 because it is not reentrant. */ | |
| 2024 specbind (Qdebug_on_next_call, Qnil); | |
| 2025 | |
|
21178
85fd58cb0654
(set_frame_menubar): Fstore_match_data => Fset_match_data.
Richard M. Stallman <rms@gnu.org>
parents:
20630
diff
changeset
|
2026 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
2027 record_unwind_protect (unuse_menu_items, Qnil); |
| 12661 | 2028 if (NILP (Voverriding_local_map_menu_flag)) |
| 2029 { | |
| 2030 specbind (Qoverriding_terminal_local_map, Qnil); | |
| 2031 specbind (Qoverriding_local_map, Qnil); | |
| 2032 } | |
| 2033 | |
| 2034 set_buffer_internal_1 (XBUFFER (buffer)); | |
|
12634
eec80ea06395
(set_frame_menubar): If the Lisp-level menu bar menus
Richard M. Stallman <rms@gnu.org>
parents:
12625
diff
changeset
|
2035 |
| 12661 | 2036 /* Run the Lucid hook. */ |
|
36191
0cee3a77c592
(set_frame_menubar): Run acivate-menu-bar-hook with
Gerd Moellmann <gerd@gnu.org>
parents:
34038
diff
changeset
|
2037 safe_run_hooks (Qactivate_menubar_hook); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2038 |
| 12661 | 2039 /* If it has changed current-menubar from previous value, |
| 2040 really recompute the menubar from the value. */ | |
| 2041 if (! NILP (Vlucid_menu_bar_dirty_flag)) | |
| 2042 call0 (Qrecompute_lucid_menubar); | |
| 14298 | 2043 safe_run_hooks (Qmenu_bar_update_hook); |
| 12661 | 2044 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 2045 | |
| 2046 items = FRAME_MENU_BAR_ITEMS (f); | |
| 2047 | |
| 2048 /* Save the frame's previous menu bar contents data. */ | |
|
38594
53ed5f089c9e
(set_frame_menubar): Take into account that
Gerd Moellmann <gerd@gnu.org>
parents:
37940
diff
changeset
|
2049 if (previous_menu_items_used) |
|
53ed5f089c9e
(set_frame_menubar): Take into account that
Gerd Moellmann <gerd@gnu.org>
parents:
37940
diff
changeset
|
2050 bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items, |
|
53ed5f089c9e
(set_frame_menubar): Take into account that
Gerd Moellmann <gerd@gnu.org>
parents:
37940
diff
changeset
|
2051 previous_menu_items_used * sizeof (Lisp_Object)); |
| 12661 | 2052 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2053 /* Fill in menu_items with the current menu bar contents. |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2054 This can evaluate Lisp code. */ |
| 12661 | 2055 menu_items = f->menu_bar_vector; |
|
38594
53ed5f089c9e
(set_frame_menubar): Take into account that
Gerd Moellmann <gerd@gnu.org>
parents:
37940
diff
changeset
|
2056 menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2057 submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2058 submenu_end = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
2059 submenu_n_panes = (int *) alloca (XVECTOR (items)->size * sizeof (int)); |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2060 submenu_top_level_items |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2061 = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); |
| 12661 | 2062 init_menu_items (); |
|
15107
e025990722ca
(set_frame_menubar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
14741
diff
changeset
|
2063 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 2064 { |
| 2065 Lisp_Object key, string, maps; | |
| 2066 | |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2067 last_i = i; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2068 |
| 12661 | 2069 key = XVECTOR (items)->contents[i]; |
| 2070 string = XVECTOR (items)->contents[i + 1]; | |
| 2071 maps = XVECTOR (items)->contents[i + 2]; | |
| 2072 if (NILP (string)) | |
| 2073 break; | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2074 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2075 submenu_start[i] = menu_items_used; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2076 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2077 menu_items_n_panes = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2078 submenu_top_level_items[i] |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2079 = parse_single_submenu (key, string, maps); |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
2080 submenu_n_panes[i] = menu_items_n_panes; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2081 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2082 submenu_end[i] = menu_items_used; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2083 } |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2084 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2085 finish_menu_items (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2086 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2087 /* Convert menu_items into widget_value trees |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2088 to display the menu. This cannot evaluate Lisp code. */ |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2089 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2090 wv = xmalloc_widget_value (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2091 wv->name = "menubar"; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2092 wv->value = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2093 wv->enabled = 1; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2094 wv->button_type = BUTTON_TYPE_NONE; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2095 wv->help = Qnil; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2096 first_wv = wv; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2097 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2098 for (i = 0; i < last_i; i += 4) |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2099 { |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
2100 menu_items_n_panes = submenu_n_panes[i]; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2101 wv = digest_single_submenu (submenu_start[i], submenu_end[i], |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2102 submenu_top_level_items[i]); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2103 if (prev_wv) |
| 12661 | 2104 prev_wv->next = wv; |
| 2105 else | |
| 2106 first_wv->contents = wv; | |
| 2107 /* Don't set wv->name here; GC during the loop might relocate it. */ | |
| 2108 wv->enabled = 1; | |
| 24993 | 2109 wv->button_type = BUTTON_TYPE_NONE; |
| 12661 | 2110 prev_wv = wv; |
| 2111 } | |
| 2112 | |
| 2113 set_buffer_internal_1 (prev); | |
| 2114 unbind_to (specpdl_count, Qnil); | |
| 2115 | |
| 2116 /* If there has been no change in the Lisp-level contents | |
| 2117 of the menu bar, skip redisplaying it. Just exit. */ | |
| 2118 | |
| 2119 for (i = 0; i < previous_menu_items_used; i++) | |
| 2120 if (menu_items_used == i | |
|
17364
573189779804
(Fx_popup_menu): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
16752
diff
changeset
|
2121 || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i]))) |
| 12661 | 2122 break; |
|
13654
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2123 if (i == menu_items_used && i == previous_menu_items_used && i != 0) |
| 12661 | 2124 { |
| 2125 free_menubar_widget_value_tree (first_wv); | |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
2126 discard_menu_items (); |
| 12661 | 2127 |
| 2128 return; | |
| 2129 } | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2130 |
| 12661 | 2131 /* Now GC cannot happen during the lifetime of the widget_value, |
| 2132 so it's safe to store data from a Lisp_String. */ | |
| 2133 wv = first_wv->contents; | |
|
15107
e025990722ca
(set_frame_menubar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
14741
diff
changeset
|
2134 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 2135 { |
| 2136 Lisp_Object string; | |
| 2137 string = XVECTOR (items)->contents[i + 1]; | |
| 2138 if (NILP (string)) | |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
2139 break; |
|
56847
6079dd23b546
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56846
diff
changeset
|
2140 wv->name = (char *) SDATA (string); |
|
56846
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
2141 update_submenu_strings (wv->contents); |
|
5817080daeba
* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56805
diff
changeset
|
2142 wv = wv->next; |
| 12661 | 2143 } |
| 2144 | |
| 2145 f->menu_bar_vector = menu_items; | |
| 2146 f->menu_bar_items_used = menu_items_used; | |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
2147 discard_menu_items (); |
| 12661 | 2148 } |
| 2149 else | |
| 2150 { | |
| 2151 /* Make a widget-value tree containing | |
| 2152 just the top level menu bar strings. */ | |
| 2153 | |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2154 wv = xmalloc_widget_value (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2155 wv->name = "menubar"; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2156 wv->value = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2157 wv->enabled = 1; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2158 wv->button_type = BUTTON_TYPE_NONE; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2159 wv->help = Qnil; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2160 first_wv = wv; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
2161 |
| 12661 | 2162 items = FRAME_MENU_BAR_ITEMS (f); |
|
15107
e025990722ca
(set_frame_menubar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
14741
diff
changeset
|
2163 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 2164 { |
| 2165 Lisp_Object string; | |
| 2166 | |
| 2167 string = XVECTOR (items)->contents[i + 1]; | |
| 2168 if (NILP (string)) | |
| 2169 break; | |
| 2170 | |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2171 wv = xmalloc_widget_value (); |
|
56847
6079dd23b546
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
56846
diff
changeset
|
2172 wv->name = (char *) SDATA (string); |
| 12661 | 2173 wv->value = 0; |
| 2174 wv->enabled = 1; | |
| 24993 | 2175 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2176 wv->help = Qnil; |
|
15785
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
2177 /* This prevents lwlib from assuming this |
|
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
2178 menu item is really supposed to be empty. */ |
|
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
2179 /* The EMACS_INT cast avoids a warning. |
|
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
2180 This value just has to be different from small integers. */ |
|
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
2181 wv->call_data = (void *) (EMACS_INT) (-1); |
| 12661 | 2182 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2183 if (prev_wv) |
| 12661 | 2184 prev_wv->next = wv; |
| 2185 else | |
| 2186 first_wv->contents = wv; | |
| 2187 prev_wv = wv; | |
| 2188 } | |
|
13654
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2189 |
|
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2190 /* Forget what we thought we knew about what is in the |
|
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2191 detailed contents of the menu bar menus. |
|
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2192 Changing the top level always destroys the contents. */ |
|
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
2193 f->menu_bar_items_used = 0; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2194 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2195 |
| 12661 | 2196 /* Create or update the menu bar widget. */ |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
2197 |
|
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
2198 BLOCK_INPUT; |
|
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
2199 |
| 49322 | 2200 #ifdef USE_GTK |
| 2201 xg_crazy_callback_abort = 1; | |
| 2202 if (menubar_widget) | |
| 2203 { | |
|
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2204 /* The fourth arg is DEEP_P, which says to consider the entire |
| 49322 | 2205 menu trees we supply, rather than just the menu bar item names. */ |
| 2206 xg_modify_menubar_widgets (menubar_widget, | |
| 2207 f, | |
| 2208 first_wv, | |
| 2209 deep_p, | |
| 2210 G_CALLBACK (menubar_selection_callback), | |
| 2211 G_CALLBACK (popup_deactivate_callback), | |
| 2212 G_CALLBACK (menu_highlight_callback)); | |
| 2213 } | |
| 2214 else | |
| 2215 { | |
| 2216 GtkWidget *wvbox = f->output_data.x->vbox_widget; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2217 |
| 49322 | 2218 menubar_widget |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2219 = xg_create_widget ("menubar", "menubar", f, first_wv, |
| 49322 | 2220 G_CALLBACK (menubar_selection_callback), |
| 2221 G_CALLBACK (popup_deactivate_callback), | |
| 2222 G_CALLBACK (menu_highlight_callback)); | |
| 2223 | |
| 2224 f->output_data.x->menubar_widget = menubar_widget; | |
| 2225 } | |
| 2226 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2227 |
| 49322 | 2228 #else /* not USE_GTK */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2229 if (menubar_widget) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2230 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2231 /* Disable resizing (done for Motif!) */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2232 lw_allow_resizing (f->output_data.x->widget, False); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2233 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2234 /* The third arg is DEEP_P, which says to consider the entire |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2235 menu trees we supply, rather than just the menu bar item names. */ |
| 12661 | 2236 lw_modify_all_widgets (id, first_wv, deep_p); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2237 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
2238 /* Re-enable the edit widget to resize. */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2239 lw_allow_resizing (f->output_data.x->widget, True); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2240 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2241 else |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2242 { |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2243 char menuOverride[] = "Ctrl<KeyPress>g: MenuGadgetEscape()"; |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2244 XtTranslations override = XtParseTranslationTable (menuOverride); |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2245 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2246 menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv, |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2247 f->output_data.x->column_widget, |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2248 0, |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2249 popup_activate_callback, |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2250 menubar_selection_callback, |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2251 popup_deactivate_callback, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2252 menu_highlight_callback); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2253 f->output_data.x->menubar_widget = menubar_widget; |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2254 |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2255 /* Make menu pop down on C-g. */ |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2256 XtOverrideTranslations (menubar_widget, override); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2257 } |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2258 |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2259 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2260 int menubar_size |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2261 = (f->output_data.x->menubar_widget |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2262 ? (f->output_data.x->menubar_widget->core.height |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2263 + f->output_data.x->menubar_widget->core.border_width) |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2264 : 0); |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2265 |
|
15943
16fb6dcfa4e8
(set_frame_menubar): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents:
15912
diff
changeset
|
2266 #if 0 /* Experimentally, we now get the right results |
|
16fb6dcfa4e8
(set_frame_menubar): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents:
15912
diff
changeset
|
2267 for -geometry -0-0 without this. 24 Aug 96, rms. */ |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
2268 #ifdef USE_LUCID |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2269 if (FRAME_EXTERNAL_MENU_BAR (f)) |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2270 { |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2271 Dimension ibw = 0; |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2272 XtVaGetValues (f->output_data.x->column_widget, |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2273 XtNinternalBorderWidth, &ibw, NULL); |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2274 menubar_size += ibw; |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2275 } |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
2276 #endif /* USE_LUCID */ |
|
15943
16fb6dcfa4e8
(set_frame_menubar): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents:
15912
diff
changeset
|
2277 #endif /* 0 */ |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2278 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2279 f->output_data.x->menubar_height = menubar_size; |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
2280 } |
| 49322 | 2281 #endif /* not USE_GTK */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2282 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2283 free_menubar_widget_value_tree (first_wv); |
|
36938
010e601743d5
(update_frame_menubar, set_frame_menubar, xmenu_show):
Gerd Moellmann <gerd@gnu.org>
parents:
36933
diff
changeset
|
2284 update_frame_menubar (f); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2285 |
| 49322 | 2286 #ifdef USE_GTK |
| 2287 xg_crazy_callback_abort = 0; | |
| 2288 #endif | |
| 2289 | |
|
12634
eec80ea06395
(set_frame_menubar): If the Lisp-level menu bar menus
Richard M. Stallman <rms@gnu.org>
parents:
12625
diff
changeset
|
2290 UNBLOCK_INPUT; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2291 } |
|
5897
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2292 |
| 14036 | 2293 /* Called from Fx_create_frame to create the initial menubar of a frame |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2294 before it is mapped, so that the window is mapped with the menubar already |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2295 there instead of us tacking it on later and thrashing the window after it |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2296 is visible. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2297 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2298 void |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2299 initialize_frame_menubar (f) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2300 FRAME_PTR f; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2301 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2302 /* This function is called before the first chance to redisplay |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2303 the frame. It has to be, so the frame will have the right size. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2304 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 12661 | 2305 set_frame_menubar (f, 1, 1); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2306 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2307 |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2308 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2309 /* Get rid of the menu bar of frame F, and free its storage. |
| 49322 | 2310 This is used when deleting a frame, and when turning off the menu bar. |
| 2311 For GTK this function is in gtkutil.c. */ | |
| 2312 | |
| 2313 #ifndef USE_GTK | |
|
5897
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2314 void |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2315 free_frame_menubar (f) |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2316 FRAME_PTR f; |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2317 { |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2318 Widget menubar_widget; |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2319 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2320 menubar_widget = f->output_data.x->menubar_widget; |
|
19624
c73494a6bcd3
(free_frame_menubar): Clear menubar_height field.
Richard M. Stallman <rms@gnu.org>
parents:
17709
diff
changeset
|
2321 |
|
c73494a6bcd3
(free_frame_menubar): Clear menubar_height field.
Richard M. Stallman <rms@gnu.org>
parents:
17709
diff
changeset
|
2322 f->output_data.x->menubar_height = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2323 |
|
5897
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2324 if (menubar_widget) |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2325 { |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2326 #ifdef USE_MOTIF |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2327 /* Removing the menu bar magically changes the shell widget's x |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2328 and y position of (0, 0) which, when the menu bar is turned |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2329 on again, leads to pull-down menuss appearing in strange |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2330 positions near the upper-left corner of the display. This |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2331 happens only with some window managers like twm and ctwm, |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2332 but not with other like Motif's mwm or kwm, because the |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2333 latter generate ConfigureNotify events when the menu bar |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2334 is switched off, which fixes the shell position. */ |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2335 Position x0, y0, x1, y1; |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2336 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2337 |
|
5897
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2338 BLOCK_INPUT; |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2339 |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2340 #ifdef USE_MOTIF |
|
37211
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2341 if (f->output_data.x->widget) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2342 XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL); |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2343 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2344 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
2345 lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id); |
|
36457
b0905c60d1ab
(free_frame_menubar): Set the frame's menubar_widget to
Gerd Moellmann <gerd@gnu.org>
parents:
36191
diff
changeset
|
2346 f->output_data.x->menubar_widget = NULL; |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2347 |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2348 #ifdef USE_MOTIF |
|
37211
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2349 if (f->output_data.x->widget) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2350 { |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2351 XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL); |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2352 if (x1 == 0 && y1 == 0) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2353 XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
2354 } |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
2355 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2356 |
|
5897
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2357 UNBLOCK_INPUT; |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2358 } |
|
5a68abc8f1f9
(free_frame_menubar) [USE_X_TOOLKIT]. New function to destroy the X Widget
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5896
diff
changeset
|
2359 } |
| 49322 | 2360 #endif /* not USE_GTK */ |
| 2361 | |
| 2362 #endif /* USE_X_TOOLKIT || USE_GTK */ | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2363 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2364 /* xmenu_show actually displays a menu using the panes and items in menu_items |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2365 and returns the value selected from it. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2366 There are two versions of xmenu_show, one for Xt and one for Xlib. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2367 Both assume input is blocked by the caller. */ |
| 118 | 2368 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2369 /* F is the frame the menu is for. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2370 X and Y are the frame-relative specified position, |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2371 relative to the inside upper left corner of the frame F. |
|
15839
e66ccb471d26
(xmenu_show): Set dummy.state.
Richard M. Stallman <rms@gnu.org>
parents:
15807
diff
changeset
|
2372 FOR_CLICK is nonzero if this menu was invoked for a mouse click. |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2373 KEYMAPS is 1 if this menu was specified with keymaps; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2374 in that case, we return a list containing the chosen item's value |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2375 and perhaps also the pane's prefix. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2376 TITLE is the specified menu title. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2377 ERROR is a place to store an error message string in case of failure. |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2378 (We return nil on failure, but the value doesn't actually matter.) */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2379 |
| 49322 | 2380 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 2381 | |
| 2382 /* The item selected in the popup menu. */ | |
| 2383 static Lisp_Object *volatile menu_item_selection; | |
| 2384 | |
| 2385 #ifdef USE_GTK | |
| 2386 | |
| 2387 /* Used when position a popup menu. See menu_position_func and | |
| 2388 create_and_show_popup_menu below. */ | |
| 2389 struct next_popup_x_y | |
| 2390 { | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2391 FRAME_PTR f; |
| 49322 | 2392 int x; |
| 2393 int y; | |
| 2394 }; | |
| 2395 | |
| 2396 /* The menu position function to use if we are not putting a popup | |
| 2397 menu where the pointer is. | |
| 2398 MENU is the menu to pop up. | |
| 2399 X and Y shall on exit contain x/y where the menu shall pop up. | |
| 2400 PUSH_IN is not documented in the GTK manual. | |
| 2401 USER_DATA is any data passed in when calling gtk_menu_popup. | |
| 2402 Here it points to a struct next_popup_x_y where the coordinates | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2403 to store in *X and *Y are as well as the frame for the popup. |
| 49322 | 2404 |
| 2405 Here only X and Y are used. */ | |
| 2406 static void | |
| 2407 menu_position_func (menu, x, y, push_in, user_data) | |
| 2408 GtkMenu *menu; | |
| 2409 gint *x; | |
| 2410 gint *y; | |
| 2411 gboolean *push_in; | |
| 2412 gpointer user_data; | |
| 2413 { | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2414 struct next_popup_x_y* data = (struct next_popup_x_y*)user_data; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2415 GtkRequisition req; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2416 int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2417 int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height; |
| 58171 | 2418 |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2419 *x = data->x; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2420 *y = data->y; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2421 |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2422 /* Check if there is room for the menu. If not, adjust x/y so that |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2423 the menu is fully visible. */ |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2424 gtk_widget_size_request (GTK_WIDGET (menu), &req); |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2425 if (data->x + req.width > disp_width) |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2426 *x -= data->x + req.width - disp_width; |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2427 if (data->y + req.height > disp_height) |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2428 *y -= data->y + req.height - disp_height; |
| 49322 | 2429 } |
| 2430 | |
| 2431 static void | |
| 2432 popup_selection_callback (widget, client_data) | |
| 2433 GtkWidget *widget; | |
| 2434 gpointer client_data; | |
| 2435 { | |
| 2436 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; | |
| 2437 | |
| 2438 if (xg_crazy_callback_abort) return; | |
| 2439 if (cb_data) menu_item_selection = (Lisp_Object *) cb_data->call_data; | |
| 2440 } | |
| 2441 | |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2442 static Lisp_Object |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2443 pop_down_menu (arg) |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2444 Lisp_Object arg; |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2445 { |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2446 struct Lisp_Save_Value *p = XSAVE_VALUE (arg); |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2447 |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2448 popup_activated_flag = 0; |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2449 BLOCK_INPUT; |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2450 gtk_widget_destroy (GTK_WIDGET (p->pointer)); |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2451 UNBLOCK_INPUT; |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2452 return Qnil; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2453 } |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2454 |
| 49322 | 2455 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the |
| 2456 menu pops down. | |
| 2457 menu_item_selection will be set to the selection. */ | |
| 2458 static void | |
| 2459 create_and_show_popup_menu (f, first_wv, x, y, for_click) | |
| 2460 FRAME_PTR f; | |
| 2461 widget_value *first_wv; | |
| 2462 int x; | |
| 2463 int y; | |
| 2464 int for_click; | |
| 2465 { | |
| 2466 int i; | |
| 2467 GtkWidget *menu; | |
| 2468 GtkMenuPositionFunc pos_func = 0; /* Pop up at pointer. */ | |
| 2469 struct next_popup_x_y popup_x_y; | |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2470 int specpdl_count = SPECPDL_INDEX (); |
| 49322 | 2471 |
| 2472 xg_crazy_callback_abort = 1; | |
| 2473 menu = xg_create_widget ("popup", first_wv->name, f, first_wv, | |
| 2474 G_CALLBACK (popup_selection_callback), | |
| 2475 G_CALLBACK (popup_deactivate_callback), | |
| 2476 G_CALLBACK (menu_highlight_callback)); | |
| 2477 xg_crazy_callback_abort = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2478 |
| 49322 | 2479 if (! for_click) |
| 2480 { | |
| 2481 /* Not invoked by a click. pop up at x/y. */ | |
| 2482 pos_func = menu_position_func; | |
| 2483 | |
| 2484 /* Adjust coordinates to be root-window-relative. */ | |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
2485 x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
2486 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 49322 | 2487 |
| 2488 popup_x_y.x = x; | |
| 2489 popup_x_y.y = y; | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2490 popup_x_y.f = f; |
|
59415
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2491 |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2492 i = 0; /* gtk_menu_popup needs this to be 0 for a non-button popup. */ |
| 49322 | 2493 } |
|
59415
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2494 else |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2495 { |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2496 for (i = 0; i < 5; i++) |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2497 if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2498 break; |
|
72adb36e240f
* xmenu.c (create_and_show_popup_menu): Pass zero as button to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59156
diff
changeset
|
2499 } |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
2500 |
| 49322 | 2501 /* Display the menu. */ |
| 2502 gtk_widget_show_all (menu); | |
| 2503 gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2504 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2505 record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2506 |
|
60890
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2507 if (GTK_WIDGET_MAPPED (menu)) |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2508 { |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2509 /* Set this to one. popup_widget_loop increases it by one, so it becomes |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2510 two. show_help_echo uses this to detect popup menus. */ |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2511 popup_activated_flag = 1; |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2512 /* Process events that apply to the menu. */ |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2513 popup_widget_loop (1, menu); |
|
a48e83530ac6
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
60658
diff
changeset
|
2514 } |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2515 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2516 unbind_to (specpdl_count, Qnil); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2517 |
| 49322 | 2518 /* Must reset this manually because the button release event is not passed |
| 2519 to Emacs event loop. */ | |
| 2520 FRAME_X_DISPLAY_INFO (f)->grabbed = 0; | |
| 2521 } | |
| 2522 | |
| 2523 #else /* not USE_GTK */ | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2524 |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
2525 /* We need a unique id for each widget handled by the Lucid Widget |
|
11918
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
2526 library. |
|
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
2527 |
|
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
2528 For the main windows, and popup menus, we use this counter, |
| 12661 | 2529 which we increment each time after use. This starts from 1<<16. |
|
11918
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
2530 |
| 12661 | 2531 For menu bars, we use numbers starting at 0, counted in |
| 2532 next_menubar_widget_id. */ | |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
2533 LWLIB_ID widget_id_tick; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2534 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2535 static void |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2536 popup_selection_callback (widget, id, client_data) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2537 Widget widget; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2538 LWLIB_ID id; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2539 XtPointer client_data; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2540 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2541 menu_item_selection = (Lisp_Object *) client_data; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2542 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2543 |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2544 /* ARG is the LWLIB ID of the dialog box, represented |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2545 as a Lisp object as (HIGHPART . LOWPART). */ |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2546 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2547 static Lisp_Object |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2548 pop_down_menu (arg) |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2549 Lisp_Object arg; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2550 { |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2551 LWLIB_ID id = (XINT (XCAR (arg)) << 4 * sizeof (LWLIB_ID) |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2552 | XINT (XCDR (arg))); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2553 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2554 BLOCK_INPUT; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2555 lw_destroy_all_widgets (id); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2556 UNBLOCK_INPUT; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2557 popup_activated_flag = 0; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2558 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2559 return Qnil; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2560 } |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2561 |
| 49322 | 2562 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the |
| 2563 menu pops down. | |
| 2564 menu_item_selection will be set to the selection. */ | |
| 2565 static void | |
| 2566 create_and_show_popup_menu (f, first_wv, x, y, for_click) | |
| 2567 FRAME_PTR f; | |
| 2568 widget_value *first_wv; | |
| 2569 int x; | |
| 2570 int y; | |
| 2571 int for_click; | |
| 2572 { | |
| 2573 int i; | |
| 2574 Arg av[2]; | |
| 2575 int ac = 0; | |
| 2576 XButtonPressedEvent dummy; | |
| 2577 LWLIB_ID menu_id; | |
| 2578 Widget menu; | |
| 2579 | |
| 2580 menu_id = widget_id_tick++; | |
| 2581 menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv, | |
| 2582 f->output_data.x->widget, 1, 0, | |
| 2583 popup_selection_callback, | |
| 2584 popup_deactivate_callback, | |
| 2585 menu_highlight_callback); | |
| 2586 | |
| 2587 dummy.type = ButtonPress; | |
| 2588 dummy.serial = 0; | |
| 2589 dummy.send_event = 0; | |
| 2590 dummy.display = FRAME_X_DISPLAY (f); | |
| 2591 dummy.time = CurrentTime; | |
| 2592 dummy.root = FRAME_X_DISPLAY_INFO (f)->root_window; | |
| 2593 dummy.window = dummy.root; | |
| 2594 dummy.subwindow = dummy.root; | |
| 2595 dummy.x = x; | |
| 2596 dummy.y = y; | |
| 2597 | |
| 2598 /* Adjust coordinates to be root-window-relative. */ | |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
2599 x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
2600 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 49322 | 2601 |
| 2602 dummy.x_root = x; | |
| 2603 dummy.y_root = y; | |
| 2604 | |
| 2605 dummy.state = 0; | |
| 2606 dummy.button = 0; | |
| 2607 for (i = 0; i < 5; i++) | |
| 2608 if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) | |
| 2609 dummy.button = i; | |
| 2610 | |
| 2611 /* Don't allow any geometry request from the user. */ | |
| 2612 XtSetArg (av[ac], XtNgeometry, 0); ac++; | |
| 2613 XtSetValues (menu, av, ac); | |
| 2614 | |
| 2615 /* Display the menu. */ | |
| 2616 lw_popup_menu (menu, (XEvent *) &dummy); | |
| 2617 popup_activated_flag = 1; | |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
2618 |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2619 { |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2620 int fact = 4 * sizeof (LWLIB_ID); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2621 int specpdl_count = SPECPDL_INDEX (); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2622 record_unwind_protect (pop_down_menu, |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2623 Fcons (make_number (menu_id >> (fact)), |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2624 make_number (menu_id & ~(-1 << (fact))))); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2625 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2626 /* Process events that apply to the menu. */ |
|
59156
03a6e350cf4d
(popup_get_selection): Remove parameter down_on_keypress.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59155
diff
changeset
|
2627 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1); |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2628 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2629 unbind_to (specpdl_count, Qnil); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2630 } |
| 49322 | 2631 } |
| 2632 | |
| 2633 #endif /* not USE_GTK */ | |
| 2634 | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2635 static Lisp_Object |
|
11491
272baf4a077a
(xmenu_show, xdialog_show): Delete menubarp arg.
Richard M. Stallman <rms@gnu.org>
parents:
11449
diff
changeset
|
2636 xmenu_show (f, x, y, for_click, keymaps, title, error) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2637 FRAME_PTR f; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2638 int x; |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2639 int y; |
|
10757
2829c9840b0e
(xmenu_show, both versions): New arg for_click.
Richard M. Stallman <rms@gnu.org>
parents:
10716
diff
changeset
|
2640 int for_click; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2641 int keymaps; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2642 Lisp_Object title; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2643 char **error; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2644 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2645 int i; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2646 widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2647 widget_value **submenu_stack |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2648 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *)); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2649 Lisp_Object *subprefix_stack |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2650 = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object)); |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2651 int submenu_depth = 0; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2652 |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2653 int first_pane; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2654 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2655 *error = NULL; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2656 |
|
7335
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2657 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2658 { |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2659 *error = "Empty menu"; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2660 return Qnil; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2661 } |
|
5896
b20145eafe0c
(xmenu_show) [USE_X_TOOLKIT]: return Qnil when val is null.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5881
diff
changeset
|
2662 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2663 /* Create a tree of widget_value objects |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2664 representing the panes and their items. */ |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2665 wv = xmalloc_widget_value (); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2666 wv->name = "menu"; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2667 wv->value = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2668 wv->enabled = 1; |
| 24993 | 2669 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2670 wv->help =Qnil; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2671 first_wv = wv; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2672 first_pane = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2673 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2674 /* Loop over all panes and items, filling in the tree. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2675 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2676 while (i < menu_items_used) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2677 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2678 if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2679 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2680 submenu_stack[submenu_depth++] = save_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2681 save_wv = prev_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2682 prev_wv = 0; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2683 first_pane = 1; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2684 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2685 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2686 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2687 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2688 prev_wv = save_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2689 save_wv = submenu_stack[--submenu_depth]; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2690 first_pane = 0; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2691 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2692 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2693 else if (EQ (XVECTOR (menu_items)->contents[i], Qt) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2694 && submenu_depth != 0) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2695 i += MENU_ITEMS_PANE_LENGTH; |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2696 /* Ignore a nil in the item list. |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2697 It's meaningful only for dialog boxes. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2698 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2699 i += 1; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2700 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2701 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2702 /* Create a new pane. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2703 Lisp_Object pane_name, prefix; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2704 char *pane_string; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2705 |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2706 pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2707 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2708 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2709 #ifndef HAVE_MULTILINGUAL_MENU |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2710 if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2711 { |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
2712 pane_name = ENCODE_MENU_STRING (pane_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2713 AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2714 } |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2715 #endif |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2716 pane_string = (NILP (pane_name) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2717 ? "" : (char *) SDATA (pane_name)); |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2718 /* If there is just one top-level pane, put all its items directly |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2719 under the top-level menu. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2720 if (menu_items_n_panes == 1) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2721 pane_string = ""; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2722 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2723 /* If the pane has a meaningful name, |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2724 make the pane a top-level menu item |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2725 with its items as a submenu beneath it. */ |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2726 if (!keymaps && strcmp (pane_string, "")) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2727 { |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2728 wv = xmalloc_widget_value (); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2729 if (save_wv) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2730 save_wv->next = wv; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2731 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2732 first_wv->contents = wv; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2733 wv->name = pane_string; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2734 if (keymaps && !NILP (prefix)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2735 wv->name++; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2736 wv->value = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2737 wv->enabled = 1; |
| 24993 | 2738 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2739 wv->help = Qnil; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2740 save_wv = wv; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2741 prev_wv = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2742 } |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2743 else if (first_pane) |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2744 { |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2745 save_wv = wv; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2746 prev_wv = 0; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2747 } |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
2748 first_pane = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2749 i += MENU_ITEMS_PANE_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2750 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2751 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2752 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2753 /* Create a new item within current pane. */ |
|
30472
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
2754 Lisp_Object item_name, enable, descrip, def, type, selected, help; |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2755 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2756 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2757 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2758 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2759 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2760 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2761 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); |
| 24993 | 2762 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2763 #ifndef HAVE_MULTILINGUAL_MENU |
| 24993 | 2764 if (STRINGP (item_name) && STRING_MULTIBYTE (item_name)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2765 { |
| 51404 | 2766 item_name = ENCODE_MENU_STRING (item_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2767 AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2768 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2769 |
| 24993 | 2770 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2771 { |
| 51404 | 2772 descrip = ENCODE_MENU_STRING (descrip); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2773 AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip; |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2774 } |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37929
diff
changeset
|
2775 #endif /* not HAVE_MULTILINGUAL_MENU */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2776 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2777 wv = xmalloc_widget_value (); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2778 if (prev_wv) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2779 prev_wv->next = wv; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2780 else |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2781 save_wv->contents = wv; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2782 wv->name = (char *) SDATA (item_name); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2783 if (!NILP (descrip)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2784 wv->key = (char *) SDATA (descrip); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2785 wv->value = 0; |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
2786 /* If this item has a null value, |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
2787 make the call_data null so that it won't display a box |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
2788 when the mouse is on it. */ |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
2789 wv->call_data |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
2790 = (!NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2791 wv->enabled = !NILP (enable); |
| 24993 | 2792 |
| 2793 if (NILP (type)) | |
| 2794 wv->button_type = BUTTON_TYPE_NONE; | |
| 2795 else if (EQ (type, QCtoggle)) | |
| 2796 wv->button_type = BUTTON_TYPE_TOGGLE; | |
| 2797 else if (EQ (type, QCradio)) | |
| 2798 wv->button_type = BUTTON_TYPE_RADIO; | |
| 2799 else | |
| 2800 abort (); | |
| 2801 | |
| 2802 wv->selected = !NILP (selected); | |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
2803 |
|
41769
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
2804 if (! STRINGP (help)) |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
2805 help = Qnil; |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
2806 |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
2807 wv->help = help; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
2808 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2809 prev_wv = wv; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2810 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2811 i += MENU_ITEMS_ITEM_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2812 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2813 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2814 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
2815 /* Deal with the title, if it is non-nil. */ |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2816 if (!NILP (title)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2817 { |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2818 widget_value *wv_title = xmalloc_widget_value (); |
|
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2819 widget_value *wv_sep1 = xmalloc_widget_value (); |
|
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2820 widget_value *wv_sep2 = xmalloc_widget_value (); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2821 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2822 wv_sep2->name = "--"; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2823 wv_sep2->next = first_wv->contents; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2824 wv_sep2->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2825 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2826 wv_sep1->name = "--"; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2827 wv_sep1->next = wv_sep2; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2828 wv_sep1->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2829 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2830 #ifndef HAVE_MULTILINGUAL_MENU |
|
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2831 if (STRING_MULTIBYTE (title)) |
| 51404 | 2832 title = ENCODE_MENU_STRING (title); |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
2833 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2834 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2835 wv_title->name = (char *) SDATA (title); |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
2836 wv_title->enabled = TRUE; |
| 24993 | 2837 wv_title->button_type = BUTTON_TYPE_NONE; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2838 wv_title->next = wv_sep1; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2839 wv_title->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2840 first_wv->contents = wv_title; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2841 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2842 |
| 49322 | 2843 /* No selection has been chosen yet. */ |
| 2844 menu_item_selection = 0; | |
| 2845 | |
| 2846 /* Actually create and show the menu until popped down. */ | |
| 2847 create_and_show_popup_menu (f, first_wv, x, y, for_click); | |
|
8414
8a8d2cdd4218
(xmenu_show): Ignore any geometry resource from the user.
Richard M. Stallman <rms@gnu.org>
parents:
8269
diff
changeset
|
2848 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2849 /* Free the widget_value objects we used to specify the contents. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2850 free_menubar_widget_value_tree (first_wv); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2851 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2852 /* Find the selected item, and its pane, to return |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2853 the proper value. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2854 if (menu_item_selection != 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2855 { |
|
11655
a9f93ce6e1b4
(xmenu_show, menubar_selection_callback): Move declaration
Karl Heuer <kwzh@gnu.org>
parents:
11614
diff
changeset
|
2856 Lisp_Object prefix, entry; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2857 |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31465
diff
changeset
|
2858 prefix = entry = Qnil; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2859 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2860 while (i < menu_items_used) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2861 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2862 if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2863 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2864 subprefix_stack[submenu_depth++] = prefix; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2865 prefix = entry; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2866 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2867 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2868 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2869 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2870 prefix = subprefix_stack[--submenu_depth]; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2871 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2872 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2873 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2874 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2875 prefix |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2876 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2877 i += MENU_ITEMS_PANE_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2878 } |
|
13071
2e514396cbc8
(popup_get_selection): Pop menu down if button is pressed
Richard M. Stallman <rms@gnu.org>
parents:
12747
diff
changeset
|
2879 /* Ignore a nil in the item list. |
|
2e514396cbc8
(popup_get_selection): Pop menu down if button is pressed
Richard M. Stallman <rms@gnu.org>
parents:
12747
diff
changeset
|
2880 It's meaningful only for dialog boxes. */ |
|
2e514396cbc8
(popup_get_selection): Pop menu down if button is pressed
Richard M. Stallman <rms@gnu.org>
parents:
12747
diff
changeset
|
2881 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) |
|
2e514396cbc8
(popup_get_selection): Pop menu down if button is pressed
Richard M. Stallman <rms@gnu.org>
parents:
12747
diff
changeset
|
2882 i += 1; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2883 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2884 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2885 entry |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2886 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2887 if (menu_item_selection == &XVECTOR (menu_items)->contents[i]) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2888 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2889 if (keymaps != 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2890 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2891 int j; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2892 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2893 entry = Fcons (entry, Qnil); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2894 if (!NILP (prefix)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2895 entry = Fcons (prefix, entry); |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
2896 for (j = submenu_depth - 1; j >= 0; j--) |
|
6931
2d0ee7ef620a
(xmenu_show): Fix typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
6913
diff
changeset
|
2897 if (!NILP (subprefix_stack[j])) |
|
6913
f167828a3ec2
(xmenu_show): Don't cons on subprefix_stck[j] if nil.
Richard M. Stallman <rms@gnu.org>
parents:
6881
diff
changeset
|
2898 entry = Fcons (subprefix_stack[j], entry); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2899 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2900 return entry; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2901 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2902 i += MENU_ITEMS_ITEM_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2903 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2904 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2905 } |
|
61984
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
2906 else if (!for_click) |
|
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
2907 /* Make "Cancel" equivalent to C-g. */ |
|
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
2908 Fsignal (Qquit, Qnil); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2909 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2910 return Qnil; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2911 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2912 |
| 49322 | 2913 #ifdef USE_GTK |
| 2914 static void | |
| 2915 dialog_selection_callback (widget, client_data) | |
| 2916 GtkWidget *widget; | |
| 2917 gpointer client_data; | |
| 2918 { | |
| 2919 /* The EMACS_INT cast avoids a warning. There's no problem | |
| 2920 as long as pointers have enough bits to hold small integers. */ | |
| 2921 if ((int) (EMACS_INT) client_data != -1) | |
| 2922 menu_item_selection = (Lisp_Object *) client_data; | |
| 2923 | |
| 2924 popup_activated_flag = 0; | |
| 2925 } | |
| 2926 | |
| 2927 /* Pop up the dialog for frame F defined by FIRST_WV and loop until the | |
| 2928 dialog pops down. | |
| 2929 menu_item_selection will be set to the selection. */ | |
| 2930 static void | |
| 2931 create_and_show_dialog (f, first_wv) | |
| 2932 FRAME_PTR f; | |
| 2933 widget_value *first_wv; | |
| 2934 { | |
| 2935 GtkWidget *menu; | |
| 2936 | |
| 2937 menu = xg_create_widget ("dialog", first_wv->name, f, first_wv, | |
| 2938 G_CALLBACK (dialog_selection_callback), | |
| 2939 G_CALLBACK (popup_deactivate_callback), | |
| 2940 0); | |
| 2941 | |
| 2942 if (menu) | |
| 2943 { | |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2944 int specpdl_count = SPECPDL_INDEX (); |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2945 record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2946 |
| 49322 | 2947 /* Display the menu. */ |
| 2948 gtk_widget_show_all (menu); | |
| 2949 | |
| 2950 /* Process events that apply to the menu. */ | |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
2951 popup_widget_loop (1, menu); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2952 |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
2953 unbind_to (specpdl_count, Qnil); |
| 49322 | 2954 } |
| 2955 } | |
| 2956 | |
| 2957 #else /* not USE_GTK */ | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2958 static void |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2959 dialog_selection_callback (widget, id, client_data) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2960 Widget widget; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2961 LWLIB_ID id; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2962 XtPointer client_data; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2963 { |
|
11266
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
2964 /* The EMACS_INT cast avoids a warning. There's no problem |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
2965 as long as pointers have enough bits to hold small integers. */ |
|
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
2966 if ((int) (EMACS_INT) client_data != -1) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2967 menu_item_selection = (Lisp_Object *) client_data; |
| 49322 | 2968 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2969 BLOCK_INPUT; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2970 lw_destroy_all_widgets (id); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2971 UNBLOCK_INPUT; |
|
11614
fdd0d5bdd8c6
(popup_get_selection): Use x_non_menubar_window_to_frame.
Karl Heuer <kwzh@gnu.org>
parents:
11528
diff
changeset
|
2972 popup_activated_flag = 0; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2973 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2974 |
| 49322 | 2975 |
| 2976 /* Pop up the dialog for frame F defined by FIRST_WV and loop until the | |
| 2977 dialog pops down. | |
| 2978 menu_item_selection will be set to the selection. */ | |
| 2979 static void | |
| 2980 create_and_show_dialog (f, first_wv) | |
| 2981 FRAME_PTR f; | |
| 2982 widget_value *first_wv; | |
| 2983 { | |
| 2984 LWLIB_ID dialog_id; | |
| 2985 | |
| 2986 dialog_id = widget_id_tick++; | |
| 2987 lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv, | |
| 2988 f->output_data.x->widget, 1, 0, | |
| 2989 dialog_selection_callback, 0, 0); | |
| 2990 lw_modify_all_widgets (dialog_id, first_wv->contents, True); | |
| 2991 | |
| 2992 /* Display the dialog box. */ | |
| 2993 lw_pop_up_all_widgets (dialog_id); | |
| 2994 popup_activated_flag = 1; | |
| 2995 | |
| 2996 /* Process events that apply to the dialog box. | |
| 2997 Also handle timers. */ | |
| 2998 { | |
| 2999 int count = SPECPDL_INDEX (); | |
| 3000 int fact = 4 * sizeof (LWLIB_ID); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3001 |
| 49322 | 3002 /* xdialog_show_unwind is responsible for popping the dialog box down. */ |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3003 record_unwind_protect (pop_down_menu, |
| 49322 | 3004 Fcons (make_number (dialog_id >> (fact)), |
| 3005 make_number (dialog_id & ~(-1 << (fact))))); | |
| 3006 | |
|
57965
9b14127a651a
* eval.c (Feval): Remove check for INPUT_BLOCKED_P.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57928
diff
changeset
|
3007 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), |
|
59156
03a6e350cf4d
(popup_get_selection): Remove parameter down_on_keypress.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59155
diff
changeset
|
3008 dialog_id, 1); |
| 49322 | 3009 |
| 3010 unbind_to (count, Qnil); | |
| 3011 } | |
| 3012 } | |
| 3013 | |
| 3014 #endif /* not USE_GTK */ | |
| 3015 | |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3016 static char * button_names [] = { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3017 "button1", "button2", "button3", "button4", "button5", |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3018 "button6", "button7", "button8", "button9", "button10" }; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3019 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3020 static Lisp_Object |
|
11491
272baf4a077a
(xmenu_show, xdialog_show): Delete menubarp arg.
Richard M. Stallman <rms@gnu.org>
parents:
11449
diff
changeset
|
3021 xdialog_show (f, keymaps, title, error) |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3022 FRAME_PTR f; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3023 int keymaps; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3024 Lisp_Object title; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3025 char **error; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3026 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3027 int i, nb_buttons=0; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3028 char dialog_name[6]; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3029 |
|
25730
db88a4b84d91
(single_menu_item, Fx_popup_menu, Fx_popup_menu,
Gerd Moellmann <gerd@gnu.org>
parents:
25680
diff
changeset
|
3030 widget_value *wv, *first_wv = 0, *prev_wv = 0; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3031 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3032 /* Number of elements seen so far, before boundary. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3033 int left_count = 0; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3034 /* 1 means we've seen the boundary between left-hand elts and right-hand. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3035 int boundary_seen = 0; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3036 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3037 *error = NULL; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3038 |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3039 if (menu_items_n_panes > 1) |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3040 { |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3041 *error = "Multiple panes in dialog box"; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3042 return Qnil; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3043 } |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3044 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3045 /* Create a tree of widget_value objects |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3046 representing the text label and buttons. */ |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3047 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3048 Lisp_Object pane_name, prefix; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3049 char *pane_string; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3050 pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3051 prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3052 pane_string = (NILP (pane_name) |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3053 ? "" : (char *) SDATA (pane_name)); |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
3054 prev_wv = xmalloc_widget_value (); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3055 prev_wv->value = pane_string; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3056 if (keymaps && !NILP (prefix)) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3057 prev_wv->name++; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3058 prev_wv->enabled = 1; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3059 prev_wv->name = "message"; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
3060 prev_wv->help = Qnil; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3061 first_wv = prev_wv; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3062 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3063 /* Loop over all panes and items, filling in the tree. */ |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3064 i = MENU_ITEMS_PANE_LENGTH; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3065 while (i < menu_items_used) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3066 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3067 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3068 /* Create a new item within current pane. */ |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3069 Lisp_Object item_name, enable, descrip; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3070 item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3071 enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3072 descrip |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3073 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3074 |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3075 if (NILP (item_name)) |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3076 { |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3077 free_menubar_widget_value_tree (first_wv); |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3078 *error = "Submenu in dialog items"; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3079 return Qnil; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3080 } |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3081 if (EQ (item_name, Qquote)) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3082 { |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3083 /* This is the boundary between left-side elts |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3084 and right-side elts. Stop incrementing right_count. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3085 boundary_seen = 1; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3086 i++; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3087 continue; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3088 } |
|
15912
afb0bb1cdbe6
(xdialog_show): Don't allow 9 buttons.
Richard M. Stallman <rms@gnu.org>
parents:
15839
diff
changeset
|
3089 if (nb_buttons >= 9) |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3090 { |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3091 free_menubar_widget_value_tree (first_wv); |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3092 *error = "Too many dialog items"; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3093 return Qnil; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3094 } |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3095 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
3096 wv = xmalloc_widget_value (); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3097 prev_wv->next = wv; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3098 wv->name = (char *) button_names[nb_buttons]; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3099 if (!NILP (descrip)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3100 wv->key = (char *) SDATA (descrip); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3101 wv->value = (char *) SDATA (item_name); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3102 wv->call_data = (void *) &XVECTOR (menu_items)->contents[i]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3103 wv->enabled = !NILP (enable); |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
3104 wv->help = Qnil; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3105 prev_wv = wv; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3106 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3107 if (! boundary_seen) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3108 left_count++; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3109 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3110 nb_buttons++; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3111 i += MENU_ITEMS_ITEM_LENGTH; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3112 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3113 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3114 /* If the boundary was not specified, |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3115 by default put half on the left and half on the right. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3116 if (! boundary_seen) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3117 left_count = nb_buttons - nb_buttons / 2; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3118 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
3119 wv = xmalloc_widget_value (); |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3120 wv->name = dialog_name; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
3121 wv->help = Qnil; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3122 /* Dialog boxes use a really stupid name encoding |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3123 which specifies how many buttons to use |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3124 and how many buttons are on the right. |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3125 The Q means something also. */ |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3126 dialog_name[0] = 'Q'; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3127 dialog_name[1] = '0' + nb_buttons; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3128 dialog_name[2] = 'B'; |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3129 dialog_name[3] = 'R'; |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3130 /* Number of buttons to put on the right. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3131 dialog_name[4] = '0' + nb_buttons - left_count; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
3132 dialog_name[5] = 0; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3133 wv->contents = first_wv; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3134 first_wv = wv; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3135 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3136 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3137 /* No selection has been chosen yet. */ |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3138 menu_item_selection = 0; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3139 |
| 49322 | 3140 /* Actually create and show the dialog. */ |
| 3141 create_and_show_dialog (f, first_wv); | |
| 3142 | |
| 3143 /* Free the widget_value objects we used to specify the contents. */ | |
| 3144 free_menubar_widget_value_tree (first_wv); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3145 |
| 49322 | 3146 /* Find the selected item, and its pane, to return |
| 3147 the proper value. */ | |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3148 if (menu_item_selection != 0) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3149 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3150 Lisp_Object prefix; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3151 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3152 prefix = Qnil; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3153 i = 0; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3154 while (i < menu_items_used) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3155 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3156 Lisp_Object entry; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3157 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3158 if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3159 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3160 prefix |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3161 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3162 i += MENU_ITEMS_PANE_LENGTH; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3163 } |
|
31465
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3164 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3165 { |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3166 /* This is the boundary between left-side elts and |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3167 right-side elts. */ |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3168 ++i; |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
3169 } |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3170 else |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3171 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3172 entry |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3173 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3174 if (menu_item_selection == &XVECTOR (menu_items)->contents[i]) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3175 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3176 if (keymaps != 0) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3177 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3178 entry = Fcons (entry, Qnil); |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3179 if (!NILP (prefix)) |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3180 entry = Fcons (prefix, entry); |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3181 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3182 return entry; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3183 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3184 i += MENU_ITEMS_ITEM_LENGTH; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3185 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3186 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3187 } |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3188 else |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3189 /* Make "Cancel" equivalent to C-g. */ |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3190 Fsignal (Qquit, Qnil); |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3191 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3192 return Qnil; |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3193 } |
|
30299
f2cd2bf063c9
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30215
diff
changeset
|
3194 |
| 49322 | 3195 #else /* not USE_X_TOOLKIT && not USE_GTK */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3196 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3197 /* The frame of the last activated non-toolkit menu bar. |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3198 Used to generate menu help events. */ |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3199 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3200 static struct frame *menu_help_frame; |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3201 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3202 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3203 /* Show help HELP_STRING, or clear help if HELP_STRING is null. |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3204 |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3205 PANE is the pane number, and ITEM is the menu item number in |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3206 the menu (currently not used). |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3207 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3208 This cannot be done with generating a HELP_EVENT because |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3209 XMenuActivate contains a loop that doesn't let Emacs process |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3210 keyboard events. */ |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3211 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3212 static void |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3213 menu_help_callback (help_string, pane, item) |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3214 char *help_string; |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3215 int pane, item; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3216 { |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3217 extern Lisp_Object Qmenu_item; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3218 Lisp_Object *first_item; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3219 Lisp_Object pane_name; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3220 Lisp_Object menu_object; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3221 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3222 first_item = XVECTOR (menu_items)->contents; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3223 if (EQ (first_item[0], Qt)) |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3224 pane_name = first_item[MENU_ITEMS_PANE_NAME]; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3225 else if (EQ (first_item[0], Qquote)) |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3226 /* This shouldn't happen, see xmenu_show. */ |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
3227 pane_name = empty_string; |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3228 else |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3229 pane_name = first_item[MENU_ITEMS_ITEM_NAME]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3230 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3231 /* (menu-item MENU-NAME PANE-NUMBER) */ |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3232 menu_object = Fcons (Qmenu_item, |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3233 Fcons (pane_name, |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3234 Fcons (make_number (pane), Qnil))); |
|
30299
f2cd2bf063c9
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30215
diff
changeset
|
3235 show_help_echo (help_string ? build_string (help_string) : Qnil, |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
3236 Qnil, menu_object, make_number (item), 1); |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3237 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3238 |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3239 static Lisp_Object |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3240 pop_down_menu (arg) |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3241 Lisp_Object arg; |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3242 { |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3243 struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3244 struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
3245 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3246 FRAME_PTR f = p1->pointer; |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3247 XMenu *menu = p2->pointer; |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3248 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3249 BLOCK_INPUT; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3250 #ifndef MSDOS |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3251 XUngrabPointer (FRAME_X_DISPLAY (f), CurrentTime); |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3252 XUngrabKeyboard (FRAME_X_DISPLAY (f), CurrentTime); |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3253 #endif |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3254 XMenuDestroy (FRAME_X_DISPLAY (f), menu); |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3255 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3256 #ifdef HAVE_X_WINDOWS |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3257 /* Assume the mouse has moved out of the X window. |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3258 If it has actually moved in, we will get an EnterNotify. */ |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3259 x_mouse_leave (FRAME_X_DISPLAY_INFO (f)); |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3260 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3261 /* State that no mouse buttons are now held. |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3262 (The oldXMenu code doesn't track this info for us.) |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3263 That is not necessarily true, but the fiction leads to reasonable |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3264 results, and it is a pain to ask which are actually held now. */ |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3265 FRAME_X_DISPLAY_INFO (f)->grabbed = 0; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3266 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3267 #endif /* HAVE_X_WINDOWS */ |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3268 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3269 UNBLOCK_INPUT; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3270 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3271 return Qnil; |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3272 } |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3273 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3274 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3275 static Lisp_Object |
|
11491
272baf4a077a
(xmenu_show, xdialog_show): Delete menubarp arg.
Richard M. Stallman <rms@gnu.org>
parents:
11449
diff
changeset
|
3276 xmenu_show (f, x, y, for_click, keymaps, title, error) |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3277 FRAME_PTR f; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3278 int x, y; |
|
10757
2829c9840b0e
(xmenu_show, both versions): New arg for_click.
Richard M. Stallman <rms@gnu.org>
parents:
10716
diff
changeset
|
3279 int for_click; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3280 int keymaps; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3281 Lisp_Object title; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3282 char **error; |
| 118 | 3283 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3284 Window root; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3285 XMenu *menu; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3286 int pane, selidx, lpane, status; |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3287 Lisp_Object entry, pane_prefix; |
| 118 | 3288 char *datap; |
| 3289 int ulx, uly, width, height; | |
| 3290 int dispwidth, dispheight; | |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3291 int i, j, lines, maxlines; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3292 int maxwidth; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3293 int dummy_int; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3294 unsigned int dummy_uint; |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3295 int specpdl_count = SPECPDL_INDEX (); |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
3296 |
|
3747
6506b2fd475a
(xmenu_show): Store 0 in *ERROR at the beginning.
Richard M. Stallman <rms@gnu.org>
parents:
3501
diff
changeset
|
3297 *error = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3298 if (menu_items_n_panes == 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3299 return Qnil; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
3300 |
|
7335
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3301 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3302 { |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3303 *error = "Empty menu"; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3304 return Qnil; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3305 } |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
3306 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3307 /* Figure out which root window F is on. */ |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3308 XGetGeometry (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &root, |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3309 &dummy_int, &dummy_int, &dummy_uint, &dummy_uint, |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3310 &dummy_uint, &dummy_uint); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
3311 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3312 /* Make the menu on that window. */ |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3313 menu = XMenuCreate (FRAME_X_DISPLAY (f), root, "emacs"); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3314 if (menu == NULL) |
| 118 | 3315 { |
| 3316 *error = "Can't create menu"; | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3317 return Qnil; |
| 118 | 3318 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3319 |
| 9572 | 3320 #ifdef HAVE_X_WINDOWS |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3321 /* Adjust coordinates to relative to the outer (window manager) window. */ |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3322 x += FRAME_OUTER_TO_INNER_DIFF_X (f); |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3323 y += FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 9572 | 3324 #endif /* HAVE_X_WINDOWS */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3325 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3326 /* Adjust coordinates to be root-window-relative. */ |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
3327 x += f->left_pos; |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
3328 y += f->top_pos; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3329 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3330 /* Create all the necessary panes and their items. */ |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3331 maxlines = lines = i = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3332 while (i < menu_items_used) |
| 118 | 3333 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3334 if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
| 118 | 3335 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3336 /* Create a new pane. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3337 Lisp_Object pane_name, prefix; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3338 char *pane_string; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3339 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3340 maxlines = max (maxlines, lines); |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3341 lines = 0; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3342 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3343 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3344 pane_string = (NILP (pane_name) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3345 ? "" : (char *) SDATA (pane_name)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3346 if (keymaps && !NILP (prefix)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3347 pane_string++; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3348 |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3349 lpane = XMenuAddPane (FRAME_X_DISPLAY (f), menu, pane_string, TRUE); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3350 if (lpane == XM_FAILURE) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3351 { |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3352 XMenuDestroy (FRAME_X_DISPLAY (f), menu); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3353 *error = "Can't create pane"; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3354 return Qnil; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3355 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3356 i += MENU_ITEMS_PANE_LENGTH; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3357 |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3358 /* Find the width of the widest item in this pane. */ |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3359 maxwidth = 0; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3360 j = i; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3361 while (j < menu_items_used) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3362 { |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3363 Lisp_Object item; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3364 item = XVECTOR (menu_items)->contents[j]; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3365 if (EQ (item, Qt)) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3366 break; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3367 if (NILP (item)) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3368 { |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3369 j++; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3370 continue; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3371 } |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3372 width = SBYTES (item); |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3373 if (width > maxwidth) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3374 maxwidth = width; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3375 |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3376 j += MENU_ITEMS_ITEM_LENGTH; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3377 } |
| 118 | 3378 } |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3379 /* Ignore a nil in the item list. |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3380 It's meaningful only for dialog boxes. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3381 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
3382 i += 1; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3383 else |
| 118 | 3384 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3385 /* Create a new item within current pane. */ |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3386 Lisp_Object item_name, enable, descrip, help; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3387 unsigned char *item_data; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3388 char *help_string; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3389 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3390 item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3391 enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3392 descrip |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3393 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3394 help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3395 help_string = STRINGP (help) ? SDATA (help) : NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3396 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3397 if (!NILP (descrip)) |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3398 { |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3399 int gap = maxwidth - SBYTES (item_name); |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3400 #ifdef C_ALLOCA |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3401 Lisp_Object spacer; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3402 spacer = Fmake_string (make_number (gap), make_number (' ')); |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3403 item_name = concat2 (item_name, spacer); |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3404 item_name = concat2 (item_name, descrip); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3405 item_data = SDATA (item_name); |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3406 #else |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3407 /* if alloca is fast, use that to make the space, |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3408 to reduce gc needs. */ |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3409 item_data |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3410 = (unsigned char *) alloca (maxwidth |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3411 + SBYTES (descrip) + 1); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3412 bcopy (SDATA (item_name), item_data, |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3413 SBYTES (item_name)); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3414 for (j = SCHARS (item_name); j < maxwidth; j++) |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3415 item_data[j] = ' '; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3416 bcopy (SDATA (descrip), item_data + j, |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3417 SBYTES (descrip)); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3418 item_data[j + SBYTES (descrip)] = 0; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3419 #endif |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3420 } |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3421 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3422 item_data = SDATA (item_name); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3423 |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3424 if (XMenuAddSelection (FRAME_X_DISPLAY (f), |
|
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3425 menu, lpane, 0, item_data, |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3426 !NILP (enable), help_string) |
| 118 | 3427 == XM_FAILURE) |
| 3428 { | |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3429 XMenuDestroy (FRAME_X_DISPLAY (f), menu); |
| 118 | 3430 *error = "Can't add selection to menu"; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3431 return Qnil; |
| 118 | 3432 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3433 i += MENU_ITEMS_ITEM_LENGTH; |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3434 lines++; |
| 118 | 3435 } |
| 3436 } | |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
3437 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3438 maxlines = max (maxlines, lines); |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3439 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3440 /* All set and ready to fly. */ |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3441 XMenuRecompute (FRAME_X_DISPLAY (f), menu); |
|
37255
ff709975abaf
(xmenu_show): Use FRAME_X_SCREEN_NUMBER.
Gerd Moellmann <gerd@gnu.org>
parents:
37211
diff
changeset
|
3442 dispwidth = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)); |
|
ff709975abaf
(xmenu_show): Use FRAME_X_SCREEN_NUMBER.
Gerd Moellmann <gerd@gnu.org>
parents:
37211
diff
changeset
|
3443 dispheight = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3444 x = min (x, dispwidth); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3445 y = min (y, dispheight); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3446 x = max (x, 1); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3447 y = max (y, 1); |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3448 XMenuLocate (FRAME_X_DISPLAY (f), menu, 0, 0, x, y, |
| 118 | 3449 &ulx, &uly, &width, &height); |
| 3450 if (ulx+width > dispwidth) | |
| 3451 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3452 x -= (ulx + width) - dispwidth; |
| 118 | 3453 ulx = dispwidth - width; |
| 3454 } | |
| 3455 if (uly+height > dispheight) | |
| 3456 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3457 y -= (uly + height) - dispheight; |
| 118 | 3458 uly = dispheight - height; |
| 3459 } | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3460 if (ulx < 0) x -= ulx; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3461 if (uly < 0) y -= uly; |
|
6526
95661fd7a320
(xmenu_show): Enable asynchronous events.
Karl Heuer <kwzh@gnu.org>
parents:
6481
diff
changeset
|
3462 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3463 if (! for_click) |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3464 { |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3465 /* If position was not given by a mouse click, adjust so upper left |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3466 corner of the menu as a whole ends up at given coordinates. This |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3467 is what x-popup-menu says in its documentation. */ |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3468 x += width/2; |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3469 y += 1.5*height/(maxlines+2); |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3470 } |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
3471 |
|
6526
95661fd7a320
(xmenu_show): Enable asynchronous events.
Karl Heuer <kwzh@gnu.org>
parents:
6481
diff
changeset
|
3472 XMenuSetAEQ (menu, TRUE); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3473 XMenuSetFreeze (menu, TRUE); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3474 pane = selidx = 0; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3475 |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
3476 #ifndef MSDOS |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
3477 XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f)); |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
3478 #endif |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
3479 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3480 record_unwind_protect (pop_down_menu, |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3481 Fcons (make_save_value (f, 0), |
|
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
3482 make_save_value (menu, 0))); |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
3483 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3484 /* Help display under X won't work because XMenuActivate contains |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3485 a loop that doesn't give Emacs a chance to process it. */ |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
3486 menu_help_frame = f; |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3487 status = XMenuActivate (FRAME_X_DISPLAY (f), menu, &pane, &selidx, |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3488 x, y, ButtonReleaseMask, &datap, |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3489 menu_help_callback); |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
3490 |
| 118 | 3491 switch (status) |
| 3492 { | |
| 3493 case XM_SUCCESS: | |
| 3494 #ifdef XDEBUG | |
| 3495 fprintf (stderr, "pane= %d line = %d\n", panes, selidx); | |
| 3496 #endif | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3497 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3498 /* Find the item number SELIDX in pane number PANE. */ |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3499 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3500 while (i < menu_items_used) |
|
2747
f258c79c9162
(Fx_popup_menu): Add a vector of prefix keys for the panes.
Richard M. Stallman <rms@gnu.org>
parents:
2514
diff
changeset
|
3501 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3502 if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3503 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3504 if (pane == 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3505 pane_prefix |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3506 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3507 pane--; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3508 i += MENU_ITEMS_PANE_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3509 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3510 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3511 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3512 if (pane == -1) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3513 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3514 if (selidx == 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3515 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3516 entry |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3517 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3518 if (keymaps != 0) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3519 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3520 entry = Fcons (entry, Qnil); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3521 if (!NILP (pane_prefix)) |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3522 entry = Fcons (pane_prefix, entry); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3523 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3524 break; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3525 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3526 selidx--; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3527 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3528 i += MENU_ITEMS_ITEM_LENGTH; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3529 } |
|
2747
f258c79c9162
(Fx_popup_menu): Add a vector of prefix keys for the panes.
Richard M. Stallman <rms@gnu.org>
parents:
2514
diff
changeset
|
3530 } |
| 118 | 3531 break; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3532 |
| 118 | 3533 case XM_FAILURE: |
| 3534 *error = "Can't activate menu"; | |
| 3535 case XM_IA_SELECT: | |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3536 entry = Qnil; |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3537 break; |
| 118 | 3538 case XM_NO_SELECT: |
|
61984
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
3539 /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means |
|
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
3540 the menu was invoked with a mouse event as POSITION). */ |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3541 if (! for_click) |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
3542 Fsignal (Qquit, Qnil); |
| 118 | 3543 entry = Qnil; |
| 3544 break; | |
| 3545 } | |
|
58197
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3546 |
|
6c24ca598cb1
* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58171
diff
changeset
|
3547 unbind_to (specpdl_count, Qnil); |
|
7208
2d3c771ff861
(xdialog_show): Clear x_mouse_grabbed.
Richard M. Stallman <rms@gnu.org>
parents:
7175
diff
changeset
|
3548 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3549 return entry; |
| 118 | 3550 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
3551 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
3552 #endif /* not USE_X_TOOLKIT */ |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
3553 |
|
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
3554 #endif /* HAVE_MENUS */ |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3555 |
| 21514 | 3556 void |
| 118 | 3557 syms_of_xmenu () |
| 3558 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3559 staticpro (&menu_items); |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3560 menu_items = Qnil; |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
3561 menu_items_inuse = Qnil; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
3562 |
|
12625
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
3563 Qdebug_on_next_call = intern ("debug-on-next-call"); |
|
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
3564 staticpro (&Qdebug_on_next_call); |
|
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
3565 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
3566 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame, |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
3567 doc: /* Frame for which we are updating a menu. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
3568 The enable predicate for a menu command should check this variable. */); |
|
16656
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
3569 Vmenu_updating_frame = Qnil; |
|
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
3570 |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
3571 #ifdef USE_X_TOOLKIT |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3572 widget_id_tick = (1<<16); |
| 12661 | 3573 next_menubar_widget_id = 1; |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
3574 #endif |
|
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
3575 |
| 118 | 3576 defsubr (&Sx_popup_menu); |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
3577 #ifdef HAVE_MENUS |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
3578 defsubr (&Sx_popup_dialog); |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
3579 #endif |
| 118 | 3580 } |
| 52401 | 3581 |
| 3582 /* arch-tag: 92ea573c-398e-496e-ac73-2436f7d63242 | |
| 3583 (do not change this comment) */ |
