Mercurial > emacs
annotate src/xmenu.c @ 109391:a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
* src/xdisp.c (pending_menu_activation): Remove extern declaration.
(prepare_menu_bars): Remove setting of pending_menu_activation.
* src/xmenu.c (pending_menu_activation): Remove.
(x_activate_menubar): Set popup_activated_flag for Xt also. Remove
setting of pending_menu_activation.
(set_frame_menubar): Remove check of pending_menu_activation.
Declare menubar_size before code. Correct spelling in comment.
* src/xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
(SET_SAVED_KEY_EVENT): Remove (not used).
(SET_SAVED_MENU_EVENT): Rename to SET_SAVED_BUTTON_EVENT and
remove size parameter.
(handle_one_xevent): Check popup_activated () for menu for Xt also.
Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
ButtonRelease.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 14 Jul 2010 16:32:25 +0200 |
| parents | 88a5b905a895 |
| children | f8f118e78387 |
| rev | line source |
|---|---|
| 118 | 1 /* X Communication module for terminals which understand the X protocol. |
|
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, |
| 106815 | 3 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 118 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94005
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
| 118 | 8 it under the terms of the GNU General Public License as published by |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94005
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
|
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94005
diff
changeset
|
10 (at your option) any later version. |
| 118 | 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 | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94005
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 118 | 19 |
|
40239
5fda2888718a
Spell the name of Emacs properly (GNU Emacs instead of gnuemacs).
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
20 /* X pop-up deck-of-cards menu facility for GNU Emacs. |
| 118 | 21 * |
| 22 * Written by Jon Arnold and Roman Budzianowski | |
| 23 * Mods and rewrite by Robert Krawitz | |
| 24 * | |
| 25 */ | |
| 26 | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
27 /* 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
|
28 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
|
29 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
30 /* 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
|
31 |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26036
diff
changeset
|
32 #include <config.h> |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26036
diff
changeset
|
33 |
|
62216
0c2ce5566afa
Don't include signal.h.
Richard M. Stallman <rms@gnu.org>
parents:
62090
diff
changeset
|
34 #if 0 /* Why was this included? And without syssignal.h? */ |
| 118 | 35 /* On 4.3 this loses if it comes after xterm.h. */ |
| 36 #include <signal.h> | |
|
62216
0c2ce5566afa
Don't include signal.h.
Richard M. Stallman <rms@gnu.org>
parents:
62090
diff
changeset
|
37 #endif |
|
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> |
|
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
102628
diff
changeset
|
40 #include <setjmp.h> |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39914
diff
changeset
|
41 |
| 118 | 42 #include "lisp.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" |
|
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
53325
diff
changeset
|
46 #include "termhooks.h" |
| 118 | 47 #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
|
48 #include "blockinput.h" |
| 12661 | 49 #include "buffer.h" |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
50 #include "charset.h" |
|
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
51 #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
|
52 #include "sysselect.h" |
| 118 | 53 |
|
10502
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
54 #ifdef MSDOS |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
55 #include "msdos.h" |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
56 #endif |
|
1b08df5c5e4a
[MSDOS]: #include msdos.h.
Richard M. Stallman <rms@gnu.org>
parents:
10167
diff
changeset
|
57 |
| 9572 | 58 #ifdef HAVE_X_WINDOWS |
| 118 | 59 /* This may include sys/types.h, and that somehow loses |
| 60 if this is not done before the other system files. */ | |
| 61 #include "xterm.h" | |
| 9572 | 62 #endif |
| 118 | 63 |
| 64 /* Load sys/types.h if not already loaded. | |
| 65 In some systems loading it twice is suicidal. */ | |
| 66 #ifndef makedev | |
| 67 #include <sys/types.h> | |
| 68 #endif | |
| 69 | |
| 70 #include "dispextern.h" | |
| 71 | |
| 9572 | 72 #ifdef HAVE_X_WINDOWS |
| 51404 | 73 /* Defining HAVE_MULTILINGUAL_MENU would mean that the toolkit menu |
| 74 code accepts the Emacs internal encoding. */ | |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
75 #undef HAVE_MULTILINGUAL_MENU |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
76 #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
|
77 #include "widget.h" |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
78 #include <X11/Xlib.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
79 #include <X11/IntrinsicP.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
80 #include <X11/CoreP.h> |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
81 #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
|
82 #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
|
83 #ifdef USE_LUCID |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
84 #include "xsettings.h" |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
85 #include "../lwlib/xlwmenu.h" |
|
81370
a5376379eaae
Link to xaw3d if available.
Chong Yidong <cyd@stupidchicken.com>
parents:
81273
diff
changeset
|
86 #ifdef HAVE_XAW3D |
|
a5376379eaae
Link to xaw3d if available.
Chong Yidong <cyd@stupidchicken.com>
parents:
81273
diff
changeset
|
87 #include <X11/Xaw3d/Paned.h> |
|
a5376379eaae
Link to xaw3d if available.
Chong Yidong <cyd@stupidchicken.com>
parents:
81273
diff
changeset
|
88 #else /* !HAVE_XAW3D */ |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
89 #include <X11/Xaw/Paned.h> |
|
81370
a5376379eaae
Link to xaw3d if available.
Chong Yidong <cyd@stupidchicken.com>
parents:
81273
diff
changeset
|
90 #endif /* HAVE_XAW3D */ |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
91 #endif /* USE_LUCID */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
92 #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
|
93 #else /* not USE_X_TOOLKIT */ |
| 49322 | 94 #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
|
95 #include "../oldXMenu/XMenu.h" |
| 49322 | 96 #endif |
|
10167
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
97 #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
|
98 #endif /* HAVE_X_WINDOWS */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
99 |
| 96608 | 100 #ifdef USE_GTK |
| 101 #include "gtkutil.h" | |
| 102 #endif | |
| 103 | |
| 104 #include "menu.h" | |
| 105 | |
| 118 | 106 #ifndef TRUE |
| 107 #define TRUE 1 | |
| 108 #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
|
109 #endif /* no TRUE */ |
| 118 | 110 |
|
12625
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
111 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
|
112 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
113 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
|
114 |
|
21242
10e1764f84b8
Don't include puresize.h any more as code that needs it
Richard M. Stallman <rms@gnu.org>
parents:
21178
diff
changeset
|
115 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
|
116 |
| 12661 | 117 extern Lisp_Object Voverriding_local_map; |
| 118 extern Lisp_Object Voverriding_local_map_menu_flag; | |
| 119 | |
| 120 extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; | |
| 121 | |
| 122 extern Lisp_Object Qmenu_bar_update_hook; | |
| 123 | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
124 #ifdef USE_X_TOOLKIT |
|
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
125 extern void set_frame_menubar (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
|
126 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
|
127 |
|
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
128 static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
129 char **); |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
130 static void popup_get_selection (XEvent *, struct x_display_info *, |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
131 LWLIB_ID, int); |
| 49322 | 132 #endif /* USE_X_TOOLKIT */ |
| 133 | |
| 134 #ifdef USE_GTK | |
|
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
135 extern void set_frame_menubar (FRAME_PTR, int, int); |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
136 static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
137 char **); |
| 24993 | 138 #endif |
| 139 | |
|
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
140 static int update_frame_menubar (struct frame *); |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
141 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
142 /* 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
|
143 Xt on behalf of one of the widget sets. */ |
| 49322 | 144 static int popup_activated_flag; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
145 |
| 12661 | 146 static int next_menubar_widget_id; |
|
15792
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
147 |
| 97204 | 148 /* For NS and NTGUI, these prototypes are defined in keyboard.h. */ |
| 149 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | |
|
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
150 extern widget_value *xmalloc_widget_value (void); |
|
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
151 extern widget_value *digest_single_submenu (int, int, int); |
| 97204 | 152 #endif |
| 153 | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
154 |
| 12661 | 155 #ifdef USE_X_TOOLKIT |
| 156 | |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
157 /* 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
|
158 |
| 12661 | 159 static struct frame * |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
160 menubar_id_to_frame (LWLIB_ID id) |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
161 { |
| 12661 | 162 Lisp_Object tail, frame; |
| 163 FRAME_PTR f; | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
164 |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90951
diff
changeset
|
165 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
166 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25322
diff
changeset
|
167 frame = XCAR (tail); |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90951
diff
changeset
|
168 if (!FRAMEP (frame)) |
| 12661 | 169 continue; |
| 170 f = XFRAME (frame); | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26088
diff
changeset
|
171 if (!FRAME_WINDOW_P (f)) |
| 12661 | 172 continue; |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
173 if (f->output_data.x->id == id) |
| 12661 | 174 return f; |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
175 } |
| 12661 | 176 return 0; |
| 177 } | |
|
11237
7c968b691ff0
(frame_vector): New static variable.
Richard M. Stallman <rms@gnu.org>
parents:
11125
diff
changeset
|
178 |
| 12661 | 179 #endif |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
180 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
181 #ifdef HAVE_X_WINDOWS |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
182 /* 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
|
183 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
|
184 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
|
185 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
|
186 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
|
187 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
|
188 sure it is the edit window. */ |
|
105923
1011707400d3
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105903
diff
changeset
|
189 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
190 mouse_position_for_popup (FRAME_PTR f, int *x, int *y) |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
191 { |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
192 Window root, dummy_window; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
193 int dummy; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
194 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
195 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
196 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
197 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
198 BLOCK_INPUT; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
199 |
|
49302
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
200 XQueryPointer (FRAME_X_DISPLAY (f), |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
201 DefaultRootWindow (FRAME_X_DISPLAY (f)), |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
202 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
203 /* 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
|
204 &root, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
205 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
206 /* 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
|
207 &dummy_window, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
208 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
209 /* 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
|
210 x, y, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
211 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
212 /* 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
|
213 &dummy, &dummy, |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
214 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
215 /* 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
|
216 we don't care. */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
217 (unsigned int *) &dummy); |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
218 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
219 UNBLOCK_INPUT; |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
220 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
221 /* 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
|
222 coordinates. Translate. */ |
|
51212
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
223 *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
|
224 *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
|
225 } |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
226 |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
227 #endif /* HAVE_X_WINDOWS */ |
|
17a9a82ad89f
(mouse_position_for_popup): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49116
diff
changeset
|
228 |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
229 #ifdef HAVE_MENUS |
|
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
230 |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
231 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, |
| 40993 | 232 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
|
233 POSITION specifies which frame to use. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
234 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
|
235 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
|
236 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
|
237 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
238 CONTENTS specifies the alternatives to display in the dialog box. |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
239 It is a list of the form (DIALOG ITEM1 ITEM2...). |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
240 Each ITEM is a cons cell (STRING . VALUE). |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
241 The return value is VALUE from the chosen item. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
242 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39690
diff
changeset
|
243 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
|
244 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
|
245 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
|
246 \(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
|
247 |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
248 If HEADER is non-nil, the frame title for the box is "Information", |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
249 otherwise it is "Question". |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
250 |
|
62090
cd1e4bc8e488
(Fx_popup_menu, Fx_popup_dialog): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62012
diff
changeset
|
251 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
|
252 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
|
253 `x-popup-dialog' does not return. */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109174
diff
changeset
|
254 (Lisp_Object position, Lisp_Object contents, Lisp_Object header) |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
255 { |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
256 FRAME_PTR f = NULL; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
257 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
|
258 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
259 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
|
260 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
261 /* 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
|
262 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
|
263 || (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
|
264 || 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
|
265 { |
|
6653
14a0a3fe93fd
(Fx_popup_dialog): If POSITION is t, use selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
6625
diff
changeset
|
266 #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
|
267 /* 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
|
268 FRAME_PTR new_f = SELECTED_FRAME (); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
269 Lisp_Object bar_window; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
270 enum scroll_bar_part part; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
271 unsigned long time; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
272 Lisp_Object x, y; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
273 |
|
11125
dc78213dd2b3
(Fx_popup_menu): Pass 1 for `insist' arg.
Richard M. Stallman <rms@gnu.org>
parents:
10835
diff
changeset
|
274 (*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
|
275 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
276 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
|
277 XSETFRAME (window, new_f); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
278 else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
279 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
|
280 #endif |
|
11907
0f03ad1cac1e
(Fx_popup_dialog): Treat (menu-bar) like t, for POSITION.
Karl Heuer <kwzh@gnu.org>
parents:
11898
diff
changeset
|
281 window = selected_window; |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
282 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
283 else if (CONSP (position)) |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
284 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
285 Lisp_Object tem; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
286 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
|
287 if (CONSP (tem)) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
288 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
|
289 else |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
290 { |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
291 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
292 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
|
293 } |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
294 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
295 else if (WINDOWP (position) || FRAMEP (position)) |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
296 window = position; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
297 else |
|
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
298 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
|
299 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
300 /* 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
|
301 |
|
9102
7a73653817de
(menu_item_enabled_p, single_keymap_panes, Fx_popup_menu, Fx_popup_dialog):
Karl Heuer <kwzh@gnu.org>
parents:
8849
diff
changeset
|
302 if (FRAMEP (window)) |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
303 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
|
304 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
|
305 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
306 CHECK_LIVE_WINDOW (window); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
307 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
|
308 } |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
309 else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
310 /* ??? 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
|
311 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
|
312 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
|
313 |
|
97645
229acec13840
(Fx_popup_dialog, Fx_popup_menu, xmenu_show): Allow MSDOS frames along with
Eli Zaretskii <eliz@gnu.org>
parents:
97204
diff
changeset
|
314 if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) |
|
229acec13840
(Fx_popup_dialog, Fx_popup_menu, xmenu_show): Allow MSDOS frames along with
Eli Zaretskii <eliz@gnu.org>
parents:
97204
diff
changeset
|
315 error ("Can not put X dialog on this terminal"); |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
316 |
|
102628
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
317 /* Force a redisplay before showing the dialog. If a frame is created |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
318 just before showing the dialog, its contents may not have been fully |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
319 drawn, as this depends on timing of events from the X server. Redisplay |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
320 is not done when a dialog is shown. If redisplay could be done in the |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
321 X event loop (i.e. the X event loop does not run in a signal handler) |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
322 this would not be needed. |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
323 |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
324 Do this before creating the widget value that points to Lisp |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
325 string contents, because Fredisplay may GC and relocate them. */ |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
326 Fredisplay (Qt); |
|
94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
327 |
| 49322 | 328 #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
|
329 /* Display a menu with these alternatives |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
330 in the middle of frame F. */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
331 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
332 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
|
333 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
|
334 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
|
335 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
|
336 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
|
337 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
338 return Fx_popup_menu (newpos, |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
339 Fcons (Fcar (contents), Fcons (contents, Qnil))); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
340 } |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
341 #else |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
342 { |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
343 Lisp_Object title; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
344 char *error_name; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
345 Lisp_Object selection; |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
346 int specpdl_count = SPECPDL_INDEX (); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
347 |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
348 /* 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
|
349 title = Fcar (contents); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40477
diff
changeset
|
350 CHECK_STRING (title); |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
351 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
|
352 |
|
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
|
353 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
|
354 /* 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
|
355 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
|
356 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
|
357 contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil)); |
| 58171 | 358 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
359 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
|
360 |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
361 /* Display them in a dialog box. */ |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
362 BLOCK_INPUT; |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
363 selection = xdialog_show (f, 0, title, header, &error_name); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
364 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
|
365 |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
366 unbind_to (specpdl_count, Qnil); |
|
6439
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
367 discard_menu_items (); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
368 |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
369 if (error_name) error (error_name); |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
370 return selection; |
|
463b12ba8260
(xdialog_show): Delete args x, y.
Richard M. Stallman <rms@gnu.org>
parents:
6426
diff
changeset
|
371 } |
|
6325
d6817c9c0413
Undo previous change. Instead:
Richard M. Stallman <rms@gnu.org>
parents:
6324
diff
changeset
|
372 #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
|
373 } |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
374 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
375 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
376 #ifndef MSDOS |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
377 |
|
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
|
378 /* 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
|
379 |
|
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
|
380 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
381 x_menu_set_in_use (int 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
|
382 { |
|
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
|
383 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
|
384 popup_activated_flag = in_use; |
|
72854
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
385 #ifdef USE_X_TOOLKIT |
|
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
386 if (popup_activated_flag) |
|
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
387 x_activate_timeout_atimer (); |
|
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
388 #endif |
|
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
|
389 } |
|
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
|
390 |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
391 /* 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
|
392 |
|
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
|
393 void |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
394 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
|
395 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
396 /* 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
|
397 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
|
398 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
|
399 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
|
400 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
401 while ( |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
402 #ifdef USE_X_TOOLKIT |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
403 ! 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
|
404 #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
|
405 ! 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
|
406 #else |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
407 ! 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
|
408 #endif |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
409 ) |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
410 { |
|
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
411 EMACS_TIME next_time = timer_check (1), *ntp; |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
412 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
|
413 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
|
414 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
|
415 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
|
416 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
|
417 |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
418 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
|
419 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
|
420 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
421 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
|
422 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
|
423 if (fd > n) n = fd; |
|
106057
385ba537122c
*** empty log message ***
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
106056
diff
changeset
|
424 XFlush (dpyinfo->display); |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
425 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
426 |
|
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
427 if (secs < 0 && usecs < 0) |
|
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
428 ntp = 0; |
|
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
429 else |
|
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
430 ntp = &next_time; |
|
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
431 |
|
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105931
diff
changeset
|
432 select (n + 1, &read_fds, (SELECT_TYPE *)0, (SELECT_TYPE *)0, ntp); |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
433 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
434 } |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
435 #endif /* ! MSDOS */ |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
436 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
437 |
| 49322 | 438 #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
|
439 |
|
58170
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
440 #ifdef USE_X_TOOLKIT |
|
66ace4a9a250
(pop_down_menu): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58169
diff
changeset
|
441 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
442 /* Loop in Xt until the menu pulldown or dialog popup has been |
| 13821 | 443 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
|
444 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
|
445 |
|
11954
4117d74ba254
(popup_get_selection): Force deactivation if key pressed.
Karl Heuer <kwzh@gnu.org>
parents:
11918
diff
changeset
|
446 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
|
447 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
|
448 |
|
48912
b0b74923fe41
(popup_get_selection): Now static. New arg DO_TIMERS.
Richard M. Stallman <rms@gnu.org>
parents:
48329
diff
changeset
|
449 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
450 popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo, LWLIB_ID id, int do_timers) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
451 { |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
452 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
|
453 |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
454 while (popup_activated_flag) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
455 { |
| 59107 | 456 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
|
457 { |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
458 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
|
459 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
|
460 } |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
461 else |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
462 { |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
463 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
|
464 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
|
465 } |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
466 |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
467 /* 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
|
468 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
|
469 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
|
470 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
|
471 && 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
|
472 { |
|
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
473 dpyinfo->grabbed &= ~(1 << event.xbutton.button); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
474 #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
|
475 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
|
476 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
|
477 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
|
478 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
|
479 /* 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
|
480 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
|
481 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
|
482 event.xbutton.state = 0; |
|
15839
e66ccb471d26
(xmenu_show): Set dummy.state.
Richard M. Stallman <rms@gnu.org>
parents:
15807
diff
changeset
|
483 #endif |
|
15628
f74c79dcaf8d
(popup_get_selection): For a ButtonRelease on the proper
Karl Heuer <kwzh@gnu.org>
parents:
15428
diff
changeset
|
484 } |
|
59155
6690f246cffe
* xmenu.c (popup_get_selection): Only pop down dialogs
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59107
diff
changeset
|
485 /* 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
|
486 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
|
487 && 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
|
488 { |
|
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
489 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
|
490 |
|
59155
6690f246cffe
* xmenu.c (popup_get_selection): Only pop down dialogs
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59107
diff
changeset
|
491 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
|
492 || 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
|
493 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
|
494 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
495 |
|
49116
8c37b25a7f02
(Fx_popup_menu): If popping up at mouse position,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
48946
diff
changeset
|
496 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
|
497 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
498 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
499 |
| 83542 | 500 DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_internal, 0, 1, "i", |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
501 doc: /* Start key navigation of the menu bar in FRAME. |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
502 This initially opens the first menu bar item and you can then navigate with the |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
503 arrow keys, select a menu entry with the return key or cancel with the |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
504 escape key. If FRAME has no menu bar this function does nothing. |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
505 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
506 If FRAME is nil or not given, use the selected frame. */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109174
diff
changeset
|
507 (Lisp_Object frame) |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
508 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
509 XEvent ev; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
510 FRAME_PTR f = check_x_frame (frame); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
511 Widget menubar; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
512 BLOCK_INPUT; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
513 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
514 if (FRAME_EXTERNAL_MENU_BAR (f)) |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
515 set_frame_menubar (f, 0, 1); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
516 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
517 menubar = FRAME_X_OUTPUT (f)->menubar_widget; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
518 if (menubar) |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
519 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
520 Window child; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
521 int error_p = 0; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
522 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
523 x_catch_errors (FRAME_X_DISPLAY (f)); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
524 memset (&ev, 0, sizeof ev); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
525 ev.xbutton.display = FRAME_X_DISPLAY (f); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
526 ev.xbutton.window = XtWindow (menubar); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
527 ev.xbutton.root = FRAME_X_DISPLAY_INFO (f)->root_window; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
528 ev.xbutton.time = XtLastTimestampProcessed (FRAME_X_DISPLAY (f)); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
529 ev.xbutton.button = Button1; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
530 ev.xbutton.x = ev.xbutton.y = FRAME_MENUBAR_HEIGHT (f) / 2; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
531 ev.xbutton.same_screen = True; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
532 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
533 #ifdef USE_MOTIF |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
534 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
535 Arg al[2]; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
536 WidgetList list; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
537 Cardinal nr; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
538 XtSetArg (al[0], XtNchildren, &list); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
539 XtSetArg (al[1], XtNnumChildren, &nr); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
540 XtGetValues (menubar, al, 2); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
541 ev.xbutton.window = XtWindow (list[0]); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
542 } |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
543 #endif |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
544 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
545 XTranslateCoordinates (FRAME_X_DISPLAY (f), |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
546 /* From-window, to-window. */ |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
547 ev.xbutton.window, ev.xbutton.root, |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
548 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
549 /* From-position, to-position. */ |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
550 ev.xbutton.x, ev.xbutton.y, |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
551 &ev.xbutton.x_root, &ev.xbutton.y_root, |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
552 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
553 /* Child of win. */ |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
554 &child); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
555 error_p = x_had_errors_p (FRAME_X_DISPLAY (f)); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
556 x_uncatch_errors (); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
557 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
558 if (! error_p) |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
559 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
560 ev.type = ButtonPress; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
561 ev.xbutton.state = 0; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
562 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
563 XtDispatchEvent (&ev); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
564 ev.xbutton.type = ButtonRelease; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
565 ev.xbutton.state = Button1Mask; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
566 XtDispatchEvent (&ev); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
567 } |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
568 } |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
569 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
570 UNBLOCK_INPUT; |
|
71094
bff9557e8c24
(Fmenu_bar_start): Return a value.
Andreas Schwab <schwab@suse.de>
parents:
71057
diff
changeset
|
571 |
|
bff9557e8c24
(Fmenu_bar_start): Return a value.
Andreas Schwab <schwab@suse.de>
parents:
71057
diff
changeset
|
572 return Qnil; |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
573 } |
| 49322 | 574 #endif /* USE_X_TOOLKIT */ |
| 575 | |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
576 |
| 49322 | 577 #ifdef USE_GTK |
| 83542 | 578 DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_internal, 0, 1, "i", |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
579 doc: /* Start key navigation of the menu bar in FRAME. |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
580 This initially opens the first menu bar item and you can then navigate with the |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
581 arrow keys, select a menu entry with the return key or cancel with the |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
582 escape key. If FRAME has no menu bar this function does nothing. |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
583 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
584 If FRAME is nil or not given, use the selected frame. */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109174
diff
changeset
|
585 (Lisp_Object frame) |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
586 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
587 GtkWidget *menubar; |
|
73662
ea2e12adb144
* xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
Chong Yidong <cyd@stupidchicken.com>
parents:
73320
diff
changeset
|
588 FRAME_PTR f; |
|
ea2e12adb144
* xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
Chong Yidong <cyd@stupidchicken.com>
parents:
73320
diff
changeset
|
589 |
| 73715 | 590 /* gcc 2.95 doesn't accept the FRAME_PTR declaration after |
| 591 BLOCK_INPUT. */ | |
| 592 | |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
593 BLOCK_INPUT; |
|
73662
ea2e12adb144
* xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
Chong Yidong <cyd@stupidchicken.com>
parents:
73320
diff
changeset
|
594 f = check_x_frame (frame); |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
595 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
596 if (FRAME_EXTERNAL_MENU_BAR (f)) |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
597 set_frame_menubar (f, 0, 1); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
598 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
599 menubar = FRAME_X_OUTPUT (f)->menubar_widget; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
600 if (menubar) |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
601 { |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
602 /* Activate the first menu. */ |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
603 GList *children = gtk_container_get_children (GTK_CONTAINER (menubar)); |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
604 |
|
97075
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
605 if (children) |
|
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
606 { |
|
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
607 g_signal_emit_by_name (children->data, "activate_item"); |
|
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
608 popup_activated_flag = 1; |
|
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
609 g_list_free (children); |
|
864ac210d576
* xmenu.c (Fx_menu_bar_open_internal): Use activate_item signal to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
96608
diff
changeset
|
610 } |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
611 } |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
612 UNBLOCK_INPUT; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
613 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
614 return Qnil; |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
615 } |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
616 |
| 49322 | 617 /* Loop util popup_activated_flag is set to zero in a callback. |
| 618 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
|
619 |
| 49322 | 620 static void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
621 popup_widget_loop (int do_timers, GtkWidget *widget) |
| 49322 | 622 { |
| 623 ++popup_activated_flag; | |
| 624 | |
| 625 /* Process events in the Gtk event loop until done. */ | |
| 626 while (popup_activated_flag) | |
| 627 { | |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
628 if (do_timers) x_menu_wait_for_event (0); |
| 49322 | 629 gtk_main_iteration (); |
| 630 } | |
| 631 } | |
| 632 #endif | |
| 633 | |
| 12661 | 634 /* Activate the menu bar of frame F. |
| 635 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
|
636 MENU_BAR_ACTIVATE_EVENT out of the Emacs event queue. |
| 12661 | 637 |
| 638 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
|
639 that was saved in saved_menu_event. |
| 12661 | 640 That makes the toolkit do its thing. |
| 641 | |
| 642 But first we recompute the menu bar contents (the whole tree). | |
| 643 | |
| 644 The reason for saving the button event until here, instead of | |
| 645 passing it to the toolkit right away, is that we can safely | |
| 646 execute Lisp code. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
647 |
| 21514 | 648 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
649 x_activate_menubar (FRAME_PTR f) |
| 12661 | 650 { |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
651 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
652 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
653 |
|
15710
85d87cd0f655
(x_activate_menubar): Allow any event, not just ButtonPress.
Karl Heuer <kwzh@gnu.org>
parents:
15628
diff
changeset
|
654 if (!f->output_data.x->saved_menu_event->type) |
| 12661 | 655 return; |
| 656 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
657 #ifdef USE_GTK |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
658 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
|
659 f->output_data.x->saved_menu_event->xany.window)) |
| 49322 | 660 return; |
| 661 #endif | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
662 |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
663 set_frame_menubar (f, 0, 1); |
| 12661 | 664 BLOCK_INPUT; |
|
109391
a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109374
diff
changeset
|
665 popup_activated_flag = 1; |
| 49322 | 666 #ifdef USE_GTK |
|
109291
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
667 /* If we click outside any menu item, the menu bar still grabs. |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
668 So we send Press and the Release. If outside, grab is released. |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
669 If on a menu item, it is popped up normally. |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
670 PutBack is like a stack, so we put back in reverse order. */ |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
671 f->output_data.x->saved_menu_event->type = ButtonRelease; |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
672 XPutBackEvent (f->output_data.x->display_info->display, |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
673 f->output_data.x->saved_menu_event); |
|
35d06d80fc61
Fix hang for mouse press on menubar but not on an item (Bug#6499).
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
674 f->output_data.x->saved_menu_event->type = ButtonPress; |
| 49322 | 675 XPutBackEvent (f->output_data.x->display_info->display, |
| 676 f->output_data.x->saved_menu_event); | |
| 677 #else | |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
678 XtDispatchEvent (f->output_data.x->saved_menu_event); |
| 49322 | 679 #endif |
| 12661 | 680 UNBLOCK_INPUT; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
681 |
| 12661 | 682 /* 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
|
683 f->output_data.x->saved_menu_event->type = 0; |
| 12661 | 684 } |
| 685 | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
686 /* 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
|
687 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
|
688 |
| 49322 | 689 #ifndef USE_GTK |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
690 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
691 popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
692 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
693 popup_activated_flag = 1; |
|
72854
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
694 #ifdef USE_X_TOOLKIT |
|
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
695 x_activate_timeout_atimer (); |
|
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
696 #endif |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
697 } |
| 49322 | 698 #endif |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
699 |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
700 /* 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
|
701 used and has been unposted. */ |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
702 |
| 49322 | 703 #ifdef USE_GTK |
| 704 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
705 popup_deactivate_callback (GtkWidget *widget, gpointer client_data) |
| 49322 | 706 { |
| 707 popup_activated_flag = 0; | |
| 708 } | |
| 709 #else | |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
710 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
711 popup_deactivate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) |
|
27425
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
712 { |
|
e575223479a1
(popup_activated_flag): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents:
27341
diff
changeset
|
713 popup_activated_flag = 0; |
| 118 | 714 } |
| 49322 | 715 #endif |
| 716 | |
| 717 | |
| 718 /* Function that finds the frame for WIDGET and shows the HELP text | |
| 719 for that widget. | |
| 720 F is the frame if known, or NULL if not known. */ | |
| 721 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
722 show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help) |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
723 { |
| 49322 | 724 Lisp_Object frame; |
| 725 | |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
726 if (f) |
|
30472
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
727 { |
|
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
728 XSETFRAME (frame, f); |
|
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
729 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
|
730 } |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
731 else |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
732 { |
|
53325
8e8832ef3963
(show_help_event): Remove unused code.
Kim F. Storm <storm@cua.dk>
parents:
53069
diff
changeset
|
733 #if 0 /* This code doesn't do anything useful. ++kfs */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
734 /* 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
|
735 widget. See which frame that is. */ |
| 49322 | 736 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
|
737 Lisp_Object tail; |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
738 |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90951
diff
changeset
|
739 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
740 { |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
741 frame = XCAR (tail); |
|
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90951
diff
changeset
|
742 if (FRAMEP (frame) |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
743 && (f = XFRAME (frame), |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
744 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
|
745 break; |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
746 } |
|
53325
8e8832ef3963
(show_help_event): Remove unused code.
Kim F. Storm <storm@cua.dk>
parents:
53069
diff
changeset
|
747 #endif |
|
30472
0c982ed8515f
(menu_highlight_callback): Call show_help_echo directly
Gerd Moellmann <gerd@gnu.org>
parents:
30420
diff
changeset
|
748 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
|
749 } |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
750 } |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
751 |
| 49322 | 752 /* Callback called when menu items are highlighted/unhighlighted |
| 753 while moving the mouse over them. WIDGET is the menu bar or menu | |
| 754 popup widget. ID is its LWLIB_ID. CALL_DATA contains a pointer to | |
| 755 the data structure for the menu item, or null in case of | |
| 756 unhighlighting. */ | |
| 757 | |
| 758 #ifdef USE_GTK | |
| 759 void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
760 menu_highlight_callback (GtkWidget *widget, gpointer call_data) |
| 49322 | 761 { |
| 762 xg_menu_item_cb_data *cb_data; | |
| 763 Lisp_Object help; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
764 |
| 49322 | 765 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (widget), |
| 766 XG_ITEM_DATA); | |
| 767 if (! cb_data) return; | |
| 768 | |
| 769 help = call_data ? cb_data->help : Qnil; | |
| 770 | |
| 771 /* If popup_activated_flag is greater than 1 we are in a popup menu. | |
| 772 Don't show help for them, they won't appear before the | |
| 773 popup is popped down. */ | |
| 774 if (popup_activated_flag <= 1) | |
| 775 show_help_event (cb_data->cl_data->f, widget, help); | |
| 776 } | |
| 777 #else | |
| 778 void | |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
779 menu_highlight_callback (Widget widget, LWLIB_ID id, void *call_data) |
| 49322 | 780 { |
| 781 struct frame *f; | |
| 782 Lisp_Object help; | |
| 783 | |
| 784 widget_value *wv = (widget_value *) call_data; | |
| 785 | |
| 786 help = wv ? wv->help : Qnil; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
787 |
| 49322 | 788 /* Determine the frame for the help event. */ |
| 789 f = menubar_id_to_frame (id); | |
| 790 | |
| 791 show_help_event (f, widget, help); | |
| 792 } | |
| 793 #endif | |
| 794 | |
| 795 #ifdef USE_GTK | |
| 796 /* Gtk calls callbacks just because we tell it what item should be | |
| 797 selected in a radio group. If this variable is set to a non-zero | |
| 798 value, we are creating menus and don't want callbacks right now. | |
| 799 */ | |
| 800 static int xg_crazy_callback_abort; | |
| 801 | |
| 802 /* This callback is called from the menu bar pulldown menu | |
| 803 when the user makes a selection. | |
| 804 Figure out what the user chose | |
| 805 and put the appropriate events into the keyboard buffer. */ | |
| 806 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
807 menubar_selection_callback (GtkWidget *widget, gpointer client_data) |
| 49322 | 808 { |
| 809 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; | |
| 810 | |
| 811 if (xg_crazy_callback_abort) | |
| 812 return; | |
| 813 | |
| 814 if (! cb_data || ! cb_data->cl_data || ! cb_data->cl_data->f) | |
| 815 return; | |
| 816 | |
|
67527
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
817 /* For a group of radio buttons, GTK calls the selection callback first |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
818 for the item that was active before the selection and then for the one that |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
819 is active after the selection. For C-h k this means we get the help on |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
820 the deselected item and then the selected item is executed. Prevent that |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
821 by ignoring the non-active item. */ |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
822 if (GTK_IS_RADIO_MENU_ITEM (widget) |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
823 && ! gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
824 return; |
|
88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
825 |
|
59912
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
826 /* 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
|
827 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
|
828 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
|
829 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
|
830 event. */ |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
831 |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
832 BLOCK_INPUT; |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
833 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
|
834 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
|
835 UNBLOCK_INPUT; |
|
ef2f9fc4fd42
* xmenu.c (menubar_selection_callback): Force out GTK buffered
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
59415
diff
changeset
|
836 |
| 49322 | 837 find_and_call_menu_selection (cb_data->cl_data->f, |
| 838 cb_data->cl_data->menu_bar_items_used, | |
| 839 cb_data->cl_data->menu_bar_vector, | |
| 840 cb_data->call_data); | |
| 841 } | |
| 842 | |
| 843 #else /* not USE_GTK */ | |
| 844 | |
| 845 /* This callback is called from the menu bar pulldown menu | |
| 846 when the user makes a selection. | |
| 847 Figure out what the user chose | |
| 848 and put the appropriate events into the keyboard buffer. */ | |
| 849 static void | |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
850 menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) |
| 49322 | 851 { |
| 852 FRAME_PTR f; | |
| 853 | |
| 854 f = menubar_id_to_frame (id); | |
| 855 if (!f) | |
| 856 return; | |
| 857 find_and_call_menu_selection (f, f->menu_bar_items_used, | |
| 858 f->menu_bar_vector, client_data); | |
| 859 } | |
| 860 #endif /* not USE_GTK */ | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
861 |
| 36933 | 862 /* Recompute all the widgets of frame F, when the menu bar has been |
| 863 changed. Value is non-zero if widgets were updated. */ | |
| 864 | |
| 865 static int | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
866 update_frame_menubar (FRAME_PTR f) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
867 { |
| 49322 | 868 #ifdef USE_GTK |
| 869 return xg_update_frame_menubar (f); | |
| 870 #else | |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
871 struct x_output *x; |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
872 int columns, rows; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
873 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
874 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
875 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
876 |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
877 x = f->output_data.x; |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
878 |
| 36933 | 879 if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) |
| 880 return 0; | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
881 |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
882 BLOCK_INPUT; |
| 36933 | 883 /* Save the size of the frame because the pane widget doesn't accept |
| 884 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
|
885 columns = FRAME_COLS (f); |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
886 rows = FRAME_LINES (f); |
|
6200
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
887 |
| 36933 | 888 /* Do the voodoo which means "I'm changing lots of things, don't try |
| 889 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
|
890 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
|
891 |
| 36933 | 892 /* The order in which children are managed is the top to bottom |
| 893 order in which they are displayed in the paned window. First, | |
| 894 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
|
895 XtUnmanageChild (x->edit_widget); |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
896 |
| 36933 | 897 /* Remove the menubar that is there now, and put up the menubar that |
| 898 should be there. */ | |
| 899 XtManageChild (x->menubar_widget); | |
| 900 XtMapWidget (x->menubar_widget); | |
| 901 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
|
902 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
903 /* 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
|
904 XtManageChild (x->edit_widget); |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
905 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
|
906 |
|
01c57ae8ca57
(update_one_frame_psheets): Call EmacsFrameSetCharSize to
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6198
diff
changeset
|
907 /* 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
|
908 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
|
909 UNBLOCK_INPUT; |
| 49322 | 910 #endif |
| 36933 | 911 return 1; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
912 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
913 |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
914 #ifdef USE_LUCID |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
915 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
916 apply_systemfont_to_dialog (Widget w) |
|
107827
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
917 { |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
918 const char *fn = xsettings_get_system_normal_font (); |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
919 if (fn) |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
920 { |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
921 XrmDatabase db = XtDatabase (XtDisplay (w)); |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
922 if (db) |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
923 XrmPutStringResource (&db, "*dialog.faceName", fn); |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
924 } |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
925 } |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
926 |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
927 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
928 apply_systemfont_to_menu (Widget w) |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
929 { |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
930 const char *fn = xsettings_get_system_normal_font (); |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
931 int defflt; |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
932 |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
933 if (!fn) return; |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
934 |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
935 if (XtIsShell (w)) /* popup menu */ |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
936 { |
|
107827
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
937 Widget *childs = NULL; |
|
107878
faaa7a6517a8
* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
Jan D <jan.h.d@swipnet.se>
parents:
107827
diff
changeset
|
938 |
|
107827
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
939 XtVaGetValues (w, XtNchildren, &childs, NULL); |
|
107878
faaa7a6517a8
* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
Jan D <jan.h.d@swipnet.se>
parents:
107827
diff
changeset
|
940 if (*childs) w = *childs; |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
941 } |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
942 |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
943 /* Only use system font if the default is used for the menu. */ |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
944 XtVaGetValues (w, XtNdefaultFace, &defflt, NULL); |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
945 if (defflt) |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
946 XtVaSetValues (w, XtNfaceName, fn, NULL); |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
947 } |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
948 #endif |
|
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
949 |
|
12018
f5d820ad7a13
(set_frame_menubar): Always call update_frame_menubar.
Karl Heuer <kwzh@gnu.org>
parents:
11954
diff
changeset
|
950 /* 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
|
951 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
|
952 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
|
953 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
954 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
955 set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
956 { |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
957 xt_or_gtk_widget menubar_widget; |
| 49322 | 958 #ifdef USE_X_TOOLKIT |
| 959 LWLIB_ID id; | |
| 960 #endif | |
|
25730
db88a4b84d91
(single_menu_item, Fx_popup_menu, Fx_popup_menu,
Gerd Moellmann <gerd@gnu.org>
parents:
25680
diff
changeset
|
961 Lisp_Object items; |
|
9725
98d374d51f4d
(set_frame_menubar): Don't copy string during GC risk.
Karl Heuer <kwzh@gnu.org>
parents:
9649
diff
changeset
|
962 widget_value *wv, *first_wv, *prev_wv = 0; |
|
56959
dc35c2e20d41
(update_submenu_strings): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56848
diff
changeset
|
963 int i, last_i = 0; |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
964 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
|
965 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
|
966 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
967 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
968 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
969 |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
970 menubar_widget = f->output_data.x->menubar_widget; |
|
11449
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
971 |
|
16656
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
972 XSETFRAME (Vmenu_updating_frame, f); |
|
9cbbf721b91c
(Vmenu_updating_frame): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16411
diff
changeset
|
973 |
| 49322 | 974 #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
|
975 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
|
976 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
|
977 id = f->output_data.x->id; |
| 49322 | 978 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
979 |
| 12661 | 980 if (! menubar_widget) |
| 981 deep_p = 1; | |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
982 /* 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
|
983 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
|
984 { |
|
feeb1f7c1cec
(pending_menu_activation): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15785
diff
changeset
|
985 deep_p = 1; |
|
15807
508ec69917b1
(pending_menu_activation): Don't initialize. Not static.
Richard M. Stallman <rms@gnu.org>
parents:
15795
diff
changeset
|
986 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
|
987 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
|
988 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
989 |
|
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
990 #ifdef USE_GTK |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
991 /* 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
|
992 also gets updated. */ |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
993 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
|
994 #endif |
|
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
995 |
| 12661 | 996 if (deep_p) |
| 997 { | |
| 998 /* Make a widget-value tree representing the entire menu trees. */ | |
| 999 | |
| 1000 struct buffer *prev = current_buffer; | |
| 1001 Lisp_Object buffer; | |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45803
diff
changeset
|
1002 int specpdl_count = SPECPDL_INDEX (); |
| 12661 | 1003 int previous_menu_items_used = f->menu_bar_items_used; |
| 1004 Lisp_Object *previous_items | |
| 1005 = (Lisp_Object *) alloca (previous_menu_items_used | |
| 1006 * 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
|
1007 |
|
17554
0a75fcee3cb8
(set_frame_menubar): When widget is new, forget records of old contents.
Richard M. Stallman <rms@gnu.org>
parents:
17364
diff
changeset
|
1008 /* 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
|
1009 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
|
1010 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
|
1011 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
|
1012 |
| 12661 | 1013 buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer; |
| 1014 specbind (Qinhibit_quit, Qt); | |
| 1015 /* Don't let the debugger step into this code | |
| 1016 because it is not reentrant. */ | |
| 1017 specbind (Qdebug_on_next_call, Qnil); | |
| 1018 | |
|
63147
9bde03db5726
* composite.c (compose_chars_in_text):
Kim F. Storm <storm@cua.dk>
parents:
63070
diff
changeset
|
1019 record_unwind_save_match_data (); |
| 12661 | 1020 if (NILP (Voverriding_local_map_menu_flag)) |
| 1021 { | |
| 1022 specbind (Qoverriding_terminal_local_map, Qnil); | |
| 1023 specbind (Qoverriding_local_map, Qnil); | |
| 1024 } | |
| 1025 | |
| 1026 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
|
1027 |
| 12661 | 1028 /* Run the Lucid hook. */ |
|
36191
0cee3a77c592
(set_frame_menubar): Run acivate-menu-bar-hook with
Gerd Moellmann <gerd@gnu.org>
parents:
34038
diff
changeset
|
1029 safe_run_hooks (Qactivate_menubar_hook); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1030 |
| 12661 | 1031 /* If it has changed current-menubar from previous value, |
| 1032 really recompute the menubar from the value. */ | |
| 1033 if (! NILP (Vlucid_menu_bar_dirty_flag)) | |
| 1034 call0 (Qrecompute_lucid_menubar); | |
| 14298 | 1035 safe_run_hooks (Qmenu_bar_update_hook); |
| 12661 | 1036 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 1037 | |
| 1038 items = FRAME_MENU_BAR_ITEMS (f); | |
| 1039 | |
| 1040 /* 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
|
1041 if (previous_menu_items_used) |
|
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1042 memcpy (previous_items, XVECTOR (f->menu_bar_vector)->contents, |
|
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1043 previous_menu_items_used * sizeof (Lisp_Object)); |
| 12661 | 1044 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1045 /* 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
|
1046 This can evaluate Lisp code. */ |
|
70085
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1047 save_menu_items (); |
|
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1048 |
| 12661 | 1049 menu_items = f->menu_bar_vector; |
|
38594
53ed5f089c9e
(set_frame_menubar): Take into account that
Gerd Moellmann <gerd@gnu.org>
parents:
37940
diff
changeset
|
1050 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
|
1051 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
|
1052 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
|
1053 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
|
1054 submenu_top_level_items |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1055 = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); |
| 12661 | 1056 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
|
1057 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 1058 { |
| 1059 Lisp_Object key, string, maps; | |
| 1060 | |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1061 last_i = i; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1062 |
| 12661 | 1063 key = XVECTOR (items)->contents[i]; |
| 1064 string = XVECTOR (items)->contents[i + 1]; | |
| 1065 maps = XVECTOR (items)->contents[i + 2]; | |
| 1066 if (NILP (string)) | |
| 1067 break; | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1068 |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1069 submenu_start[i] = menu_items_used; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1070 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1071 menu_items_n_panes = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1072 submenu_top_level_items[i] |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1073 = 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
|
1074 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
|
1075 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1076 submenu_end[i] = menu_items_used; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1077 } |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1078 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1079 finish_menu_items (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1080 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1081 /* 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
|
1082 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
|
1083 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1084 wv = xmalloc_widget_value (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1085 wv->name = "menubar"; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1086 wv->value = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1087 wv->enabled = 1; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1088 wv->button_type = BUTTON_TYPE_NONE; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1089 wv->help = Qnil; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1090 first_wv = wv; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1091 |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1092 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
|
1093 { |
|
48946
2c4a754e02b6
(parse_single_submenu): Use individual keymap's prompt
Richard M. Stallman <rms@gnu.org>
parents:
48912
diff
changeset
|
1094 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
|
1095 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
|
1096 submenu_top_level_items[i]); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1097 if (prev_wv) |
| 12661 | 1098 prev_wv->next = wv; |
| 1099 else | |
| 1100 first_wv->contents = wv; | |
| 1101 /* Don't set wv->name here; GC during the loop might relocate it. */ | |
| 1102 wv->enabled = 1; | |
| 24993 | 1103 wv->button_type = BUTTON_TYPE_NONE; |
| 12661 | 1104 prev_wv = wv; |
| 1105 } | |
| 1106 | |
| 1107 set_buffer_internal_1 (prev); | |
| 1108 | |
| 1109 /* If there has been no change in the Lisp-level contents | |
| 1110 of the menu bar, skip redisplaying it. Just exit. */ | |
| 1111 | |
| 70086 | 1112 /* Compare the new menu items with the ones computed last time. */ |
| 12661 | 1113 for (i = 0; i < previous_menu_items_used; i++) |
| 1114 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
|
1115 || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i]))) |
| 12661 | 1116 break; |
|
13654
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
1117 if (i == menu_items_used && i == previous_menu_items_used && i != 0) |
| 12661 | 1118 { |
| 70086 | 1119 /* The menu items have not changed. Don't bother updating |
| 1120 the menus in any form, since it would be a no-op. */ | |
| 12661 | 1121 free_menubar_widget_value_tree (first_wv); |
|
48113
6a09e4b41337
(unuse_menu_items): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46753
diff
changeset
|
1122 discard_menu_items (); |
|
70085
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1123 unbind_to (specpdl_count, Qnil); |
| 12661 | 1124 return; |
| 1125 } | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1126 |
| 70086 | 1127 /* The menu items are different, so store them in the frame. */ |
|
70085
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1128 f->menu_bar_vector = menu_items; |
|
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1129 f->menu_bar_items_used = menu_items_used; |
|
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1130 |
|
95647
0f6a0e86ee24
Remove platform-independent menu definitions.
Chong Yidong <cyd@stupidchicken.com>
parents:
94963
diff
changeset
|
1131 /* This undoes save_menu_items. */ |
|
70085
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1132 unbind_to (specpdl_count, Qnil); |
|
93e99c27012e
(restore_menu_items, save_menu_items): New fns.
Richard M. Stallman <rms@gnu.org>
parents:
69017
diff
changeset
|
1133 |
| 12661 | 1134 /* Now GC cannot happen during the lifetime of the widget_value, |
| 1135 so it's safe to store data from a Lisp_String. */ | |
| 1136 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
|
1137 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 1138 { |
| 1139 Lisp_Object string; | |
| 1140 string = XVECTOR (items)->contents[i + 1]; | |
| 1141 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
|
1142 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
|
1143 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
|
1144 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
|
1145 wv = wv->next; |
| 12661 | 1146 } |
| 1147 | |
| 1148 } | |
| 1149 else | |
| 1150 { | |
| 1151 /* Make a widget-value tree containing | |
| 1152 just the top level menu bar strings. */ | |
| 1153 | |
|
46753
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1154 wv = xmalloc_widget_value (); |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1155 wv->name = "menubar"; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1156 wv->value = 0; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1157 wv->enabled = 1; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1158 wv->button_type = BUTTON_TYPE_NONE; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1159 wv->help = Qnil; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1160 first_wv = wv; |
|
5e95e401d481
(set_frame_menubar): First parse all submenus,
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
1161 |
| 12661 | 1162 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
|
1163 for (i = 0; i < XVECTOR (items)->size; i += 4) |
| 12661 | 1164 { |
| 1165 Lisp_Object string; | |
| 1166 | |
| 1167 string = XVECTOR (items)->contents[i + 1]; | |
| 1168 if (NILP (string)) | |
| 1169 break; | |
| 1170 | |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1171 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
|
1172 wv->name = (char *) SDATA (string); |
| 12661 | 1173 wv->value = 0; |
| 1174 wv->enabled = 1; | |
| 24993 | 1175 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
1176 wv->help = Qnil; |
|
15785
9902d8a8a548
(set_frame_menubar): Use -1 for call_data
Richard M. Stallman <rms@gnu.org>
parents:
15710
diff
changeset
|
1177 /* 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
|
1178 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
|
1179 /* 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
|
1180 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
|
1181 wv->call_data = (void *) (EMACS_INT) (-1); |
| 12661 | 1182 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1183 if (prev_wv) |
| 12661 | 1184 prev_wv->next = wv; |
| 1185 else | |
| 1186 first_wv->contents = wv; | |
| 1187 prev_wv = wv; | |
| 1188 } | |
|
13654
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
1189 |
|
645e14e39a2b
(set_frame_menubar): When called with deep_p == 0,
Richard M. Stallman <rms@gnu.org>
parents:
13489
diff
changeset
|
1190 /* 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
|
1191 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
|
1192 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
|
1193 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
|
1194 } |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1195 |
| 12661 | 1196 /* 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
|
1197 |
|
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1198 BLOCK_INPUT; |
|
fca5a32f7806
(popup_get_selection): Queue up events that aren't
Richard M. Stallman <rms@gnu.org>
parents:
11266
diff
changeset
|
1199 |
| 49322 | 1200 #ifdef USE_GTK |
| 1201 xg_crazy_callback_abort = 1; | |
| 1202 if (menubar_widget) | |
| 1203 { | |
|
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1204 /* The fourth arg is DEEP_P, which says to consider the entire |
| 49322 | 1205 menu trees we supply, rather than just the menu bar item names. */ |
| 1206 xg_modify_menubar_widgets (menubar_widget, | |
| 1207 f, | |
| 1208 first_wv, | |
| 1209 deep_p, | |
| 1210 G_CALLBACK (menubar_selection_callback), | |
| 1211 G_CALLBACK (popup_deactivate_callback), | |
| 1212 G_CALLBACK (menu_highlight_callback)); | |
| 1213 } | |
| 1214 else | |
| 1215 { | |
| 1216 GtkWidget *wvbox = f->output_data.x->vbox_widget; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1217 |
| 49322 | 1218 menubar_widget |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1219 = xg_create_widget ("menubar", "menubar", f, first_wv, |
| 49322 | 1220 G_CALLBACK (menubar_selection_callback), |
| 1221 G_CALLBACK (popup_deactivate_callback), | |
| 1222 G_CALLBACK (menu_highlight_callback)); | |
| 1223 | |
| 1224 f->output_data.x->menubar_widget = menubar_widget; | |
| 1225 } | |
| 1226 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1227 |
| 49322 | 1228 #else /* not USE_GTK */ |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1229 if (menubar_widget) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1230 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1231 /* 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
|
1232 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
|
1233 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1234 /* 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
|
1235 menu trees we supply, rather than just the menu bar item names. */ |
| 12661 | 1236 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
|
1237 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
1238 /* 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
|
1239 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
|
1240 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1241 else |
|
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1242 { |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
1243 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
|
1244 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
|
1245 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1246 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
|
1247 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
|
1248 0, |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1249 popup_activate_callback, |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1250 menubar_selection_callback, |
|
27341
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1251 popup_deactivate_callback, |
|
ab22130d8fe3
(enum menu_item_idx): New enumeration replacing defines
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1252 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
|
1253 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
|
1254 |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
1255 /* 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
|
1256 XtOverrideTranslations (menubar_widget, override); |
|
109174
01e36ca71747
Fix compilation for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1257 #ifdef USE_LUCID |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1258 apply_systemfont_to_menu (menubar_widget); |
|
109174
01e36ca71747
Fix compilation for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1259 #endif |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1260 } |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1261 |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1262 { |
|
109391
a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109374
diff
changeset
|
1263 int menubar_size; |
|
109184
04ae6087d3c0
Fix frame sizing for Lucid/Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109179
diff
changeset
|
1264 if (f->output_data.x->menubar_widget) |
|
04ae6087d3c0
Fix frame sizing for Lucid/Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109179
diff
changeset
|
1265 XtRealizeWidget (f->output_data.x->menubar_widget); |
|
04ae6087d3c0
Fix frame sizing for Lucid/Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109179
diff
changeset
|
1266 |
|
109391
a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109374
diff
changeset
|
1267 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
|
1268 = (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
|
1269 ? (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
|
1270 + 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
|
1271 : 0); |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1272 |
|
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1273 #if 1 /* Experimentally, we now get the right results |
|
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1274 for -geometry -0-0 without this. 24 Aug 96, rms. |
|
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1275 Maybe so, but the menu bar size is missing the pixels so the |
|
109391
a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109374
diff
changeset
|
1276 WM size hints are off by these pixels. Jan D, oct 2009. */ |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
1277 #ifdef USE_LUCID |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1278 if (FRAME_EXTERNAL_MENU_BAR (f)) |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1279 { |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1280 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
|
1281 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
|
1282 XtNinternalBorderWidth, &ibw, NULL); |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1283 menubar_size += ibw; |
|
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1284 } |
|
13489
ddf90bfd3744
Don't include Xaw/Paned.h unless USE_LUCID is defined.
Richard M. Stallman <rms@gnu.org>
parents:
13071
diff
changeset
|
1285 #endif /* USE_LUCID */ |
|
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1286 #endif /* 1 */ |
|
11898
a23359be806b
(set_frame_menubar): Set menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11655
diff
changeset
|
1287 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1288 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
|
1289 } |
| 49322 | 1290 #endif /* not USE_GTK */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1291 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1292 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
|
1293 update_frame_menubar (f); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1294 |
| 49322 | 1295 #ifdef USE_GTK |
| 1296 xg_crazy_callback_abort = 0; | |
| 1297 #endif | |
| 1298 | |
|
12634
eec80ea06395
(set_frame_menubar): If the Lisp-level menu bar menus
Richard M. Stallman <rms@gnu.org>
parents:
12625
diff
changeset
|
1299 UNBLOCK_INPUT; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1300 } |
|
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
|
1301 |
| 14036 | 1302 /* 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
|
1303 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
|
1304 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
|
1305 is visible. */ |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1306 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1307 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1308 initialize_frame_menubar (FRAME_PTR f) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1309 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1310 /* 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
|
1311 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
|
1312 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 12661 | 1313 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
|
1314 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1315 |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1316 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1317 /* Get rid of the menu bar of frame F, and free its storage. |
| 49322 | 1318 This is used when deleting a frame, and when turning off the menu bar. |
| 1319 For GTK this function is in gtkutil.c. */ | |
| 1320 | |
| 1321 #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
|
1322 void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1323 free_frame_menubar (FRAME_PTR f) |
|
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
|
1324 { |
|
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
|
1325 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
|
1326 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1327 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1328 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1329 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1330 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
|
1331 |
|
c73494a6bcd3
(free_frame_menubar): Clear menubar_height field.
Richard M. Stallman <rms@gnu.org>
parents:
17709
diff
changeset
|
1332 f->output_data.x->menubar_height = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1333 |
|
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
|
1334 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
|
1335 { |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1336 #ifdef USE_MOTIF |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1337 /* 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
|
1338 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
|
1339 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
|
1340 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
|
1341 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
|
1342 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
|
1343 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
|
1344 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
|
1345 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
|
1346 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1347 |
|
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
|
1348 BLOCK_INPUT; |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1349 |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1350 #ifdef USE_MOTIF |
|
37211
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1351 if (f->output_data.x->widget) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1352 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
|
1353 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1354 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12661
diff
changeset
|
1355 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
|
1356 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
|
1357 |
|
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1358 #ifdef USE_MOTIF |
|
37211
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1359 if (f->output_data.x->widget) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1360 { |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1361 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
|
1362 if (x1 == 0 && y1 == 0) |
|
afa458ac7a62
(free_frame_menubar) [USE_MOTIF]: Preserve the
Gerd Moellmann <gerd@gnu.org>
parents:
37022
diff
changeset
|
1363 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
|
1364 } |
|
37022
d7d30cecd891
(free_frame_menubar) [USE_MOTIF]: If the shell widget's
Gerd Moellmann <gerd@gnu.org>
parents:
36958
diff
changeset
|
1365 #endif |
|
109184
04ae6087d3c0
Fix frame sizing for Lucid/Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109179
diff
changeset
|
1366 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
|
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
|
1367 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
|
1368 } |
|
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
|
1369 } |
| 49322 | 1370 #endif /* not USE_GTK */ |
| 1371 | |
| 1372 #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
|
1373 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1374 /* 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
|
1375 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
|
1376 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
|
1377 Both assume input is blocked by the caller. */ |
| 118 | 1378 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1379 /* 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
|
1380 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
|
1381 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
|
1382 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
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 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
|
1388 (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
|
1389 |
| 49322 | 1390 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 1391 | |
| 1392 /* The item selected in the popup menu. */ | |
| 1393 static Lisp_Object *volatile menu_item_selection; | |
| 1394 | |
| 1395 #ifdef USE_GTK | |
| 1396 | |
| 1397 /* Used when position a popup menu. See menu_position_func and | |
| 1398 create_and_show_popup_menu below. */ | |
| 1399 struct next_popup_x_y | |
| 1400 { | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
1401 FRAME_PTR f; |
| 49322 | 1402 int x; |
| 1403 int y; | |
| 1404 }; | |
| 1405 | |
| 1406 /* The menu position function to use if we are not putting a popup | |
| 1407 menu where the pointer is. | |
| 1408 MENU is the menu to pop up. | |
| 1409 X and Y shall on exit contain x/y where the menu shall pop up. | |
| 1410 PUSH_IN is not documented in the GTK manual. | |
| 1411 USER_DATA is any data passed in when calling gtk_menu_popup. | |
| 1412 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
|
1413 to store in *X and *Y are as well as the frame for the popup. |
| 49322 | 1414 |
| 1415 Here only X and Y are used. */ | |
| 1416 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1417 menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) |
| 49322 | 1418 { |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
1419 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
|
1420 GtkRequisition req; |
|
98224
25a5f64dd9db
(menu_position_func): Use x_display_pixel_height and
Chong Yidong <cyd@stupidchicken.com>
parents:
98035
diff
changeset
|
1421 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (data->f); |
|
25a5f64dd9db
(menu_position_func): Use x_display_pixel_height and
Chong Yidong <cyd@stupidchicken.com>
parents:
98035
diff
changeset
|
1422 int disp_width = x_display_pixel_width (dpyinfo); |
|
25a5f64dd9db
(menu_position_func): Use x_display_pixel_height and
Chong Yidong <cyd@stupidchicken.com>
parents:
98035
diff
changeset
|
1423 int disp_height = x_display_pixel_height (dpyinfo); |
| 58171 | 1424 |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
1425 *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
|
1426 *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
|
1427 |
|
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
1428 /* 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
|
1429 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
|
1430 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
|
1431 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
|
1432 *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
|
1433 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
|
1434 *y -= data->y + req.height - disp_height; |
| 49322 | 1435 } |
| 1436 | |
| 1437 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1438 popup_selection_callback (GtkWidget *widget, gpointer client_data) |
| 49322 | 1439 { |
| 1440 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; | |
| 1441 | |
| 1442 if (xg_crazy_callback_abort) return; | |
| 1443 if (cb_data) menu_item_selection = (Lisp_Object *) cb_data->call_data; | |
| 1444 } | |
| 1445 | |
|
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
|
1446 static Lisp_Object |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1447 pop_down_menu (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
|
1448 { |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
1449 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
|
1450 |
|
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
|
1451 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
|
1452 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
|
1453 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
|
1454 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
|
1455 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
|
1456 } |
|
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
|
1457 |
| 49322 | 1458 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the |
| 1459 menu pops down. | |
| 1460 menu_item_selection will be set to the selection. */ | |
| 1461 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1462 create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, EMACS_UINT timestamp) |
| 49322 | 1463 { |
| 1464 int i; | |
| 1465 GtkWidget *menu; | |
| 1466 GtkMenuPositionFunc pos_func = 0; /* Pop up at pointer. */ | |
| 1467 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
|
1468 int specpdl_count = SPECPDL_INDEX (); |
| 49322 | 1469 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1470 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1471 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1472 |
| 49322 | 1473 xg_crazy_callback_abort = 1; |
| 1474 menu = xg_create_widget ("popup", first_wv->name, f, first_wv, | |
| 1475 G_CALLBACK (popup_selection_callback), | |
| 1476 G_CALLBACK (popup_deactivate_callback), | |
| 1477 G_CALLBACK (menu_highlight_callback)); | |
| 1478 xg_crazy_callback_abort = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1479 |
| 49322 | 1480 if (! for_click) |
| 1481 { | |
| 1482 /* Not invoked by a click. pop up at x/y. */ | |
| 1483 pos_func = menu_position_func; | |
| 1484 | |
| 1485 /* 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
|
1486 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
|
1487 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 49322 | 1488 |
| 1489 popup_x_y.x = x; | |
| 1490 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
|
1491 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
|
1492 |
|
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
|
1493 i = 0; /* gtk_menu_popup needs this to be 0 for a non-button popup. */ |
| 49322 | 1494 } |
|
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
|
1495 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
|
1496 { |
|
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
|
1497 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
|
1498 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
|
1499 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
|
1500 } |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
1501 |
| 49322 | 1502 /* Display the menu. */ |
| 1503 gtk_widget_show_all (menu); | |
|
105903
28d5dd02302d
* xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu.
Chong Yidong <cyd@stupidchicken.com>
parents:
105895
diff
changeset
|
1504 |
|
105891
07c792840800
* xmenu.c (Fx_popup_menu): Extract event timestamp. Pass it to
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1505 gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, |
| 105895 | 1506 timestamp > 0 ? timestamp : gtk_get_current_event_time()); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1507 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
1508 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
|
1509 |
|
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
107878
diff
changeset
|
1510 if (gtk_widget_get_mapped (menu)) |
|
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
|
1511 { |
|
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
|
1512 /* 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
|
1513 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
|
1514 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
|
1515 /* 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
|
1516 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
|
1517 } |
|
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
|
1518 |
|
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
|
1519 unbind_to (specpdl_count, Qnil); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1520 |
| 49322 | 1521 /* Must reset this manually because the button release event is not passed |
| 1522 to Emacs event loop. */ | |
| 1523 FRAME_X_DISPLAY_INFO (f)->grabbed = 0; | |
| 1524 } | |
| 1525 | |
| 1526 #else /* not USE_GTK */ | |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1527 |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
1528 /* 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
|
1529 library. |
|
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
1530 |
|
da016ba65a6c
(xmenu_show, xdialog_show): Increment widget_id_tick
Karl Heuer <kwzh@gnu.org>
parents:
11907
diff
changeset
|
1531 For the main windows, and popup menus, we use this counter, |
| 12661 | 1532 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
|
1533 |
| 12661 | 1534 For menu bars, we use numbers starting at 0, counted in |
| 1535 next_menubar_widget_id. */ | |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
1536 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
|
1537 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1538 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1539 popup_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1540 { |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1541 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
|
1542 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1543 |
|
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
|
1544 /* 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
|
1545 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
|
1546 |
|
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
|
1547 static Lisp_Object |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1548 pop_down_menu (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
|
1549 { |
|
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
|
1550 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
|
1551 | 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
|
1552 |
|
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
|
1553 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
|
1554 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
|
1555 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
|
1556 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
|
1557 |
|
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
|
1558 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
|
1559 } |
|
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
|
1560 |
| 49322 | 1561 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the |
| 1562 menu pops down. | |
| 1563 menu_item_selection will be set to the selection. */ | |
| 1564 static void | |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1565 create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, unsigned int timestamp) |
| 49322 | 1566 { |
| 1567 int i; | |
| 1568 Arg av[2]; | |
| 1569 int ac = 0; | |
| 1570 XButtonPressedEvent dummy; | |
| 1571 LWLIB_ID menu_id; | |
| 1572 Widget menu; | |
| 1573 | |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1574 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1575 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1576 |
| 49322 | 1577 menu_id = widget_id_tick++; |
| 1578 menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv, | |
| 1579 f->output_data.x->widget, 1, 0, | |
| 1580 popup_selection_callback, | |
| 1581 popup_deactivate_callback, | |
| 1582 menu_highlight_callback); | |
| 1583 | |
|
109174
01e36ca71747
Fix compilation for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1584 #ifdef USE_LUCID |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1585 apply_systemfont_to_menu (menu); |
|
109174
01e36ca71747
Fix compilation for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1586 #endif |
|
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1587 |
| 49322 | 1588 dummy.type = ButtonPress; |
| 1589 dummy.serial = 0; | |
| 1590 dummy.send_event = 0; | |
| 1591 dummy.display = FRAME_X_DISPLAY (f); | |
| 1592 dummy.time = CurrentTime; | |
| 1593 dummy.root = FRAME_X_DISPLAY_INFO (f)->root_window; | |
| 1594 dummy.window = dummy.root; | |
| 1595 dummy.subwindow = dummy.root; | |
| 1596 dummy.x = x; | |
| 1597 dummy.y = y; | |
| 1598 | |
| 1599 /* 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
|
1600 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
|
1601 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 49322 | 1602 |
| 1603 dummy.x_root = x; | |
| 1604 dummy.y_root = y; | |
| 1605 | |
| 1606 dummy.state = 0; | |
| 1607 dummy.button = 0; | |
| 1608 for (i = 0; i < 5; i++) | |
| 1609 if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) | |
| 1610 dummy.button = i; | |
| 1611 | |
| 1612 /* Don't allow any geometry request from the user. */ | |
| 1613 XtSetArg (av[ac], XtNgeometry, 0); ac++; | |
| 1614 XtSetValues (menu, av, ac); | |
| 1615 | |
| 1616 /* Display the menu. */ | |
| 1617 lw_popup_menu (menu, (XEvent *) &dummy); | |
| 1618 popup_activated_flag = 1; | |
|
72854
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
1619 x_activate_timeout_atimer (); |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
1620 |
|
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
|
1621 { |
|
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
|
1622 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
|
1623 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
|
1624 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
|
1625 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
|
1626 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
|
1627 |
|
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
|
1628 /* 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
|
1629 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
|
1630 |
|
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
|
1631 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
|
1632 } |
| 49322 | 1633 } |
| 1634 | |
| 1635 #endif /* not USE_GTK */ | |
| 1636 | |
|
105923
1011707400d3
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105903
diff
changeset
|
1637 Lisp_Object |
|
1011707400d3
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105903
diff
changeset
|
1638 xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, |
|
1011707400d3
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105903
diff
changeset
|
1639 Lisp_Object title, char **error, EMACS_UINT timestamp) |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1640 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1641 int i; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1642 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
|
1643 widget_value **submenu_stack |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1644 = (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
|
1645 Lisp_Object *subprefix_stack |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1646 = (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
|
1647 int submenu_depth = 0; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
1648 |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1649 int first_pane; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1650 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1651 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1652 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1653 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1654 *error = NULL; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1655 |
|
7335
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
1656 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
1657 { |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
1658 *error = "Empty menu"; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
1659 return Qnil; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
1660 } |
|
5896
b20145eafe0c
(xmenu_show) [USE_X_TOOLKIT]: return Qnil when val is null.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5881
diff
changeset
|
1661 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1662 /* 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
|
1663 representing the panes and their items. */ |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1664 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
|
1665 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
|
1666 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
|
1667 wv->enabled = 1; |
| 24993 | 1668 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
1669 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
|
1670 first_wv = wv; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1671 first_pane = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1672 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1673 /* 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
|
1674 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1675 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
|
1676 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1677 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
|
1678 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1679 submenu_stack[submenu_depth++] = save_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1680 save_wv = prev_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1681 prev_wv = 0; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1682 first_pane = 1; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1683 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1684 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1685 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
|
1686 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1687 prev_wv = save_wv; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1688 save_wv = submenu_stack[--submenu_depth]; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1689 first_pane = 0; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1690 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1691 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1692 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
|
1693 && submenu_depth != 0) |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1694 i += MENU_ITEMS_PANE_LENGTH; |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
1695 /* Ignore a nil in the item list. |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
1696 It's meaningful only for dialog boxes. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
1697 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
|
1698 i += 1; |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1699 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
|
1700 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1701 /* 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
|
1702 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
|
1703 char *pane_string; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1704 |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1705 pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1706 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1707 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1708 #ifndef HAVE_MULTILINGUAL_MENU |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1709 if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1710 { |
|
60583
44c9c79a2c7a
(ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59914
diff
changeset
|
1711 pane_name = ENCODE_MENU_STRING (pane_name); |
|
91607
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
1712 ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1713 } |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1714 #endif |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1715 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
|
1716 ? "" : (char *) SDATA (pane_name)); |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1717 /* 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
|
1718 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
|
1719 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
|
1720 pane_string = ""; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1721 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1722 /* 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
|
1723 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
|
1724 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
|
1725 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
|
1726 { |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1727 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
|
1728 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
|
1729 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
|
1730 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1731 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
|
1732 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
|
1733 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
|
1734 wv->name++; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1735 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
|
1736 wv->enabled = 1; |
| 24993 | 1737 wv->button_type = BUTTON_TYPE_NONE; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
1738 wv->help = Qnil; |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1739 save_wv = wv; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1740 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
|
1741 } |
|
7521
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1742 else if (first_pane) |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1743 { |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1744 save_wv = wv; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1745 prev_wv = 0; |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1746 } |
|
2971264ff9aa
(xmenu_show): Completely ignore nameless panes
Richard M. Stallman <rms@gnu.org>
parents:
7459
diff
changeset
|
1747 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
|
1748 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
|
1749 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1750 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1751 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1752 /* 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
|
1753 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:
37864
diff
changeset
|
1754 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1755 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1756 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1757 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1758 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1759 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED); |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1760 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); |
| 24993 | 1761 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1762 #ifndef HAVE_MULTILINGUAL_MENU |
| 24993 | 1763 if (STRINGP (item_name) && STRING_MULTIBYTE (item_name)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1764 { |
| 51404 | 1765 item_name = ENCODE_MENU_STRING (item_name); |
|
91607
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
1766 ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1767 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1768 |
| 24993 | 1769 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1770 { |
| 51404 | 1771 descrip = ENCODE_MENU_STRING (descrip); |
|
91607
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
1772 ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip); |
|
37940
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1773 } |
|
e76f885709fc
(single_submenu, xmenu_show) [!HAVE_MULTILINGUAL_MENU]:
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
1774 #endif /* not HAVE_MULTILINGUAL_MENU */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1775 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1776 wv = xmalloc_widget_value (); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1777 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
|
1778 prev_wv->next = wv; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1779 else |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1780 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
|
1781 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
|
1782 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
|
1783 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
|
1784 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
|
1785 /* 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
|
1786 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
|
1787 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
|
1788 wv->call_data |
|
358d48409854
Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
Richard M. Stallman <rms@gnu.org>
parents:
9725
diff
changeset
|
1789 = (!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
|
1790 wv->enabled = !NILP (enable); |
| 24993 | 1791 |
| 1792 if (NILP (type)) | |
| 1793 wv->button_type = BUTTON_TYPE_NONE; | |
| 1794 else if (EQ (type, QCtoggle)) | |
| 1795 wv->button_type = BUTTON_TYPE_TOGGLE; | |
| 1796 else if (EQ (type, QCradio)) | |
| 1797 wv->button_type = BUTTON_TYPE_RADIO; | |
| 1798 else | |
| 1799 abort (); | |
| 1800 | |
| 1801 wv->selected = !NILP (selected); | |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1802 |
|
41769
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1803 if (! STRINGP (help)) |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1804 help = Qnil; |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1805 |
|
26c1876db9e3
(menu_highlight_callback): Use `help' field as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40993
diff
changeset
|
1806 wv->help = help; |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1807 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1808 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
|
1809 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1810 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
|
1811 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1812 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1813 |
|
9236
583bb9211b2b
(popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
Paul Reilly <pmr@pajato.com>
parents:
9233
diff
changeset
|
1814 /* 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
|
1815 if (!NILP (title)) |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1816 { |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1817 widget_value *wv_title = xmalloc_widget_value (); |
|
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1818 widget_value *wv_sep1 = xmalloc_widget_value (); |
|
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
1819 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
|
1820 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1821 wv_sep2->name = "--"; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1822 wv_sep2->next = first_wv->contents; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
1823 wv_sep2->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1824 |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1825 wv_sep1->name = "--"; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1826 wv_sep1->next = wv_sep2; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
1827 wv_sep1->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1828 |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1829 #ifndef HAVE_MULTILINGUAL_MENU |
|
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1830 if (STRING_MULTIBYTE (title)) |
| 51404 | 1831 title = ENCODE_MENU_STRING (title); |
|
23302
dcff2a4b6cb4
(single_submenu) [! HAVE_MULTILINGUAL_MENU]: Make
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1832 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1833 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1834 wv_title->name = (char *) SDATA (title); |
|
40477
a56267e601e4
Include coding.h and charset.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40239
diff
changeset
|
1835 wv_title->enabled = TRUE; |
| 24993 | 1836 wv_title->button_type = BUTTON_TYPE_NONE; |
|
95730
c3a24b1a8412
(set_frame_menubar): Sync with version in xmenu.c.
Jason Rumney <jasonr@gnu.org>
parents:
95647
diff
changeset
|
1837 wv_title->help = Qnil; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1838 wv_title->next = wv_sep1; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1839 first_wv->contents = wv_title; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1840 } |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1841 |
| 49322 | 1842 /* No selection has been chosen yet. */ |
| 1843 menu_item_selection = 0; | |
| 1844 | |
| 1845 /* Actually create and show the menu until popped down. */ | |
|
105891
07c792840800
* xmenu.c (Fx_popup_menu): Extract event timestamp. Pass it to
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1846 create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp); |
|
8414
8a8d2cdd4218
(xmenu_show): Ignore any geometry resource from the user.
Richard M. Stallman <rms@gnu.org>
parents:
8269
diff
changeset
|
1847 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1848 /* 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
|
1849 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
|
1850 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1851 /* 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
|
1852 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
|
1853 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
|
1854 { |
|
11655
a9f93ce6e1b4
(xmenu_show, menubar_selection_callback): Move declaration
Karl Heuer <kwzh@gnu.org>
parents:
11614
diff
changeset
|
1855 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
|
1856 |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31465
diff
changeset
|
1857 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
|
1858 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1859 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
|
1860 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1861 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
|
1862 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1863 subprefix_stack[submenu_depth++] = prefix; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1864 prefix = entry; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1865 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1866 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1867 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
|
1868 { |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1869 prefix = subprefix_stack[--submenu_depth]; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1870 i++; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1871 } |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1872 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
|
1873 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1874 prefix |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1875 = 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
|
1876 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
|
1877 } |
|
13071
2e514396cbc8
(popup_get_selection): Pop menu down if button is pressed
Richard M. Stallman <rms@gnu.org>
parents:
12747
diff
changeset
|
1878 /* 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
|
1879 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
|
1880 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
|
1881 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
|
1882 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1883 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1884 entry |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1885 = 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
|
1886 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
|
1887 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1888 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
|
1889 { |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1890 int j; |
|
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1891 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1892 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
|
1893 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
|
1894 entry = Fcons (prefix, entry); |
|
6291
38ec8e76594f
(Fx_popup_menu): If POSITION is nil,
Richard M. Stallman <rms@gnu.org>
parents:
6200
diff
changeset
|
1895 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
|
1896 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
|
1897 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
|
1898 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1899 return entry; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1900 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1901 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
|
1902 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1903 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1904 } |
|
61984
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
1905 else if (!for_click) |
|
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
1906 /* Make "Cancel" equivalent to C-g. */ |
|
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
1907 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
|
1908 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
1909 return Qnil; |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1910 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1911 |
| 49322 | 1912 #ifdef USE_GTK |
| 1913 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1914 dialog_selection_callback (GtkWidget *widget, gpointer client_data) |
| 49322 | 1915 { |
| 1916 /* The EMACS_INT cast avoids a warning. There's no problem | |
| 1917 as long as pointers have enough bits to hold small integers. */ | |
| 1918 if ((int) (EMACS_INT) client_data != -1) | |
| 1919 menu_item_selection = (Lisp_Object *) client_data; | |
| 1920 | |
| 1921 popup_activated_flag = 0; | |
| 1922 } | |
| 1923 | |
| 1924 /* Pop up the dialog for frame F defined by FIRST_WV and loop until the | |
| 1925 dialog pops down. | |
| 1926 menu_item_selection will be set to the selection. */ | |
| 1927 static void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1928 create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) |
| 49322 | 1929 { |
| 1930 GtkWidget *menu; | |
| 1931 | |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1932 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1933 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1934 |
| 49322 | 1935 menu = xg_create_widget ("dialog", first_wv->name, f, first_wv, |
| 1936 G_CALLBACK (dialog_selection_callback), | |
| 1937 G_CALLBACK (popup_deactivate_callback), | |
| 1938 0); | |
| 1939 | |
| 1940 if (menu) | |
| 1941 { | |
|
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
|
1942 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
|
1943 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
|
1944 |
| 49322 | 1945 /* Display the menu. */ |
| 1946 gtk_widget_show_all (menu); | |
| 1947 | |
| 1948 /* 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
|
1949 popup_widget_loop (1, menu); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1950 |
|
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
|
1951 unbind_to (specpdl_count, Qnil); |
| 49322 | 1952 } |
| 1953 } | |
| 1954 | |
| 1955 #else /* not USE_GTK */ | |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1956 static void |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1957 dialog_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1958 { |
|
11266
3e93d8b99b05
(menubar_selection_callback, dialog_selection_callback)
Richard M. Stallman <rms@gnu.org>
parents:
11237
diff
changeset
|
1959 /* 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
|
1960 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
|
1961 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
|
1962 menu_item_selection = (Lisp_Object *) client_data; |
| 49322 | 1963 |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1964 BLOCK_INPUT; |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1965 lw_destroy_all_widgets (id); |
|
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1966 UNBLOCK_INPUT; |
|
11614
fdd0d5bdd8c6
(popup_get_selection): Use x_non_menubar_window_to_frame.
Karl Heuer <kwzh@gnu.org>
parents:
11528
diff
changeset
|
1967 popup_activated_flag = 0; |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
1968 } |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
1969 |
| 49322 | 1970 |
| 1971 /* Pop up the dialog for frame F defined by FIRST_WV and loop until the | |
| 1972 dialog pops down. | |
| 1973 menu_item_selection will be set to the selection. */ | |
| 1974 static void | |
|
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109302
diff
changeset
|
1975 create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) |
| 49322 | 1976 { |
| 1977 LWLIB_ID dialog_id; | |
| 1978 | |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1979 if (!FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1980 abort(); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1981 |
| 49322 | 1982 dialog_id = widget_id_tick++; |
|
109174
01e36ca71747
Fix compilation for Motif/Lesstif.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1983 #ifdef USE_LUCID |
|
107827
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
1984 apply_systemfont_to_dialog (f->output_data.x->widget); |
|
aa85632b7860
Use XFT in Lucid dialogs if available.
Jan D. <jan.h.d@swipnet.se>
parents:
107804
diff
changeset
|
1985 #endif |
| 49322 | 1986 lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv, |
| 1987 f->output_data.x->widget, 1, 0, | |
| 1988 dialog_selection_callback, 0, 0); | |
| 1989 lw_modify_all_widgets (dialog_id, first_wv->contents, True); | |
| 1990 /* Display the dialog box. */ | |
| 1991 lw_pop_up_all_widgets (dialog_id); | |
| 1992 popup_activated_flag = 1; | |
|
72854
f295b430aa3a
* xterm.c (x_initialize): Don't install Xt event timer here.
Chong Yidong <cyd@stupidchicken.com>
parents:
72757
diff
changeset
|
1993 x_activate_timeout_atimer (); |
| 49322 | 1994 |
| 1995 /* Process events that apply to the dialog box. | |
| 1996 Also handle timers. */ | |
| 1997 { | |
| 1998 int count = SPECPDL_INDEX (); | |
| 1999 int fact = 4 * sizeof (LWLIB_ID); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2000 |
| 49322 | 2001 /* 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
|
2002 record_unwind_protect (pop_down_menu, |
| 49322 | 2003 Fcons (make_number (dialog_id >> (fact)), |
| 2004 make_number (dialog_id & ~(-1 << (fact))))); | |
| 2005 | |
|
57965
9b14127a651a
* eval.c (Feval): Remove check for INPUT_BLOCKED_P.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57928
diff
changeset
|
2006 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
|
2007 dialog_id, 1); |
| 49322 | 2008 |
| 2009 unbind_to (count, Qnil); | |
| 2010 } | |
| 2011 } | |
| 2012 | |
| 2013 #endif /* not USE_GTK */ | |
| 2014 | |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2015 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
|
2016 "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
|
2017 "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
|
2018 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2019 static Lisp_Object |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2020 xdialog_show (FRAME_PTR f, int keymaps, Lisp_Object title, Lisp_Object header, char **error_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
|
2021 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2022 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
|
2023 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
|
2024 |
|
25730
db88a4b84d91
(single_menu_item, Fx_popup_menu, Fx_popup_menu,
Gerd Moellmann <gerd@gnu.org>
parents:
25680
diff
changeset
|
2025 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
|
2026 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2027 /* Number of elements seen so far, before boundary. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2028 int left_count = 0; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2029 /* 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
|
2030 int boundary_seen = 0; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2031 |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2032 if (! FRAME_X_P (f)) |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2033 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2034 |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2035 *error_name = NULL; |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2036 |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2037 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
|
2038 { |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2039 *error_name = "Multiple panes in dialog box"; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2040 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
|
2041 } |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2042 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2043 /* 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
|
2044 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
|
2045 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2046 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
|
2047 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
|
2048 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
|
2049 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
|
2050 pane_string = (NILP (pane_name) |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2051 ? "" : (char *) SDATA (pane_name)); |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2052 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
|
2053 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
|
2054 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
|
2055 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
|
2056 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
|
2057 prev_wv->name = "message"; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2058 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
|
2059 first_wv = prev_wv; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2060 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2061 /* 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
|
2062 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
|
2063 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
|
2064 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2065 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2066 /* 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
|
2067 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
|
2068 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
|
2069 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
|
2070 descrip |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2071 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2072 |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2073 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
|
2074 { |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2075 free_menubar_widget_value_tree (first_wv); |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2076 *error_name = "Submenu in dialog items"; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2077 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
|
2078 } |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2079 if (EQ (item_name, Qquote)) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2080 { |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2081 /* This is the boundary between left-side elts |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2082 and right-side elts. Stop incrementing right_count. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2083 boundary_seen = 1; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2084 i++; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2085 continue; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2086 } |
|
15912
afb0bb1cdbe6
(xdialog_show): Don't allow 9 buttons.
Richard M. Stallman <rms@gnu.org>
parents:
15839
diff
changeset
|
2087 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
|
2088 { |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2089 free_menubar_widget_value_tree (first_wv); |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2090 *error_name = "Too many dialog items"; |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2091 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
|
2092 } |
|
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2093 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2094 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
|
2095 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
|
2096 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
|
2097 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
|
2098 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
|
2099 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
|
2100 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
|
2101 wv->enabled = !NILP (enable); |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2102 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
|
2103 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
|
2104 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2105 if (! boundary_seen) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2106 left_count++; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2107 |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2108 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
|
2109 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
|
2110 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2111 |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2112 /* If the boundary was not specified, |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2113 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
|
2114 if (! boundary_seen) |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2115 left_count = nb_buttons - nb_buttons / 2; |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2116 |
|
14546
bc0388a7c282
(xmalloc_widget_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14298
diff
changeset
|
2117 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
|
2118 wv->name = dialog_name; |
|
42588
43a330df6213
(set_frame_menubar, xmenu_show):
Jason Rumney <jasonr@gnu.org>
parents:
42586
diff
changeset
|
2119 wv->help = Qnil; |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2120 |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2121 /* Frame title: 'Q' = Question, 'I' = Information. |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2122 Can also have 'E' = Error if, one day, we want |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2123 a popup for errors. */ |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2124 if (NILP(header)) |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2125 dialog_name[0] = 'Q'; |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2126 else |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2127 dialog_name[0] = 'I'; |
|
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2128 |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2129 /* 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
|
2130 which specifies how many buttons to use |
|
62661
0db5674a79de
(Fx_popup_dialog): Add a third boolean argument to
Nick Roberts <nickrob@snap.net.nz>
parents:
62216
diff
changeset
|
2131 and how many buttons are on the right. */ |
|
6426
1f1388aa2d44
(Fx_popup_dialog): Don't fail to set X, Y from POSITION.
Richard M. Stallman <rms@gnu.org>
parents:
6424
diff
changeset
|
2132 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
|
2133 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
|
2134 dialog_name[3] = 'R'; |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2135 /* Number of buttons to put on the right. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2136 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
|
2137 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
|
2138 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
|
2139 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
|
2140 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2141 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2142 /* 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
|
2143 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
|
2144 |
| 49322 | 2145 /* Actually create and show the dialog. */ |
| 2146 create_and_show_dialog (f, first_wv); | |
| 2147 | |
| 2148 /* Free the widget_value objects we used to specify the contents. */ | |
| 2149 free_menubar_widget_value_tree (first_wv); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2150 |
| 49322 | 2151 /* Find the selected item, and its pane, to return |
| 2152 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
|
2153 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
|
2154 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2155 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
|
2156 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2157 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
|
2158 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
|
2159 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
|
2160 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2161 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
|
2162 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2163 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
|
2164 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2165 prefix |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2166 = 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
|
2167 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
|
2168 } |
|
31465
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
2169 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
|
2170 { |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
2171 /* 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
|
2172 right-side elts. */ |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
2173 ++i; |
|
b58d8e366faa
(xdialog_show): When looking up the selection in
Gerd Moellmann <gerd@gnu.org>
parents:
31365
diff
changeset
|
2174 } |
|
6307
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2175 else |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2176 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2177 entry |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2178 = 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
|
2179 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
|
2180 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2181 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
|
2182 { |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2183 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
|
2184 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
|
2185 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
|
2186 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2187 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
|
2188 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2189 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
|
2190 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2191 } |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2192 } |
|
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2193 else |
|
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58824
diff
changeset
|
2194 /* 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
|
2195 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
|
2196 |
|
1f9fa4022502
(xdialog_show): New function to handle the display of dialog boxes.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6291
diff
changeset
|
2197 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
|
2198 } |
|
30299
f2cd2bf063c9
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30215
diff
changeset
|
2199 |
| 49322 | 2200 #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
|
2201 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2202 /* 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
|
2203 Used to generate menu help events. */ |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2204 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2205 static struct frame *menu_help_frame; |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2206 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2207 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2208 /* 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
|
2209 |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2210 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
|
2211 the menu (currently not used). |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2212 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2213 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
|
2214 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
|
2215 keyboard events. */ |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2216 |
|
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2217 static void |
|
109374
88a5b905a895
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109372
diff
changeset
|
2218 menu_help_callback (char *help_string, int pane, int item) |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2219 { |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2220 extern Lisp_Object Qmenu_item; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2221 Lisp_Object *first_item; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2222 Lisp_Object pane_name; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2223 Lisp_Object menu_object; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2224 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2225 first_item = XVECTOR (menu_items)->contents; |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2226 if (EQ (first_item[0], Qt)) |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2227 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
|
2228 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
|
2229 /* This shouldn't happen, see xmenu_show. */ |
|
81273
13e433477b6c
(menu_help_callback): Use empty_unibyte_string, not empty_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
77513
diff
changeset
|
2230 pane_name = empty_unibyte_string; |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2231 else |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2232 pane_name = first_item[MENU_ITEMS_ITEM_NAME]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2233 |
|
30363
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2234 /* (menu-item MENU-NAME PANE-NUMBER) */ |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2235 menu_object = Fcons (Qmenu_item, |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2236 Fcons (pane_name, |
|
8f11e306dc02
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30299
diff
changeset
|
2237 Fcons (make_number (pane), Qnil))); |
|
30299
f2cd2bf063c9
(menu_help_callback): Call show_help_echo with
Gerd Moellmann <gerd@gnu.org>
parents:
30215
diff
changeset
|
2238 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
|
2239 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
|
2240 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2241 |
|
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
|
2242 static Lisp_Object |
|
109374
88a5b905a895
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109372
diff
changeset
|
2243 pop_down_menu (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
|
2244 { |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2245 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
|
2246 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
|
2247 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2248 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
|
2249 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
|
2250 |
|
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
|
2251 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
|
2252 #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
|
2253 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
|
2254 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
|
2255 #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
|
2256 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
|
2257 |
|
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
|
2258 #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
|
2259 /* 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
|
2260 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
|
2261 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
|
2262 |
|
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
|
2263 /* 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
|
2264 (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
|
2265 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
|
2266 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
|
2267 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
|
2268 |
|
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
|
2269 #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
|
2270 |
|
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
|
2271 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
|
2272 |
|
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
|
2273 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
|
2274 } |
|
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
|
2275 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2276 |
|
105931
a5db20cb0a5a
xmenu.c (xmenu_show): Must not be static after 2009-11-09 changes.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
105923
diff
changeset
|
2277 Lisp_Object |
|
109374
88a5b905a895
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109372
diff
changeset
|
2278 xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp) |
| 118 | 2279 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2280 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
|
2281 XMenu *menu; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2282 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
|
2283 Lisp_Object entry, pane_prefix; |
| 118 | 2284 char *datap; |
| 2285 int ulx, uly, width, height; | |
| 2286 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
|
2287 int i, j, lines, maxlines; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2288 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
|
2289 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
|
2290 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
|
2291 int specpdl_count = SPECPDL_INDEX (); |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
2292 |
|
97645
229acec13840
(Fx_popup_dialog, Fx_popup_menu, xmenu_show): Allow MSDOS frames along with
Eli Zaretskii <eliz@gnu.org>
parents:
97204
diff
changeset
|
2293 if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2294 abort (); |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
2295 |
|
3747
6506b2fd475a
(xmenu_show): Store 0 in *ERROR at the beginning.
Richard M. Stallman <rms@gnu.org>
parents:
3501
diff
changeset
|
2296 *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
|
2297 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
|
2298 return Qnil; |
|
1082
d24afc1bef38
(xmenu_show): If no panes, just return.
Richard M. Stallman <rms@gnu.org>
parents:
975
diff
changeset
|
2299 |
|
7335
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2300 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH) |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2301 { |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2302 *error = "Empty menu"; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2303 return Qnil; |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2304 } |
|
73d1276933e1
(xmenu_show): Disallow empty menus.
Karl Heuer <kwzh@gnu.org>
parents:
7334
diff
changeset
|
2305 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2306 /* 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
|
2307 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
|
2308 &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
|
2309 &dummy_uint, &dummy_uint); |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2310 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2311 /* 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
|
2312 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
|
2313 if (menu == NULL) |
| 118 | 2314 { |
| 2315 *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
|
2316 return Qnil; |
| 118 | 2317 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2318 |
|
67743
3c879987313f
(xmenu_show): Call inhibit_garbage_collection.
Richard M. Stallman <rms@gnu.org>
parents:
67703
diff
changeset
|
2319 /* Don't GC while we prepare and show the menu, |
|
3c879987313f
(xmenu_show): Call inhibit_garbage_collection.
Richard M. Stallman <rms@gnu.org>
parents:
67703
diff
changeset
|
2320 because we give the oldxmenu library pointers to the |
|
3c879987313f
(xmenu_show): Call inhibit_garbage_collection.
Richard M. Stallman <rms@gnu.org>
parents:
67703
diff
changeset
|
2321 contents of strings. */ |
|
3c879987313f
(xmenu_show): Call inhibit_garbage_collection.
Richard M. Stallman <rms@gnu.org>
parents:
67703
diff
changeset
|
2322 inhibit_garbage_collection (); |
|
3c879987313f
(xmenu_show): Call inhibit_garbage_collection.
Richard M. Stallman <rms@gnu.org>
parents:
67703
diff
changeset
|
2323 |
| 9572 | 2324 #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
|
2325 /* 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
|
2326 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
|
2327 y += FRAME_OUTER_TO_INNER_DIFF_Y (f); |
| 9572 | 2328 #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
|
2329 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2330 /* 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
|
2331 x += f->left_pos; |
|
332134065648
Make (some) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50938
diff
changeset
|
2332 y += f->top_pos; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2333 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2334 /* 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
|
2335 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
|
2336 while (i < menu_items_used) |
| 118 | 2337 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2338 if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
| 118 | 2339 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2340 /* 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
|
2341 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
|
2342 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
|
2343 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
2344 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
|
2345 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
|
2346 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
|
2347 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
|
2348 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
|
2349 ? "" : (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
|
2350 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
|
2351 pane_string++; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2352 |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2353 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
|
2354 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
|
2355 { |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2356 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
|
2357 *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
|
2358 return Qnil; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2359 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2360 i += MENU_ITEMS_PANE_LENGTH; |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2361 |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2362 /* 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
|
2363 maxwidth = 0; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2364 j = i; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2365 while (j < menu_items_used) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2366 { |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2367 Lisp_Object item; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2368 item = XVECTOR (menu_items)->contents[j]; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2369 if (EQ (item, Qt)) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2370 break; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2371 if (NILP (item)) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2372 { |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2373 j++; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2374 continue; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2375 } |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2376 width = SBYTES (item); |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2377 if (width > maxwidth) |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2378 maxwidth = width; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2379 |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2380 j += MENU_ITEMS_ITEM_LENGTH; |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2381 } |
| 118 | 2382 } |
|
6746
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2383 /* Ignore a nil in the item list. |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2384 It's meaningful only for dialog boxes. */ |
|
cda1ce7952ca
(Fx_popup_dialog): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6656
diff
changeset
|
2385 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
|
2386 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
|
2387 else |
| 118 | 2388 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2389 /* 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
|
2390 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
|
2391 unsigned char *item_data; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2392 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
|
2393 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2394 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
|
2395 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
|
2396 descrip |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2397 = 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
|
2398 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
|
2399 help_string = STRINGP (help) ? SDATA (help) : NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2400 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2401 if (!NILP (descrip)) |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2402 { |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2403 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
|
2404 /* 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
|
2405 to reduce gc needs. */ |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2406 item_data |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2407 = (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
|
2408 + SBYTES (descrip) + 1); |
|
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2409 memcpy (item_data, SDATA (item_name), SBYTES (item_name)); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2410 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
|
2411 item_data[j] = ' '; |
|
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2412 memcpy (item_data + j, SDATA (descrip), SBYTES (descrip)); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2413 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
|
2414 } |
|
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2415 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2416 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
|
2417 |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2418 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
|
2419 menu, lpane, 0, item_data, |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2420 !NILP (enable), help_string) |
| 118 | 2421 == XM_FAILURE) |
| 2422 { | |
|
9608
1a85137cb257
Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2423 XMenuDestroy (FRAME_X_DISPLAY (f), menu); |
| 118 | 2424 *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
|
2425 return Qnil; |
| 118 | 2426 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2427 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
|
2428 lines++; |
| 118 | 2429 } |
| 2430 } | |
|
6881
796416bd7f7e
(last_menu_bar_item_end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6764
diff
changeset
|
2431 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
2432 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
|
2433 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2434 /* 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
|
2435 XMenuRecompute (FRAME_X_DISPLAY (f), menu); |
|
37255
ff709975abaf
(xmenu_show): Use FRAME_X_SCREEN_NUMBER.
Gerd Moellmann <gerd@gnu.org>
parents:
37211
diff
changeset
|
2436 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
|
2437 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
|
2438 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
|
2439 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
|
2440 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
|
2441 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
|
2442 XMenuLocate (FRAME_X_DISPLAY (f), menu, 0, 0, x, y, |
| 118 | 2443 &ulx, &uly, &width, &height); |
| 2444 if (ulx+width > dispwidth) | |
| 2445 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2446 x -= (ulx + width) - dispwidth; |
| 118 | 2447 ulx = dispwidth - width; |
| 2448 } | |
| 2449 if (uly+height > dispheight) | |
| 2450 { | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2451 y -= (uly + height) - dispheight; |
| 118 | 2452 uly = dispheight - height; |
| 2453 } | |
|
98035
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2454 #ifndef HAVE_X_WINDOWS |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2455 if (FRAME_HAS_MINIBUF_P (f) && uly+height > dispheight - 1) |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2456 { |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2457 /* Move the menu away of the echo area, to avoid overwriting the |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2458 menu with help echo messages or vice versa. */ |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2459 if (BUFFERP (echo_area_buffer[0]) && WINDOWP (echo_area_window)) |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2460 { |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2461 y -= WINDOW_TOTAL_LINES (XWINDOW (echo_area_window)); |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2462 uly -= WINDOW_TOTAL_LINES (XWINDOW (echo_area_window)); |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2463 } |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2464 else |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2465 { |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2466 y--; |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2467 uly--; |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2468 } |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2469 } |
|
611a022eaebb
(xmenu_show) [!HAVE_X_WINDOWS]: If frame has a minibuffer, don't let lower
Eli Zaretskii <eliz@gnu.org>
parents:
97645
diff
changeset
|
2470 #endif |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2471 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
|
2472 if (uly < 0) y -= uly; |
|
6526
95661fd7a320
(xmenu_show): Enable asynchronous events.
Karl Heuer <kwzh@gnu.org>
parents:
6481
diff
changeset
|
2473 |
|
58824
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
2474 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
|
2475 { |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
2476 /* 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
|
2477 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
|
2478 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
|
2479 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
|
2480 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
|
2481 } |
|
8da33d42472e
* xmenu.c (Fx_popup_menu): Correct documentation about position.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58283
diff
changeset
|
2482 |
|
6526
95661fd7a320
(xmenu_show): Enable asynchronous events.
Karl Heuer <kwzh@gnu.org>
parents:
6481
diff
changeset
|
2483 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
|
2484 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
|
2485 pane = selidx = 0; |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2486 |
|
58168
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
2487 #ifndef MSDOS |
|
ab22e6ae6fac
* xmenu.c (x_menu_wait_for_event): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57965
diff
changeset
|
2488 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
|
2489 #endif |
|
61619
489414dfb069
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60890
diff
changeset
|
2490 |
|
58215
8f529503ae83
* xmenu.c (pop_down_menu): Remove global variable current_menu,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58202
diff
changeset
|
2491 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
|
2492 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
|
2493 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
|
2494 |
|
27458
2bfd43d89c8e
(xmenu_show) [!USE_X_TOOLKIT]: Pass help to
Gerd Moellmann <gerd@gnu.org>
parents:
27425
diff
changeset
|
2495 /* 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
|
2496 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
|
2497 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
|
2498 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
|
2499 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
|
2500 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
|
2501 |
| 118 | 2502 switch (status) |
| 2503 { | |
| 2504 case XM_SUCCESS: | |
| 2505 #ifdef XDEBUG | |
| 2506 fprintf (stderr, "pane= %d line = %d\n", panes, selidx); | |
| 2507 #endif | |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2508 |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2509 /* 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
|
2510 i = 0; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2511 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
|
2512 { |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2513 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
|
2514 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2515 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
|
2516 pane_prefix |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2517 = 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
|
2518 pane--; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2519 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
|
2520 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2521 else |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2522 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2523 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
|
2524 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2525 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
|
2526 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2527 entry |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2528 = 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
|
2529 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
|
2530 { |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2531 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
|
2532 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
|
2533 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
|
2534 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2535 break; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2536 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2537 selidx--; |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2538 } |
|
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2539 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
|
2540 } |
|
2747
f258c79c9162
(Fx_popup_menu): Add a vector of prefix keys for the panes.
Richard M. Stallman <rms@gnu.org>
parents:
2514
diff
changeset
|
2541 } |
| 118 | 2542 break; |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2543 |
| 118 | 2544 case XM_FAILURE: |
| 2545 *error = "Can't activate menu"; | |
| 2546 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
|
2547 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
|
2548 break; |
| 118 | 2549 case XM_NO_SELECT: |
|
61984
2ce055c7db65
[not HAVE_X_TOOLKIT] (xmenu_show):
Richard M. Stallman <rms@gnu.org>
parents:
61620
diff
changeset
|
2550 /* 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
|
2551 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
|
2552 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
|
2553 Fsignal (Qquit, Qnil); |
| 118 | 2554 entry = Qnil; |
| 2555 break; | |
| 2556 } | |
|
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
|
2557 |
|
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 unbind_to (specpdl_count, Qnil); |
|
7208
2d3c771ff861
(xdialog_show): Clear x_mouse_grabbed.
Richard M. Stallman <rms@gnu.org>
parents:
7175
diff
changeset
|
2559 |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2560 return entry; |
| 118 | 2561 } |
|
9233
746cc6b0d28f
(widget_id_tick): Renamed from popup_id_tick.
Paul Reilly <pmr@pajato.com>
parents:
9102
diff
changeset
|
2562 |
|
5673
7035bc81858b
Find lwlib.h and xlwmenuP.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents:
5602
diff
changeset
|
2563 #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
|
2564 |
|
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
2565 #endif /* HAVE_MENUS */ |
|
73788
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2566 |
|
73941
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2567 /* Detect if a dialog or menu has been posted. */ |
|
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2568 |
|
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2569 int |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2570 popup_activated (void) |
|
73941
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2571 { |
|
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2572 return popup_activated_flag; |
|
b662c7bb9e5f
(popup_activated): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73788
diff
changeset
|
2573 } |
|
73788
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2574 |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2575 /* The following is used by delayed window autoselection. */ |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2576 |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2577 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2578 doc: /* Return t if a menu or popup dialog is active. */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109174
diff
changeset
|
2579 (void) |
|
73788
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2580 { |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2581 #ifdef HAVE_MENUS |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2582 return (popup_activated ()) ? Qt : Qnil; |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2583 #else |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2584 return Qnil; |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2585 #endif /* HAVE_MENUS */ |
|
177184091f28
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Chong Yidong <cyd@stupidchicken.com>
parents:
73715
diff
changeset
|
2586 } |
|
6058
662b9cd767fe
(Fx_popup_menu): Allow t as position, meaning use mouse pos.
Richard M. Stallman <rms@gnu.org>
parents:
6018
diff
changeset
|
2587 |
| 21514 | 2588 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2589 syms_of_xmenu (void) |
| 118 | 2590 { |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105693
diff
changeset
|
2591 Qdebug_on_next_call = intern_c_string ("debug-on-next-call"); |
|
12625
e2831d2f5b09
(syms_of_xmenu): Set up Qdebug_on_next_call.
Richard M. Stallman <rms@gnu.org>
parents:
12432
diff
changeset
|
2592 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
|
2593 |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
2594 #ifdef USE_X_TOOLKIT |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2595 widget_id_tick = (1<<16); |
| 12661 | 2596 next_menubar_widget_id = 1; |
|
9336
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
2597 #endif |
|
d5ffd9c9edb0
(widget_id_tick): Move definition into conditional.
Richard M. Stallman <rms@gnu.org>
parents:
9236
diff
changeset
|
2598 |
|
73697
54a6e7ed953c
(Fmenu_or_popup_active_p): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
73662
diff
changeset
|
2599 defsubr (&Smenu_or_popup_active_p); |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
2600 |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
2601 #if defined (USE_GTK) || defined (USE_X_TOOLKIT) |
| 83542 | 2602 defsubr (&Sx_menu_bar_open_internal); |
|
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105693
diff
changeset
|
2603 Ffset (intern_c_string ("accelerate-menu"), |
|
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105693
diff
changeset
|
2604 intern_c_string (Sx_menu_bar_open_internal.symbol_name)); |
|
71057
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
2605 #endif |
|
07d4cb17def5
(Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
70328
diff
changeset
|
2606 |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
2607 #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
|
2608 defsubr (&Sx_popup_dialog); |
|
14741
9f9c4d4581e4
Put most of file into HAVE_MENUS conditional.
Richard M. Stallman <rms@gnu.org>
parents:
14553
diff
changeset
|
2609 #endif |
| 118 | 2610 } |
| 52401 | 2611 |
| 2612 /* arch-tag: 92ea573c-398e-496e-ac73-2436f7d63242 | |
| 2613 (do not change this comment) */ |
