Mercurial > hg > xemacs-beta
comparison src/console-x.h @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 804517e16990 |
children | e22b0213b713 |
comparison
equal
deleted
inserted
replaced
871:732270854293 | 872:79c6ff3eef26 |
---|---|
51 R4 also doesn't define a version number, but R5 does. */ | 51 R4 also doesn't define a version number, but R5 does. */ |
52 #if (XlibSpecificationRelease < 5) | 52 #if (XlibSpecificationRelease < 5) |
53 # define XPointer char * | 53 # define XPointer char * |
54 #endif | 54 #endif |
55 | 55 |
56 DECLARE_CONSOLE_TYPE (x); | |
57 | |
58 struct x_device | |
59 { | |
60 /* The X connection of this device. */ | |
61 Display *display; | |
62 | |
63 /* Set by x_IO_error_handler(). */ | |
64 int being_deleted; | |
65 | |
66 /* Xt application info. */ | |
67 Widget Xt_app_shell; | |
68 | |
69 /* Cache of GC's for frames on this device. */ | |
70 struct gc_cache *gc_cache; | |
71 | |
72 /* Selected visual, depth and colormap for this device */ | |
73 Visual *visual; | |
74 int depth; | |
75 Colormap device_cmap; | |
76 | |
77 /* Used by x_bevel_modeline in redisplay-x.c */ | |
78 Pixmap gray_pixmap; | |
79 | |
80 /* Atoms associated with this device. */ | |
81 /* allocated in Xatoms_of_device_x */ | |
82 Atom Xatom_WM_PROTOCOLS; | |
83 Atom Xatom_WM_DELETE_WINDOW; | |
84 Atom Xatom_WM_SAVE_YOURSELF; | |
85 Atom Xatom_WM_TAKE_FOCUS; | |
86 Atom Xatom_WM_STATE; | |
87 | |
88 /* allocated in Xatoms_of_select_x */ | |
89 Atom Xatom_CLIPBOARD; | |
90 Atom Xatom_TIMESTAMP; | |
91 Atom Xatom_TEXT; | |
92 Atom Xatom_DELETE; | |
93 Atom Xatom_MULTIPLE; | |
94 Atom Xatom_INCR; | |
95 Atom Xatom_EMACS_TMP; | |
96 Atom Xatom_TARGETS; | |
97 Atom Xatom_NULL; | |
98 Atom Xatom_ATOM_PAIR; | |
99 Atom Xatom_COMPOUND_TEXT; | |
100 | |
101 /* allocated in Xatoms_of_objects_x */ | |
102 Atom Xatom_FOUNDRY; | |
103 Atom Xatom_FAMILY_NAME; | |
104 Atom Xatom_WEIGHT_NAME; | |
105 Atom Xatom_SLANT; | |
106 Atom Xatom_SETWIDTH_NAME; | |
107 Atom Xatom_ADD_STYLE_NAME; | |
108 Atom Xatom_PIXEL_SIZE; | |
109 Atom Xatom_POINT_SIZE; | |
110 Atom Xatom_RESOLUTION_X; | |
111 Atom Xatom_RESOLUTION_Y; | |
112 Atom Xatom_SPACING; | |
113 Atom Xatom_AVERAGE_WIDTH; | |
114 Atom Xatom_CHARSET_REGISTRY; | |
115 Atom Xatom_CHARSET_ENCODING; | |
116 | |
117 /* The following items are all used exclusively in event-Xt.c. */ | |
118 int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; | |
119 KeySym lock_interpretation; | |
120 | |
121 XModifierKeymap *x_modifier_keymap; | |
122 | |
123 KeySym *x_keysym_map; | |
124 int x_keysym_map_min_code; | |
125 int x_keysym_map_max_code; | |
126 int x_keysym_map_keysyms_per_code; | |
127 Lisp_Object x_keysym_map_hash_table; | |
128 | |
129 /* frame that holds the WM_COMMAND property; there should be exactly | |
130 one of these per device. */ | |
131 Lisp_Object WM_COMMAND_frame; | |
132 | |
133 /* #### It's not clear that there is much distinction anymore | |
134 between mouse_timestamp and global_mouse_timestamp, now that | |
135 Emacs doesn't see most (all?) events not destined for it. */ | |
136 | |
137 /* The timestamp of the last button or key event used by emacs itself. | |
138 This is used for asserting selections and input focus. */ | |
139 Time mouse_timestamp; | |
140 | |
141 /* This is the timestamp the last button or key event whether it was | |
142 dispatched to emacs or widgets. */ | |
143 Time global_mouse_timestamp; | |
144 | |
145 /* This is the last known timestamp received from the server. It is | |
146 maintained by x_event_to_emacs_event and used to patch bogus | |
147 WM_TAKE_FOCUS messages sent by Mwm. */ | |
148 Time last_server_timestamp; | |
149 | |
150 /* Used by Xlib to preserve information across calls to | |
151 XLookupString(), to implement compose processing. | |
152 | |
153 According to The X Window System, p. 467, "The creation of | |
154 XComposeStatus structures is implementation dependent; | |
155 a portable program must pass NULL for this argument." | |
156 But this means that a portable program cannot implement | |
157 compose processing! WTF? | |
158 | |
159 So we just set it to all zeros. */ | |
160 | |
161 /* No X Server ever used this, AFAIK -- mrb */ | |
162 /* XComposeStatus x_compose_status; */ | |
163 | |
164 #ifdef HAVE_XIM | |
165 XIM xim; | |
166 XIMStyles *xim_styles; | |
167 #endif /* HAVE_XIM */ | |
168 | |
169 /* stuff for sticky modifiers: */ | |
170 | |
171 unsigned int need_to_add_mask, down_mask; | |
172 KeyCode last_downkey; | |
173 Time release_time; | |
174 Time modifier_release_time; | |
175 }; | |
176 | |
177 #define DEVICE_X_DATA(d) DEVICE_TYPE_DATA (d, x) | |
178 | |
179 #define FRAME_X_DISPLAY(f) (DEVICE_X_DISPLAY (XDEVICE (f->device))) | |
180 #define DEVICE_X_DISPLAY(d) (DEVICE_X_DATA (d)->display) | |
181 #define DEVICE_X_BEING_DELETED(d) (DEVICE_X_DATA (d)->being_deleted) | |
182 #define DEVICE_X_VISUAL(d) (DEVICE_X_DATA (d)->visual) | |
183 #define DEVICE_X_DEPTH(d) (DEVICE_X_DATA (d)->depth) | |
184 #define DEVICE_X_COLORMAP(d) (DEVICE_X_DATA (d)->device_cmap) | |
185 #define DEVICE_XT_APP_SHELL(d) (DEVICE_X_DATA (d)->Xt_app_shell) | |
186 #define DEVICE_X_GC_CACHE(d) (DEVICE_X_DATA (d)->gc_cache) | |
187 #define DEVICE_X_GRAY_PIXMAP(d) (DEVICE_X_DATA (d)->gray_pixmap) | |
188 #define DEVICE_X_WM_COMMAND_FRAME(d) (DEVICE_X_DATA (d)->WM_COMMAND_frame) | |
189 #define DEVICE_X_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->mouse_timestamp) | |
190 #define DEVICE_X_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->global_mouse_timestamp) | |
191 #define DEVICE_X_LAST_SERVER_TIMESTAMP(d) (DEVICE_X_DATA (d)->last_server_timestamp) | |
192 #define DEVICE_X_KEYSYM_MAP_HASH_TABLE(d) (DEVICE_X_DATA (d)->x_keysym_map_hash_table) | |
193 /* #define DEVICE_X_X_COMPOSE_STATUS(d) (DEVICE_X_DATA (d)->x_compose_status) */ | |
194 #ifdef HAVE_XIM | |
195 #define DEVICE_X_XIM(d) (DEVICE_X_DATA (d)->xim) | |
196 #define DEVICE_X_XIM_STYLES(d) (DEVICE_X_DATA (d)->xim_styles) | |
197 #define DEVICE_X_FONTSET(d) (DEVICE_X_DATA (d)->fontset) | |
198 #endif /* HAVE_XIM */ | |
199 | |
200 /* allocated in Xatoms_of_device_x */ | |
201 #define DEVICE_XATOM_WM_PROTOCOLS(d) (DEVICE_X_DATA (d)->Xatom_WM_PROTOCOLS) | |
202 #define DEVICE_XATOM_WM_DELETE_WINDOW(d) (DEVICE_X_DATA (d)->Xatom_WM_DELETE_WINDOW) | |
203 #define DEVICE_XATOM_WM_SAVE_YOURSELF(d) (DEVICE_X_DATA (d)->Xatom_WM_SAVE_YOURSELF) | |
204 #define DEVICE_XATOM_WM_TAKE_FOCUS(d) (DEVICE_X_DATA (d)->Xatom_WM_TAKE_FOCUS) | |
205 #define DEVICE_XATOM_WM_STATE(d) (DEVICE_X_DATA (d)->Xatom_WM_STATE) | |
206 | |
207 /* allocated in Xatoms_of_select_x */ | |
208 #define DEVICE_XATOM_CLIPBOARD(d) (DEVICE_X_DATA (d)->Xatom_CLIPBOARD) | |
209 #define DEVICE_XATOM_TIMESTAMP(d) (DEVICE_X_DATA (d)->Xatom_TIMESTAMP) | |
210 #define DEVICE_XATOM_TEXT(d) (DEVICE_X_DATA (d)->Xatom_TEXT) | |
211 #define DEVICE_XATOM_DELETE(d) (DEVICE_X_DATA (d)->Xatom_DELETE) | |
212 #define DEVICE_XATOM_MULTIPLE(d) (DEVICE_X_DATA (d)->Xatom_MULTIPLE) | |
213 #define DEVICE_XATOM_INCR(d) (DEVICE_X_DATA (d)->Xatom_INCR) | |
214 #define DEVICE_XATOM_EMACS_TMP(d) (DEVICE_X_DATA (d)->Xatom_EMACS_TMP) | |
215 #define DEVICE_XATOM_TARGETS(d) (DEVICE_X_DATA (d)->Xatom_TARGETS) | |
216 #define DEVICE_XATOM_NULL(d) (DEVICE_X_DATA (d)->Xatom_NULL) | |
217 #define DEVICE_XATOM_ATOM_PAIR(d) (DEVICE_X_DATA (d)->Xatom_ATOM_PAIR) | |
218 #define DEVICE_XATOM_COMPOUND_TEXT(d) (DEVICE_X_DATA (d)->Xatom_COMPOUND_TEXT) | |
219 | |
220 /* allocated in Xatoms_of_objects_x */ | |
221 #define DEVICE_XATOM_FOUNDRY(d) (DEVICE_X_DATA (d)->Xatom_FOUNDRY) | |
222 #define DEVICE_XATOM_FAMILY_NAME(d) (DEVICE_X_DATA (d)->Xatom_FAMILY_NAME) | |
223 #define DEVICE_XATOM_WEIGHT_NAME(d) (DEVICE_X_DATA (d)->Xatom_WEIGHT_NAME) | |
224 #define DEVICE_XATOM_SLANT(d) (DEVICE_X_DATA (d)->Xatom_SLANT) | |
225 #define DEVICE_XATOM_SETWIDTH_NAME(d) (DEVICE_X_DATA (d)->Xatom_SETWIDTH_NAME) | |
226 #define DEVICE_XATOM_ADD_STYLE_NAME(d) (DEVICE_X_DATA (d)->Xatom_ADD_STYLE_NAME) | |
227 #define DEVICE_XATOM_PIXEL_SIZE(d) (DEVICE_X_DATA (d)->Xatom_PIXEL_SIZE) | |
228 #define DEVICE_XATOM_POINT_SIZE(d) (DEVICE_X_DATA (d)->Xatom_POINT_SIZE) | |
229 #define DEVICE_XATOM_RESOLUTION_X(d) (DEVICE_X_DATA (d)->Xatom_RESOLUTION_X) | |
230 #define DEVICE_XATOM_RESOLUTION_Y(d) (DEVICE_X_DATA (d)->Xatom_RESOLUTION_Y) | |
231 #define DEVICE_XATOM_SPACING(d) (DEVICE_X_DATA (d)->Xatom_SPACING) | |
232 #define DEVICE_XATOM_AVERAGE_WIDTH(d) (DEVICE_X_DATA (d)->Xatom_AVERAGE_WIDTH) | |
233 #define DEVICE_XATOM_CHARSET_REGISTRY(d) (DEVICE_X_DATA (d)->Xatom_CHARSET_REGISTRY) | |
234 #define DEVICE_XATOM_CHARSET_ENCODING(d) (DEVICE_X_DATA (d)->Xatom_CHARSET_ENCODING) | |
235 | |
236 #define Xt_SET_VALUE(widget, resource, value) do { \ | 56 #define Xt_SET_VALUE(widget, resource, value) do { \ |
237 Arg al; \ | 57 Arg al; \ |
238 XtSetArg (al, resource, value); \ | 58 XtSetArg (al, resource, value); \ |
239 XtSetValues (widget, &al, 1); \ | 59 XtSetValues (widget, &al, 1); \ |
240 } while (0) | 60 } while (0) |
243 Arg al; \ | 63 Arg al; \ |
244 XtSetArg (al, resource, location); \ | 64 XtSetArg (al, resource, location); \ |
245 XtGetValues (widget, &al, 1); \ | 65 XtGetValues (widget, &al, 1); \ |
246 } while (0) | 66 } while (0) |
247 | 67 |
248 /* The maximum number of widgets that can be displayed above the text | |
249 area at one time. Currently no more than 3 will ever actually be | |
250 displayed (menubar, psheet, debugger panel). */ | |
251 #define MAX_CONCURRENT_TOP_WIDGETS 8 | |
252 | |
253 struct x_frame | |
254 { | |
255 /* The widget of this frame. This is an EmacsShell or an | |
256 ExternalShell. */ | |
257 Widget widget; | |
258 | |
259 /* The parent of the EmacsFrame, the menubar, and the scrollbars. | |
260 This is an EmacsManager. */ | |
261 Widget container; | |
262 | |
263 /* The widget of the menubar, of whatever widget class it happens to be. */ | |
264 Widget menubar_widget; | |
265 | |
266 /* The widget of the edit portion of this frame; this is an EmacsFrame, | |
267 and the window of this widget is what the redisplay code draws on. */ | |
268 Widget edit_widget; | |
269 | |
270 /* Lists the widgets above the text area, in the proper order. | |
271 Used by the EmacsManager. */ | |
272 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; | |
273 int num_top_widgets; | |
274 | |
275 /*************************** Miscellaneous **************************/ | |
276 | |
277 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ | |
278 Lisp_Object icon_pixmap; | |
279 Lisp_Object icon_pixmap_mask; | |
280 | |
281 #ifdef HAVE_TOOLBARS | |
282 int old_toolbar_size[4]; | |
283 | |
284 /* We don't provide a mechanism for changing these after they are | |
285 initialized so we might as well keep pointers to them and avoid | |
286 lots of expensive calls to gc_cache_lookup. */ | |
287 GC toolbar_top_shadow_gc; | |
288 GC toolbar_bottom_shadow_gc; | |
289 GC toolbar_blank_background_gc; | |
290 GC toolbar_pixmap_background_gc; | |
291 #endif /* HAVE_TOOLBARS */ | |
292 | |
293 /* geometry string that ought to be freed. */ | |
294 char *geom_free_me_please; | |
295 | |
296 #ifdef HAVE_XIM | |
297 XPoint xic_spot; /* Spot Location cache */ | |
298 #ifdef XIM_XLIB | |
299 XIC xic; | |
300 /* Could get these at any time by asking xic, but... */ | |
301 XIMStyle xic_style; /* XIM Style cache */ | |
302 #endif /* XIM_XLIB */ | |
303 #endif /* HAVE_XIM */ | |
304 | |
305 /* 1 if the frame is completely visible on the display, 0 otherwise. | |
306 if 0 the frame may have been iconified or may be totally | |
307 or partially hidden by another X window */ | |
308 unsigned int totally_visible_p :1; | |
309 | |
310 /* NB: Both of the following flags are derivable from the 'shell' | |
311 field above, but it's easier if we also have them separately here. */ | |
312 | |
313 /* Are we a top-level frame? This means that our shell is a | |
314 TopLevelShell, and we should do certain things to interact with | |
315 the window manager. */ | |
316 unsigned int top_level_frame_p :1; | |
317 | |
318 #ifdef EXTERNAL_WIDGET | |
319 /* Are we using somebody else's window for our shell window? This | |
320 means that our shell is an ExternalShell. If this flag is set, then | |
321 `top_level_frame_p' will never be set. */ | |
322 unsigned int external_window_p :1; | |
323 #endif /* EXTERNAL_WIDGET */ | |
324 }; | |
325 | |
326 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x) | |
327 | |
328 #define FRAME_X_SHELL_WIDGET(f) (FRAME_X_DATA (f)->widget) | |
329 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container) | |
330 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget) | |
331 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget) | |
332 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets) | |
333 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets) | |
334 | |
335 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap) | |
336 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask) | |
337 | |
338 #ifdef HAVE_TOOLBARS | |
339 #define FRAME_X_OLD_TOOLBAR_SIZE(f, pos) (FRAME_X_DATA (f)->old_toolbar_size[pos]) | |
340 | |
341 #define FRAME_X_TOOLBAR_TOP_SHADOW_GC(f) (FRAME_X_DATA (f)->toolbar_top_shadow_gc) | |
342 #define FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC(f) (FRAME_X_DATA (f)->toolbar_bottom_shadow_gc) | |
343 #define FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_blank_background_gc) | |
344 #define FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_pixmap_background_gc) | |
345 #endif /* HAVE_TOOLBARS */ | |
346 | |
347 #define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please) | |
348 | |
349 #define FRAME_X_TOTALLY_VISIBLE_P(f) (FRAME_X_DATA (f)->totally_visible_p) | |
350 #define FRAME_X_TOP_LEVEL_FRAME_P(f) (FRAME_X_DATA (f)->top_level_frame_p) | |
351 | |
352 #ifdef EXTERNAL_WIDGET | |
353 #define FRAME_X_EXTERNAL_WINDOW_P(f) (FRAME_X_DATA (f)->external_window_p) | |
354 #endif | |
355 | |
356 #ifdef HAVE_XIM | |
357 #define FRAME_X_XIC_SPOT(f) (FRAME_X_DATA (f)->xic_spot) | |
358 #ifdef XIM_XLIB | |
359 #define FRAME_X_XIC(f) (FRAME_X_DATA (f)->xic) | |
360 #define FRAME_X_XIC_STYLE(f) (FRAME_X_DATA (f)->xic_style) | |
361 #endif /* XIM_XLIB */ | |
362 #endif /* HAVE_XIM */ | |
363 | |
364 /* Variables associated with the X display frame this emacs is using. */ | 68 /* Variables associated with the X display frame this emacs is using. */ |
365 extern XtAppContext Xt_app_con; | 69 extern XtAppContext Xt_app_con; |
366 | 70 |
367 extern Lisp_Object Vx_gc_pointer_shape; | 71 extern Lisp_Object Vx_gc_pointer_shape; |
368 extern Lisp_Object Vx_scrollbar_pointer_shape; | 72 extern Lisp_Object Vx_scrollbar_pointer_shape; |
369 extern Lisp_Object Qx_error; | 73 extern Lisp_Object Qx_error; |
370 | |
371 extern struct console_type *x_console_type; | |
372 extern Lisp_Object Vdefault_x_device; | |
373 | 74 |
374 /* Number of pixels below each line. */ | 75 /* Number of pixels below each line. */ |
375 extern int x_interline_space; /* #### implement me */ | 76 extern int x_interline_space; /* #### implement me */ |
376 | 77 |
377 extern Fixnum x_selection_timeout; | 78 extern Fixnum x_selection_timeout; |