annotate src/menubar-x.c @ 191:ecf6ba7b0a10 r20-3b22

Import from CVS: tag r20-3b22
author cvs
date Mon, 13 Aug 2007 09:57:38 +0200
parents 3d6bfa290dbd
children d44af0c54775
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Implements an elisp-programmable menubar -- X interface.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 /* created 16-dec-91 by jwz */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include "console-x.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 #include "EmacsManager.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 #include "EmacsFrame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 #include "EmacsShell.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "gui-x.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "commands.h" /* zmacs_regions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "events.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "opaque.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 static int set_frame_menubar (struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 int deep_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 int first_time_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 #define FRAME_MENUBAR_DATA(frame) ((frame)->menubar_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 #define XFRAME_MENUBAR_DATA(frame) XPOPUP_DATA ((frame)->menubar_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 #define MENUBAR_TYPE 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 #define SUBMENU_TYPE 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 #define POPUP_TYPE 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 /* Converting Lisp menu tree descriptions to lwlib's `widget_value' form.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 menu_item_descriptor_to_widget_value() converts a lisp description of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 menubar into a tree of widget_value structures. It allocates widget_values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 with malloc_widget_value() and allocates other storage only for the `key'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 slot. All other slots are filled with pointers to Lisp_String data. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 allocate a widget_value description of the menu or menubar, and hand it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 lwlib, which then makes a copy of it, which it manages internally. We then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 immediately free our widget_value tree; it will not be referenced again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 Incremental menu construction callbacks operate just a bit differently.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 They allocate widget_values and call replace_widget_value_tree() to tell
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 lwlib to destructively modify the incremental stub (subtree) of its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 separate widget_value tree.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 This function is highly recursive (it follows the menu trees) and may call
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 eval. The reason we keep pointers to lisp string data instead of copying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 it and freeing it later is to avoid the speed penalty that would entail
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 (since this needs to be fast, in the simple cases at least). (The reason
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 we malloc/free the keys slot is because there's not a lisp string around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 for us to use in that case.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 Since we keep pointers to lisp strings, and we call eval, we could lose if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 GC relocates (or frees) those strings. It's not easy to gc protect the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 strings because of the recursive nature of this function, and the fact that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 it returns a data structure that gets freed later. So... we do the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 sleaziest thing possible and inhibit GC for the duration. This is probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 not a big deal...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 We do not have to worry about the pointers to Lisp_String data after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 this function successfully finishes. lwlib copies all such data with
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
85 strdup(). */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 static widget_value *
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
88 menu_item_descriptor_to_widget_value_1 (Lisp_Object desc,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 int menu_type, int deep_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 int filter_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 int depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 /* This function cannot GC.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 It is only called from menu_item_descriptor_to_widget_value, which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 prohibits GC. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 /* !!#### This function has not been Mule-ized */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 int menubar_root_p = (menu_type == MENUBAR_TYPE && depth == 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 widget_value *wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 Lisp_Object wv_closure;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 int partition_seen = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 wv = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 wv_closure = make_opaque_ptr (wv);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 record_unwind_protect (widget_value_unwind, wv_closure);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 if (STRINGP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 {
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
110 char *string_chars = (char *) XSTRING_DATA (desc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 wv->type = (separator_string_p (string_chars) ? SEPARATOR_TYPE :
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 TEXT_TYPE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 #if 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 /* #### - should internationalize with X resources instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 Not so! --ben */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 string_chars = GETTEXT (string_chars);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 if (wv->type == SEPARATOR_TYPE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 wv->value = menu_separator_style (string_chars);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
121 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 wv->name = string_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 wv->enabled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 else if (VECTORP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 if (!button_item_to_widget_value (desc, wv, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 (menu_type == MENUBAR_TYPE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 && depth <= 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 /* :included form was nil */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 wv = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 goto menu_item_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 else if (CONSP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 Lisp_Object incremental_data = desc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 widget_value *prev = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 if (STRINGP (XCAR (desc)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 Lisp_Object key, val;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 169
diff changeset
147 Lisp_Object include_p = Qnil, hook_fn = Qnil, config_tag = Qnil;
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
148 Lisp_Object accel;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 int included_spec = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 wv->type = CASCADE_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 wv->enabled = 1;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
152 wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc)));
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
153
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
154 accel = menu_name_to_accelerator (wv->name);
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
155 wv->accel = LISP_TO_VOID (accel);
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
156
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 desc = Fcdr (desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 while (key = Fcar (desc), KEYWORDP (key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 Lisp_Object cascade = desc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 desc = Fcdr (desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 if (NILP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 signal_simple_error ("keyword in menu lacks a value",
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
165 cascade);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 val = Fcar (desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 desc = Fcdr (desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 if (EQ (key, Q_included))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 include_p = val, included_spec = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 else if (EQ (key, Q_config))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 config_tag = val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 else if (EQ (key, Q_filter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 hook_fn = val;
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
174 else if (EQ (key, Q_accelerator))
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
175 {
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
176 if ( SYMBOLP (val)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
177 || CHARP (val))
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
178 wv->accel = LISP_TO_VOID (val);
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
179 else
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
180 signal_simple_error ("bad keyboard accelerator", val);
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
181 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
182 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 signal_simple_error ("unknown menu cascade keyword", cascade);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 if ((!NILP (config_tag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 && NILP (Fmemq (config_tag, Vmenubar_configuration)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 || (included_spec && NILP (Feval (include_p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 wv = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 goto menu_item_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 if (!NILP (hook_fn))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 #ifdef LWLIB_MENUBARS_LUCID
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 if (filter_p || depth == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
198 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 desc = call1_trapping_errors ("Error in menubar filter",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 hook_fn, desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 if (UNBOUNDP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 desc = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 #ifdef LWLIB_MENUBARS_LUCID
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 widget_value *incr_wv = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 wv->contents = incr_wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 incr_wv->type = INCREMENTAL_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 incr_wv->enabled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 incr_wv->name = wv->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 /* This is automatically GC protected through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 the call to lw_map_widget_values(); no need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 to worry. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 incr_wv->call_data = LISP_TO_VOID (incremental_data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 goto menu_item_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 }
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
218 #endif /* LWLIB_MENUBARS_LUCID */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 if (menu_type == POPUP_TYPE && popup_menu_titles && depth == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 /* Simply prepend three more widget values to the contents of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 the menu: a label, and two separators (to get a double
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 line). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 widget_value *title_wv = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 widget_value *sep_wv = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 title_wv->type = TEXT_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 title_wv->name = wv->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 title_wv->enabled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 title_wv->next = sep_wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 sep_wv->type = SEPARATOR_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 sep_wv->value = menu_separator_style ("==");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 sep_wv->next = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
234
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 wv->contents = title_wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 prev = sep_wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 else if (menubar_root_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 {
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
241 wv->name = (char *) "menubar";
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 wv->type = CASCADE_TYPE; /* Well, nothing else seems to fit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 this is ignored anyway... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 signal_simple_error ("menu name (first element) must be a string",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 wv->enabled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 if (deep_p || menubar_root_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 widget_value *next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 for (; !NILP (desc); desc = Fcdr (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 Lisp_Object child = Fcar (desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 if (menubar_root_p && NILP (child)) /* the partition */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 if (partition_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 error (
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 "more than one partition (nil) in menubar description");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 partition_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 next = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 next->type = PUSHRIGHT_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 {
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
269 next = menu_item_descriptor_to_widget_value_1
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
270 (child, menu_type, deep_p, filter_p, depth + 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 if (! next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 else if (prev)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 prev->next = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 wv->contents = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 prev = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 if (deep_p && !wv->contents)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 wv = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 else if (NILP (desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 error ("nil may not appear in menu descriptions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 signal_simple_error ("unrecognized menu descriptor", desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 menu_item_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 if (wv)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 /* Completed normally. Clear out the object that widget_value_unwind()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 will be called with to tell it not to free the wv (as we are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 returning it.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 set_opaque_ptr (wv_closure, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 return wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 static widget_value *
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
304 menu_item_descriptor_to_widget_value (Lisp_Object desc,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 int menu_type, /* if this is a menubar,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 popup or sub menu */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 int deep_p, /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 int filter_p) /* if :filter forms
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
309 should run now */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 widget_value *wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 record_unwind_protect (restore_gc_inhibit,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 make_int (gc_currently_forbidden));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 gc_currently_forbidden = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 /* Can't GC! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 wv = menu_item_descriptor_to_widget_value_1 (desc, menu_type, deep_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 filter_p, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 return wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323
138
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
324 #ifdef LWLIB_MENUBARS_LUCID
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
325 int in_menu_callback;
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
326
169
15872534500d Import from CVS: tag r20-3b11
cvs
parents: 165
diff changeset
327 static Lisp_Object
15872534500d Import from CVS: tag r20-3b11
cvs
parents: 165
diff changeset
328 restore_in_menu_callback (Lisp_Object val)
138
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
329 {
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
330 in_menu_callback = XINT(val);
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
331 return Qnil;
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
332 }
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
333 #endif /* LWLIB_MENUBARS_LUCID */
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
334
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
335
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 /* The order in which callbacks are run is funny to say the least.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 It's sometimes tricky to avoid running a callback twice, and to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 avoid returning prematurely. So, this function returns true
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 if the menu's callbacks are no longer gc protected. So long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 as we unprotect them before allowing other callbacks to run,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 everything should be ok.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 The pre_activate_callback() *IS* intentionally called multiple times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 If client_data == NULL, then it's being called before the menu is posted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 If client_data != NULL, then client_data is a (widget_value *) and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 client_data->data is a Lisp_Object pointing to a lisp submenu description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 that must be converted into widget_values. *client_data is destructively
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
348 modified.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 #### Stig thinks that there may be a GC problem here due to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 fact that pre_activate_callback() is called multiple times, but I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 think he's wrong.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 pre_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 struct device *d = get_device_from_display (XtDisplay (widget));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 struct frame *f = x_any_window_to_frame (d, XtWindow (widget));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 Lisp_Object rest = Qnil;
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
364 Lisp_Object frame;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 int any_changes = 0;
138
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
366 int count;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
368 /* set in lwlib to the time stamp associated with the most recent menu
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
369 operation */
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
370 extern Time x_focus_timestamp_really_sucks_fix_me_better;
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
371
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 if (!f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 f = x_any_window_to_frame (d, XtWindow (XtParent (widget)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 if (!f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
377 /* make sure f is the selected frame */
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
378 XSETFRAME (frame, f);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
379 Fselect_frame (frame);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
380
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 if (client_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 /* this is an incremental menu construction callback */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 widget_value *hack_wv = (widget_value *) client_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 Lisp_Object submenu_desc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 widget_value *wv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 assert (hack_wv->type == INCREMENTAL_TYPE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 VOID_TO_LISP (submenu_desc, hack_wv->call_data);
138
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
390
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
391 /*
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
392 * #### Fix the menu code so this isn't necessary.
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
393 *
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
394 * Protect against reentering the menu code otherwise we will
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
395 * crash later when the code gets confused at the state
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
396 * changes.
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
397 */
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
398 count = specpdl_depth ();
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
399 record_unwind_protect (restore_in_menu_callback,
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
400 make_int (in_menu_callback));
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
401 in_menu_callback = 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 wv = menu_item_descriptor_to_widget_value (submenu_desc, SUBMENU_TYPE,
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 102
diff changeset
403 1, 0);
138
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
404 unbind_to (count, Qnil);
6608ceec7cf8 Import from CVS: tag r20-2b3
cvs
parents: 114
diff changeset
405
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 if (!wv)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 wv = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 wv->type = CASCADE_TYPE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 wv->next = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 wv->contents = xmalloc_widget_value ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 wv->contents->type = TEXT_TYPE;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
413 wv->contents->name = (char *) "No menu";
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 wv->contents->next = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 assert (wv && wv->type == CASCADE_TYPE && wv->contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 replace_widget_value_tree (hack_wv, wv->contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 free_popup_widget_value_tree (wv);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 if (!POPUP_DATAP (FRAME_MENUBAR_DATA (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 /* #### - this menubar update mechanism is expensively anti-social and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 the activate-menubar-hook is now mostly obsolete. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 /* make the activate-menubar-hook be a list of functions, not a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 function, just to simplify things. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 if (!NILP (Vactivate_menubar_hook) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 (!CONSP (Vactivate_menubar_hook) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 EQ (XCAR (Vactivate_menubar_hook), Qlambda)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 Vactivate_menubar_hook = Fcons (Vactivate_menubar_hook, Qnil);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
432
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 GCPRO1 (rest);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 for (rest = Vactivate_menubar_hook; !NILP (rest); rest = Fcdr (rest))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 if (!EQ (call0 (XCAR (rest)), Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 any_changes = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 /* #### - It is necessary to *ALWAYS* call set_frame_menubar() now that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 incremental menus are implemented. If a subtree of a menu has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 updated incrementally (a destructive operation), then that subtree
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 must somehow be wiped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 It is difficult to undo the destructive operation in lwlib because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 a pointer back to lisp data needs to be hidden away somewhere. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 that an INCREMENTAL_TYPE widget_value can be recreated... Hmmmmm. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 if (any_changes ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 !XFRAME_MENUBAR_DATA (f)->menubar_contents_up_to_date)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
448 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 set_frame_menubar (f, 1, 0);
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
450 DEVICE_X_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) =
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
451 DEVICE_X_GLOBAL_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) =
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 173
diff changeset
452 x_focus_timestamp_really_sucks_fix_me_better;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 extern int *get_psheets_for_buffer (Lisp_Object, int *);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 set_panel_button_sensitivity (struct frame *f, widget_value *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 struct window *window = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 int current_buffer_psheets_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 int *current_buffer_psheets =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 get_psheets_for_buffer (window->buffer, &current_buffer_psheets_count);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 int panel_enabled = FRAME_X_DESIRED_PSHEETS (f) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 current_buffer_psheets_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 widget_value *val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 for (val = data->contents; val; val = val->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 if (val->name && !strcmp (val->name, "sheet"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 val->enabled = panel_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 #endif /* ENERGIZE */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 static widget_value *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 compute_menubar_data (struct frame *f, Lisp_Object menubar, int deep_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 widget_value *data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 if (NILP (menubar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 {
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
488 Lisp_Object old_buffer;
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
489 int count = specpdl_depth ();
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
490
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
491 old_buffer = Fcurrent_buffer ();
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
492 record_unwind_protect (Fset_buffer, old_buffer);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
493 Fset_buffer ( XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 data = menu_item_descriptor_to_widget_value (menubar, MENUBAR_TYPE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 deep_p, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 if (data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 set_panel_button_sensitivity (f, data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 #endif
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
500 Fset_buffer (old_buffer);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
501 unbind_to (count, Qnil);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 return data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 set_frame_menubar (struct frame *f, int deep_p, int first_time_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 widget_value *data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 Lisp_Object menubar;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 int menubar_visible;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 long id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 /* As for the toolbar, the minibuffer does not have its own menubar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 struct window *w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 if (! FRAME_X_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 /***** first compute the contents of the menubar *****/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 if (! first_time_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 /* evaluate `current-menubar' in the buffer of the selected window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 of the frame in question. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 menubar = symbol_value_in_buffer (Qcurrent_menubar, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 /* That's a little tricky the first time since the frame isn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 menubar = Fsymbol_value (Qcurrent_menubar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 if (NILP (menubar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 menubar = Vblank_menubar;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 menubar_visible = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 menubar_visible = !NILP (w->menubar_visible_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 data = compute_menubar_data (f, menubar, deep_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 if (!data || (!data->next && !data->contents))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 abort ();
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
545
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 if (NILP (FRAME_MENUBAR_DATA (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 struct popup_data *mdata =
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
549 alloc_lcrecord_type (struct popup_data, lrecord_popup_data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 mdata->id = new_lwlib_id ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 mdata->last_menubar_buffer = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 mdata->menubar_contents_up_to_date = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 XSETPOPUP_DATA (FRAME_MENUBAR_DATA (f), mdata);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 /***** now store into the menubar widget, creating it if necessary *****/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 id = XFRAME_MENUBAR_DATA (f)->id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 if (!FRAME_X_MENUBAR_WIDGET (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 Widget parent = FRAME_X_CONTAINER_WIDGET (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 assert (first_time_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 /* It's the first time we've mapped the menubar so compute its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 contents completely once. This makes sure that the menubar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 components are created with the right type. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 if (!deep_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 free_popup_widget_value_tree (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 data = compute_menubar_data (f, menubar, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 FRAME_X_MENUBAR_WIDGET (f) =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 lw_create_widget ("menubar", "menubar", id, data, parent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 0, pre_activate_callback,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 popup_selection_callback, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 lw_modify_all_widgets (id, data, deep_p ? True : False);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 free_popup_widget_value_tree (data);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
587
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 XFRAME_MENUBAR_DATA (f)->menubar_contents_up_to_date = deep_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 XFRAME_MENUBAR_DATA (f)->last_menubar_buffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 return menubar_visible;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 /* Called from x_create_widgets() to create the inital menubar of a frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 before it is mapped, so that the window is mapped with the menubar already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 there instead of us tacking it on later and thrashing the window after it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 x_initialize_frame_menubar (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 return set_frame_menubar (f, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 static LWLIB_ID last_popup_menu_selection_callback_id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 popup_menu_selection_callback (Widget widget, LWLIB_ID id,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 XtPointer client_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 last_popup_menu_selection_callback_id = id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 popup_selection_callback (widget, id, client_data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 /* lw_destroy_all_widgets() will be called from popup_down_callback() */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 popup_menu_down_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 if (popup_handled_p (id))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 assert (popup_up_p != 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 ungcpro_popup_callbacks (id);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 popup_up_p--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 /* if this isn't called immediately after the selection callback, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 there wasn't a menu selection. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 if (id != last_popup_menu_selection_callback_id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 popup_selection_callback (widget, id, (XtPointer) -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 lw_destroy_all_widgets (id);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 make_dummy_xbutton_event (XEvent *dummy,
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
635 Widget daddy,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 struct Lisp_Event *eev)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 /* NULL for eev means query pointer */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 XButtonPressedEvent *btn = (XButtonPressedEvent *) dummy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 btn->type = ButtonPress;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 btn->serial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 btn->send_event = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 btn->display = XtDisplay (daddy);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 btn->window = XtWindow (daddy);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 if (eev)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 Position shellx, shelly, framex, framey;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 Widget shell = XtParent (daddy);
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
650 Arg al [2];
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 btn->time = eev->timestamp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 btn->button = eev->event.button.button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 btn->root = RootWindowOfScreen (XtScreen (daddy));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 btn->subwindow = (Window) NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 btn->x = eev->event.button.x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 btn->y = eev->event.button.y;
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
657 XtSetArg (al [0], XtNx, &shellx);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
658 XtSetArg (al [1], XtNy, &shelly);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
659 XtGetValues (shell, al, 2);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
660 XtSetArg (al [0], XtNx, &framex);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
661 XtSetArg (al [1], XtNy, &framey);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
662 XtGetValues (daddy, al, 2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 btn->x_root = shellx + framex + btn->x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 btn->y_root = shelly + framey + btn->y;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 btn->state = ButtonPressMask; /* all buttons pressed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 /* CurrentTime is just ZERO, so it's worthless for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 determining relative click times. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 struct device *d = get_device_from_display (XtDisplay (daddy));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 btn->time = DEVICE_X_MOUSE_TIMESTAMP (d); /* event-Xt maintains this */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 btn->button = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 XQueryPointer (btn->display, btn->window, &btn->root,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 &btn->subwindow, &btn->x_root, &btn->y_root,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 &btn->x, &btn->y, &btn->state);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 extern int desired_debuggerpanel_exposed_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 extern int current_debuggerpanel_exposed_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 extern int debuggerpanel_sheet;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 extern void notify_energize_sheet_hidden (unsigned long);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 x_update_frame_menubar_internal (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 /* We assume the menubar contents has changed if the global flag is set,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 or if the current buffer has changed, or if the menubar has never
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 been updated before.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 int menubar_contents_changed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 (f->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 || NILP (FRAME_MENUBAR_DATA (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 || (!EQ (XFRAME_MENUBAR_DATA (f)->last_menubar_buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700
102
a145efe76779 Import from CVS: tag r20-1b3
cvs
parents: 82
diff changeset
701 Boolean menubar_was_visible = XtIsManaged (FRAME_X_MENUBAR_WIDGET (f));
a145efe76779 Import from CVS: tag r20-1b3
cvs
parents: 82
diff changeset
702 Boolean menubar_will_be_visible = menubar_was_visible;
a145efe76779 Import from CVS: tag r20-1b3
cvs
parents: 82
diff changeset
703 Boolean menubar_visibility_changed;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 Cardinal new_num_top_widgets = 1; /* for the menubar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 Widget container = FRAME_X_CONTAINER_WIDGET (f);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
706
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 int *old_sheets = FRAME_X_CURRENT_PSHEETS (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 int *new_sheets = FRAME_X_DESIRED_PSHEETS (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 int old_count = FRAME_X_CURRENT_PSHEET_COUNT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 int new_count = FRAME_X_DESIRED_PSHEET_COUNT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 Lisp_Object old_buf = FRAME_X_CURRENT_PSHEET_BUFFER (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 Lisp_Object new_buf = FRAME_X_DESIRED_PSHEET_BUFFER (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 int psheets_changed = (old_sheets != new_sheets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 || old_count != new_count
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 || !EQ (old_buf, new_buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 int debuggerpanel_changed = (desired_debuggerpanel_exposed_p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 != current_debuggerpanel_exposed_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 if (desired_debuggerpanel_exposed_p && FRAME_X_TOP_WIDGETS (f) [1] == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 /* This happens when the frame was just created. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 debuggerpanel_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 FRAME_X_CURRENT_PSHEETS (f) = FRAME_X_DESIRED_PSHEETS (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 FRAME_X_CURRENT_PSHEET_COUNT (f) = FRAME_X_DESIRED_PSHEET_COUNT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 FRAME_X_CURRENT_PSHEET_BUFFER (f) = FRAME_X_DESIRED_PSHEET_BUFFER (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 #endif /* ENERGIZE */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 if (menubar_contents_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 menubar_will_be_visible = set_frame_menubar (f, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 menubar_visibility_changed = menubar_was_visible != menubar_will_be_visible;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 if (! (menubar_visibility_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 || psheets_changed || debuggerpanel_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 /* Set menubar visibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 if (menubar_visibility_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 (menubar_will_be_visible ? XtManageChild : XtUnmanageChild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 (FRAME_X_MENUBAR_WIDGET (f));
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
746
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 /* Set debugger panel visibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 if (debuggerpanel_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 Widget w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 int sheet = debuggerpanel_sheet;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 w = lw_get_widget (sheet, container, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 if (desired_debuggerpanel_exposed_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 if (! w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 w = lw_make_widget (sheet, container, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 FRAME_X_TOP_WIDGETS (f)[1] = w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 XtManageChild (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 notify_energize_sheet_hidden (sheet);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 if (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 XtUnmanageChild (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 /* Set psheet visibility. For the moment we just unmanage all the old
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 ones, and then manage all the new ones. If the number of psheets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 ever becomes a large number (i.e. > 1), then we can worry about a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 more sophisticated way of doing this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 if (psheets_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 Widget w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 unsigned long sheet;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 for (i=0; i<old_count; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 sheet = old_sheets[i];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 w = lw_get_widget (sheet, container, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 notify_energize_sheet_hidden (sheet);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 if (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 XtUnmanageChild (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 for (i=0; i<new_count; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 sheet = new_sheets[i];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 /* #### This unconditional call to lw_make_widget() is a bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 idea. Doesn't it cause a memory leak if the widget
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 already exists?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 #### How does Energize know that a sheet just got displayed?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 #### Energize knows all. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 w = lw_make_widget (sheet, container, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 FRAME_X_TOP_WIDGETS (f)[2+i] = w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 XtManageChild (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 new_num_top_widgets += 1+new_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 #endif /* ENERGIZE */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 /* Note that new_num_top_widgets doesn't need to reflect the actual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 number of top widgets, but just the limit of FRAME_X_TOP_WIDGETS (f)[]. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 FRAME_X_NUM_TOP_WIDGETS (f) = new_num_top_widgets;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 /* We want to end up as close in size as possible to what we
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
813 were before. So, ask the EmacsManager what size it wants to be
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
814 (suggesting the current size), and resize it to that size. It
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
815 in turn will call our query-geometry callback, which will round
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
816 the size to something that exactly fits the text widget. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 XtWidgetGeometry req, repl;
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
818 Arg al [2];
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 req.request_mode = CWWidth | CWHeight;
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
821 XtSetArg (al [0], XtNwidth, &req.width);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
822 XtSetArg (al [1], XtNheight, &req.height);
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
823 XtGetValues (container, al, 2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 XtQueryGeometry (container, &req, &repl);
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
825 EmacsManagerChangeSize (container, repl.width, repl.height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 /* The window size might not have changed but the text size
165
5a88923fcbfe Import from CVS: tag r20-3b9
cvs
parents: 163
diff changeset
827 did; thus, the base size might be incorrect. So update it. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 EmacsShellUpdateSizeHints (FRAME_X_SHELL_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 /* Give back the focus to emacs if no psheets are displayed anymore */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 if (psheets_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 Lisp_Object frame;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 Fselect_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 #endif /* ENERGIZE */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 x_update_frame_menubars (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 assert (FRAME_X_P (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 x_update_frame_menubar_internal (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 /* #### This isn't going to work right now that this function works on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 a per-frame, not per-device basis. Guess what? I don't care. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 current_debuggerpanel_exposed_p = desired_debuggerpanel_exposed_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 x_free_frame_menubars (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 Widget menubar_widget;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 assert (FRAME_X_P (f));
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
862
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 menubar_widget = FRAME_X_MENUBAR_WIDGET (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 if (menubar_widget)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 LWLIB_ID id = XFRAME_MENUBAR_DATA (f)->id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 lw_destroy_all_widgets (id);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 XFRAME_MENUBAR_DATA (f)->id = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 #ifdef ENERGIZE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 /* Also destroy this frame's psheets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 Widget parent = FRAME_X_CONTAINER_WIDGET (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 int *sheets = FRAME_X_CURRENT_PSHEETS (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 int i = FRAME_X_CURRENT_PSHEET_COUNT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 while (i--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 unsigned long sheet = sheets [i];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 Widget w = lw_get_widget (sheet, parent, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 if (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 lw_destroy_widget (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 FRAME_X_CURRENT_PSHEET_COUNT (f) = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 /* Is this necessary? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 sheets = FRAME_X_DESIRED_PSHEETS (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 i = FRAME_X_DESIRED_PSHEET_COUNT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 while (i--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 unsigned long sheet = sheets [i];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 Widget w = lw_get_widget (sheet, parent, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 if (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 lw_destroy_widget (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 FRAME_X_DESIRED_PSHEET_COUNT (f) = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 /* sigh... debugger panel is special... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 if (debuggerpanel_sheet)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 Widget w = lw_get_widget (debuggerpanel_sheet, parent, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 if (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 lw_destroy_widget (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 #endif /* ENERGIZE */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 x_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 int menu_id;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 struct frame *f = selected_frame ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 widget_value *data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 Widget parent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 Widget menu;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 struct Lisp_Event *eev = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 XEvent xev;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 Lisp_Object frame = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 CHECK_X_FRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 parent = FRAME_X_SHELL_WIDGET (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 if (!NILP (event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 CHECK_LIVE_EVENT (event);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 eev= XEVENT (event);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 if (eev->event_type != button_press_event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 && eev->event_type != button_release_event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 wrong_type_argument (Qmouse_event_p, event);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 else if (!NILP (Vthis_command_keys))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 /* if an event wasn't passed, use the last event of the event sequence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 currently being executed, if that event is a mouse event */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 eev = XEVENT (Vthis_command_keys); /* last event first */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 if (eev->event_type != button_press_event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 && eev->event_type != button_release_event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 eev = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 make_dummy_xbutton_event (&xev, parent, eev);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 if (SYMBOLP (menu_desc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 menu_desc = Fsymbol_value (menu_desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 CHECK_CONS (menu_desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 CHECK_STRING (XCAR (menu_desc));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 data = menu_item_descriptor_to_widget_value (menu_desc, POPUP_TYPE, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 if (! data) error ("no menu");
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
951
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 menu_id = new_lwlib_id ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 menu = lw_create_widget ("popup", "popup" /* data->name */, menu_id, data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 parent, 1, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 popup_menu_selection_callback,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 popup_menu_down_callback);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 free_popup_widget_value_tree (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 gcpro_popup_callbacks (menu_id);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 /* Setting zmacs-region-stays is necessary here because executing a command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 from a menu is really a two-command process: the first command (bound to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 the button-click) simply pops up the menu, and returns. This causes a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 sequence of magic-events (destined for the popup-menu widget) to begin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 Eventually, a menu item is selected, and a menu-event blip is pushed onto
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 the end of the input stream, which is then executed by the event loop.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 175
diff changeset
967
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 So there are two command-events, with a bunch of magic-events between
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 them. We don't want the *first* command event to alter the state of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 region, so that the region can be available as an argument for the second
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 if (zmacs_regions)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 zmacs_region_stays = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 popup_up_p++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 lw_popup_menu (menu, &xev);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 /* this speeds up display of pop-up menus */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 XFlush (XtDisplay (parent));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 syms_of_menubar_x (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 console_type_create_menubar_x (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 CONSOLE_HAS_METHOD (x, update_frame_menubars);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 CONSOLE_HAS_METHOD (x, free_frame_menubars);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 CONSOLE_HAS_METHOD (x, popup_menu);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 vars_of_menubar_x (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 last_popup_menu_selection_callback_id = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 #if defined (LWLIB_MENUBARS_LUCID)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 Fprovide (intern ("lucid-menubars"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 #elif defined (LWLIB_MENUBARS_MOTIF)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 Fprovide (intern ("motif-menubars"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 #elif defined (LWLIB_MENUBARS_ATHENA)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 Fprovide (intern ("athena-menubars"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 }