Mercurial > hg > xemacs-beta
diff src/frame-impl.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 | |
children | c9f067fd71a3 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/frame-impl.h Thu Jun 20 21:19:10 2002 +0000 @@ -0,0 +1,696 @@ +/* Define frame-object for XEmacs. + Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1995 Ben Wing. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Synched up with: FSF 19.30. */ + +#ifndef INCLUDED_frame_impl_h_ +#define INCLUDED_frame_impl_h_ + +#include "console-impl.h" /* for error_check_frame_type */ +#include "frame.h" + +#define FRAME_TYPE_NAME(f) ((f)->framemeths->name) +#define FRAME_TYPE(f) ((f)->framemeths->symbol) + +/******** Accessing / calling a frame method *********/ + +#define HAS_FRAMEMETH_P(f, m) HAS_CONTYPE_METH_P ((f)->framemeths, m) +#define FRAMEMETH(f, m, args) CONTYPE_METH ((f)->framemeths, m, args) +#define MAYBE_FRAMEMETH(f, m, args) \ + MAYBE_CONTYPE_METH ((f)->framemeths, m, args) +#define FRAMEMETH_OR_GIVEN(f, m, args, given) \ + CONTYPE_METH_OR_GIVEN((f)->framemeths, m, args, given) + +struct frame +{ + struct lcrecord_header header; + + /* Methods for this frame's console. This can also be retrieved + through frame->device->console, but it's faster this way. */ + struct console_methods *framemeths; + + /* Size of text only area of this frame, excluding scrollbars, + toolbars and end of line glyphs. The size can be in characters + or pixels, depending on units in which window system resizes + its windows */ + int height, width; + + /* New height and width for pending size change, in the same units + as above. 0 if no change pending. */ + int new_height, new_width; + + /* Size of text-only are of the frame, in default font characters. + This may be inaccurate due to rounding error */ + int char_height, char_width; + + /* Size of the whole frame, including scrollbars, toolbars and end + of line glyphs, in pixels */ + int pixheight, pixwidth; + +#ifdef HAVE_TTY + /* The count of frame number. This applies to TTY frames only. */ + int order_count; +#endif + + /* Current page number for a printer frame. */ + int page_number; + + /* Width of the internal border. This is a line of background color + just inside the window's border. It is normally only non-zero on + X frames, but we put it here to avoid introducing window system + dependencies. */ + int internal_border_width; + + int modiff; + + struct expose_ignore *subwindow_exposures; + struct expose_ignore *subwindow_exposures_tail; + +#ifdef HAVE_SCROLLBARS + /* frame-local scrollbar information. See scrollbar.c. */ + int scrollbar_y_offset; + + /* cache of created scrollbars */ + struct scrollbar_instance *sb_vcache; + struct scrollbar_instance *sb_hcache; +#endif + +#ifdef HAVE_TOOLBARS + /* Size of toolbars as seen by redisplay. This is used to determine + whether to re-layout windows by a call to change_frame_size early + in redisplay_frame. */ + int current_toolbar_size[4]; +#endif + + /* Size of gutters as seen by redisplay. This is used to determine + whether to re-layout windows by a call to change_frame_size early + in redisplay_frame. */ + int current_gutter_bounds[4]; + + /* Dynamic arrays of display lines for gutters */ + display_line_dynarr *current_display_lines[4]; + display_line_dynarr *desired_display_lines[4]; + + /* A structure of auxiliary data specific to the device type. + struct x_frame is used for X window frames; defined in console-x.h */ + void *frame_data; + +#define FRAME_SLOT_DECLARATION +#define MARKED_SLOT(x) Lisp_Object x +#include "frameslots.h" + + /* Nonzero if frame is currently displayed. + Mutually exclusive with iconified + JV: This now a tristate flag: +Value : Emacs meaning :f-v-p : X meaning +0 : not displayed : nil : unmapped +>0 : user can access it,needs repainting : t : mapped and visible +<0 : user can access it,needs no repainting : hidden :mapped and invisible + where f-v-p is the return value of frame-visible-p */ + int visible; + + /* one-bit flags: */ + + /* Is focusing onto this frame disabled? (Modal dialog boxes) */ + unsigned int disabled :1; + + /* Are we finished initializing? */ + unsigned int init_finished :1; + + /* Is frame marked for deletion? This is used in XSetErrorHandler(). */ + unsigned int being_deleted :1; + + /* Nonzero if last attempt at redisplay on this frame was preempted. */ + unsigned int display_preempted :1; + + /* Nonzero if window is currently iconified. + This and visible are mutually exclusive. */ + unsigned int iconified :1; + + /* Nonzero if this frame should be cleared and then redrawn. + Setting this will also effectively set frame_changed. */ + unsigned int clear :1; + + /* True if frame actually has a minibuffer window on it. + 0 if using a minibuffer window that isn't on this frame. */ + unsigned int has_minibuffer :1; + + /* True if frame's root window can't be split. */ + unsigned int no_split :1; + + unsigned int top_toolbar_was_visible :1; + unsigned int bottom_toolbar_was_visible :1; + unsigned int left_toolbar_was_visible :1; + unsigned int right_toolbar_was_visible :1; + /* gutter visibility */ + unsigned int top_gutter_was_visible :1; + unsigned int bottom_gutter_was_visible :1; + unsigned int left_gutter_was_visible :1; + unsigned int right_gutter_was_visible :1; + + /* redisplay flags */ + unsigned int buffers_changed :1; + unsigned int clip_changed :1; + unsigned int extents_changed :1; + unsigned int faces_changed :1; + unsigned int frame_changed :1; + unsigned int subwindows_changed :1; + unsigned int subwindows_state_changed :1; + unsigned int glyphs_changed :1; + unsigned int icon_changed :1; + unsigned int menubar_changed :1; + unsigned int modeline_changed :1; + unsigned int point_changed :1; + unsigned int size_changed :1; + unsigned int toolbar_changed :1; + unsigned int gutter_changed :1; + unsigned int windows_changed :1; + unsigned int windows_structure_changed :1; + unsigned int window_face_cache_reset :1; /* used by expose handler */ + unsigned int echo_area_garbaged :1; /* used by Fredisplay_echo_area */ + unsigned int size_slipped :1; + + unsigned int size_change_pending :1; + unsigned int mirror_dirty :1; + + /* flag indicating if any window on this frame is displaying a subwindow */ + unsigned int subwindows_being_displayed :1; +}; + +/* Redefine basic properties more efficiently */ + +#undef FRAME_LIVE_P +#define FRAME_LIVE_P(f) (!EQ (FRAME_TYPE (f), Qdead)) +#undef FRAME_DEVICE +#define FRAME_DEVICE(f) ((f)->device) + +#define FRAME_TYPE_P(f, type) EQ (FRAME_TYPE (f), Q##type) + +#ifdef ERROR_CHECK_TYPES +DECLARE_INLINE_HEADER ( +struct frame * +error_check_frame_type (struct frame * f, Lisp_Object sym) +) +{ + assert (EQ (FRAME_TYPE (f), sym)); + return f; +} +# define FRAME_TYPE_DATA(f, type) \ + ((struct type##_frame *) error_check_frame_type (f, Q##type)->frame_data) +#else +# define FRAME_TYPE_DATA(f, type) \ + ((struct type##_frame *) (f)->frame_data) +#endif + +#define CHECK_FRAME_TYPE(x, type) \ + do { \ + CHECK_FRAME (x); \ + if (!FRAME_TYPE_P (XFRAME (x), type)) \ + dead_wrong_type_argument \ + (type##_console_methods->predicate_symbol, x); \ + } while (0) +#define CONCHECK_FRAME_TYPE(x, type) \ + do { \ + CONCHECK_FRAME (x); \ + if (!FRAME_TYPE_P (XFRAME (x), type)) \ + x = wrong_type_argument \ + (type##_console_methods->predicate_symbol, x); \ + } while (0) + +#define FRAME_DISPLAY_P(frm) \ + (DEVICE_DISPLAY_P (XDEVICE (FRAME_DEVICE (frm)))) + +#define CHECK_DISPLAY_FRAME(frm) \ + do { \ + CHECK_FRAME (frm); \ + CHECK_LIVE_FRAME (frm); \ + CHECK_DISPLAY_DEVICE (FRAME_DEVICE (XFRAME (frm))); \ + } while (0) + +#define CONCHECK_DISPLAY_FRAME(frm) \ + do { \ + CONCHECK_FRAME (frm); \ + CONCHECK_LIVE_FRAME (frm); \ + CONCHECK_DISPLAY_DEVICE (FRAME_DEVICE (XFRAME (frm))); \ + } while (0) + +#define FRAME_PRINTER_P(frm) \ + (DEVICE_PRINTER_P (XDEVICE (FRAME_DEVICE (frm)))) + +#define CHECK_PRINTER_FRAME(frm) \ + do { \ + CHECK_FRAME (frm); \ + CHECK_LIVE_FRAME (frm); \ + CHECK_PRINTER_DEVICE (FRAME_DEVICE (XFRAME (frm))); \ + } while (0) + +#define CONCHECK_PRINTER_FRAME(frm) \ + do { \ + CONCHECK_FRAME (frm); \ + CONCHECK_LIVE_FRAME (frm); \ + CONCHECK_PRINTER_DEVICE (FRAME_DEVICE (XFRAME (frm))); \ + } while (0) + +/* #### These should be in the frame-*.h files but there are + too many places where the abstraction is broken. Need to + fix. */ + +#define FRAME_X_P(frm) CONSOLE_TYPESYM_X_P (FRAME_TYPE (frm)) +#define CHECK_X_FRAME(z) CHECK_FRAME_TYPE (z, x) +#define CONCHECK_X_FRAME(z) CONCHECK_FRAME_TYPE (z, x) + +#define FRAME_GTK_P(frm) CONSOLE_TYPESYM_GTK_P (FRAME_TYPE (frm)) +#define CHECK_GTK_FRAME(z) CHECK_FRAME_TYPE (z, gtk) +#define CONCHECK_GTK_FRAME(z) CONCHECK_FRAME_TYPE (z, gtk) + +#define FRAME_TTY_P(frm) CONSOLE_TYPESYM_TTY_P (FRAME_TYPE (frm)) +#define CHECK_TTY_FRAME(z) CHECK_FRAME_TYPE (z, tty) +#define CONCHECK_TTY_FRAME(z) CONCHECK_FRAME_TYPE (z, tty) + +#define FRAME_STREAM_P(frm) CONSOLE_TYPESYM_STREAM_P (FRAME_TYPE (frm)) +#define CHECK_STREAM_FRAME(z) CHECK_FRAME_TYPE (z, stream) +#define CONCHECK_STREAM_FRAME(z) CONCHECK_FRAME_TYPE (z, stream) + +#define FRAME_WIN_P(frm) CONSOLE_TYPESYM_WIN_P (FRAME_TYPE (frm)) + +extern int frame_changed; + +#define MARK_FRAME_FACES_CHANGED(f) do { \ + struct frame *mffc_f = (f); \ + mffc_f->faces_changed = 1; \ + mffc_f->modiff++; \ + if (!NILP (mffc_f->device)) \ + { \ + struct device *mffc_d = XDEVICE (mffc_f->device); \ + MARK_DEVICE_FACES_CHANGED (mffc_d); \ + } \ + else \ + faces_changed = 1; \ +} while (0) + +#define MARK_FRAME_GLYPHS_CHANGED(f) do { \ + struct frame *mfgc_f = (f); \ + mfgc_f->glyphs_changed = 1; \ + mfgc_f->modiff++; \ + if (!NILP (mfgc_f->device)) \ + { \ + struct device *mfgc_d = XDEVICE (mfgc_f->device); \ + MARK_DEVICE_GLYPHS_CHANGED (mfgc_d); \ + } \ + else \ + glyphs_changed = 1; \ +} while (0) + +#define MARK_FRAME_SUBWINDOWS_CHANGED(f) do { \ + struct frame *mfgc_f = (f); \ + mfgc_f->subwindows_changed = 1; \ + mfgc_f->modiff++; \ + if (!NILP (mfgc_f->device)) \ + { \ + struct device *mfgc_d = XDEVICE (mfgc_f->device); \ + MARK_DEVICE_SUBWINDOWS_CHANGED (mfgc_d); \ + } \ + else \ + subwindows_changed = 1; \ +} while (0) + +#define MARK_FRAME_SUBWINDOWS_STATE_CHANGED(f) do { \ + struct frame *mfgc_f = (f); \ + mfgc_f->subwindows_state_changed = 1; \ + mfgc_f->modiff++; \ + if (!NILP (mfgc_f->device)) \ + { \ + struct device *mfgc_d = XDEVICE (mfgc_f->device); \ + MARK_DEVICE_SUBWINDOWS_STATE_CHANGED (mfgc_d); \ + } \ + else \ + subwindows_state_changed = 1; \ +} while (0) + +#define MARK_FRAME_TOOLBARS_CHANGED(f) do { \ + struct frame *mftc_f = (f); \ + mftc_f->toolbar_changed = 1; \ + mftc_f->modiff++; \ + if (!NILP (mftc_f->device)) \ + { \ + struct device *mftc_d = XDEVICE (mftc_f->device); \ + MARK_DEVICE_TOOLBARS_CHANGED (mftc_d); \ + } \ + else \ + toolbar_changed = 1; \ +} while (0) + +#define MARK_FRAME_GUTTERS_CHANGED(f) do { \ + struct frame *mftc_f = (f); \ + mftc_f->gutter_changed = 1; \ + mftc_f->modiff++; \ + if (!NILP (mftc_f->device)) \ + { \ + struct device *mftc_d = XDEVICE (mftc_f->device); \ + MARK_DEVICE_GUTTERS_CHANGED (mftc_d); \ + } \ + else \ + gutter_changed = 1; \ +} while (0) + +#define MARK_FRAME_SIZE_CHANGED(f) do { \ + struct frame *mfsc_f = (f); \ + mfsc_f->size_changed = 1; \ + mfsc_f->size_change_pending = 1; \ + mfsc_f->modiff++; \ + if (!NILP (mfsc_f->device)) \ + { \ + struct device *mfsc_d = XDEVICE (mfsc_f->device); \ + MARK_DEVICE_SIZE_CHANGED (mfsc_d); \ + } \ + else \ + size_changed = 1; \ +} while (0) + +#define MARK_FRAME_CHANGED(f) do { \ + struct frame *mfc_f = (f); \ + mfc_f->frame_changed = 1; \ + mfc_f->modiff++; \ + if (!NILP (mfc_f->device)) \ + { \ + struct device *mfc_d = XDEVICE (mfc_f->device); \ + MARK_DEVICE_FRAME_CHANGED (mfc_d); \ + } \ + else \ + frame_changed = 1; \ +} while (0) + +#define MARK_FRAME_WINDOWS_CHANGED(f) do { \ + struct frame *mfwc_f = (f); \ + mfwc_f->windows_changed = 1; \ + mfwc_f->modiff++; \ + if (!NILP (mfwc_f->device)) \ + { \ + struct device *mfwc_d = XDEVICE (mfwc_f->device); \ + MARK_DEVICE_WINDOWS_CHANGED (mfwc_d); \ + } \ + else \ + windows_changed = 1; \ +} while (0) + +#define MARK_FRAME_WINDOWS_STRUCTURE_CHANGED(f) do { \ + struct frame *fwsc_f = (f); \ + fwsc_f->windows_structure_changed = 1; \ + fwsc_f->modiff++; \ + if (!NILP (fwsc_f->device)) \ + { \ + struct device *fwsc_d = XDEVICE (fwsc_f->device); \ + MARK_DEVICE_WINDOWS_STRUCTURE_CHANGED (fwsc_d); \ + } \ + else \ + windows_structure_changed = 1; \ + invalidate_vertical_divider_cache_in_frame (fwsc_f); \ +} while (0) + +#define MARK_FRAME_SIZE_SLIPPED(f) do { \ + struct frame *fwsc_f = (f); \ + fwsc_f->size_slipped = 1; \ + fwsc_f->modiff++; \ + if (!NILP (fwsc_f->device)) \ + { \ + struct device *fwsc_d = XDEVICE (fwsc_f->device); \ + MARK_DEVICE_FRAME_CHANGED (fwsc_d); \ + } \ + else \ + frame_changed = 1; \ +} while (0) + +#define CLEAR_FRAME_SIZE_SLIPPED(f) do { \ + struct frame *fwsc_f = (f); \ + fwsc_f->size_slipped = 0; \ +} while (0) + +#define SET_FRAME_CLEAR(f) MARK_FRAME_CHANGED (f); (f)->clear = 1 + +#define FRAME_MINIBUF_ONLY_P(f) \ + EQ (FRAME_ROOT_WINDOW (f), FRAME_MINIBUF_WINDOW (f)) +#define FRAME_HAS_MINIBUF_P(f) ((f)->has_minibuffer) +#define FRAME_HEIGHT(f) ((f)->height) +#define FRAME_WIDTH(f) ((f)->width) +#define FRAME_CHARHEIGHT(f) ((f)->char_height) +#define FRAME_CHARWIDTH(f) ((f)->char_width) +#define FRAME_PIXHEIGHT(f) ((f)->pixheight) +#define FRAME_PIXWIDTH(f) ((f)->pixwidth) +#define FRAME_PAGENUMBER(f) ((f)->page_number + 0) +#define FRAME_SET_PAGENUMBER(f,x) (f)->page_number = (x); +#ifdef HAVE_SCROLLBARS +#define FRAME_SCROLLBAR_WIDTH(f) \ + (NILP ((f)->vertical_scrollbar_visible_p) ? \ + 0 : XINT ((f)->scrollbar_width)) +#define FRAME_SCROLLBAR_HEIGHT(f) \ + (NILP ((f)->horizontal_scrollbar_visible_p) ? \ + 0 : XINT ((f)->scrollbar_height)) +#else +#define FRAME_SCROLLBAR_WIDTH(f) 0 +#define FRAME_SCROLLBAR_HEIGHT(f) 0 +#endif + +#define FRAME_NEW_HEIGHT(f) ((f)->new_height) +#define FRAME_NEW_WIDTH(f) ((f)->new_width) +#define FRAME_CURSOR_X(f) ((f)->cursor_x) +#define FRAME_CURSOR_Y(f) ((f)->cursor_y) +#define FRAME_VISIBLE_P(f) ((f)->visible) +#define FRAME_REPAINT_P(f) ((f)->visible>0) +#define FRAME_NO_SPLIT_P(f) ((f)->no_split) +#define FRAME_ICONIFIED_P(f) ((f)->iconified) +#define FRAME_FOCUS_FRAME(f) ((f)->focus_frame) +#define FRAME_MINIBUF_WINDOW(f) ((f)->minibuffer_window) +#define FRAME_ROOT_WINDOW(f) ((f)->root_window) +/* Catch people attempting to set this. */ +#define FRAME_SELECTED_WINDOW(f) NON_LVALUE ((f)->selected_window) +#define FRAME_SELECTED_XWINDOW(f) XWINDOW (FRAME_SELECTED_WINDOW (f)) +#define FRAME_LAST_NONMINIBUF_WINDOW(f) \ + NON_LVALUE ((f)->last_nonminibuf_window) +#define FRAME_SB_VCACHE(f) ((f)->sb_vcache) +#define FRAME_SB_HCACHE(f) ((f)->sb_hcache) +#define FRAME_SUBWINDOW_CACHE(f) ((f)->subwindow_instance_cache) + +#if 0 /* FSFmacs */ + +#define FRAME_VISIBLE_P(f) ((f)->visible != 0) +#define FRAME_SET_VISIBLE(f,p) \ + ((f)->async_visible = (p), FRAME_SAMPLE_VISIBILITY (f)) + +/* Emacs's redisplay code could become confused if a frame's + visibility changes at arbitrary times. For example, if a frame is + visible while the desired glyphs are being built, but becomes + invisible before they are updated, then some rows of the + desired_glyphs will be left marked as enabled after redisplay is + complete, which should never happen. The next time the frame + becomes visible, redisplay will probably barf. + + Currently, there are no similar situations involving iconified, but + the principle is the same. + + So instead of having asynchronous input handlers directly set and + clear the frame's visibility and iconification flags, they just set + the async_visible and async_iconified flags; the redisplay code + calls the FRAME_SAMPLE_VISIBILITY macro before doing any redisplay, + which sets visible and iconified from their asynchronous + counterparts. + + Synchronous code must use the FRAME_SET_VISIBLE macro. + + Also, if a frame used to be invisible, but has just become visible, + it must be marked as garbaged, since redisplay hasn't been keeping + up its contents. */ +#define FRAME_SAMPLE_VISIBILITY(f) \ + (((f)->async_visible && ! (f)->visible) ? SET_FRAME_GARBAGED (f) : 0, \ + (f)->visible = (f)->async_visible, \ + (f)->iconified = (f)->async_iconified) + +#endif /* FSFmacs */ + +#define FRAME_BORDER_WIDTH(f) ((f)->internal_border_width) +#define FRAME_BORDER_HEIGHT(f) ((f)->internal_border_width) + +/* This returns the frame-local value; that tells you what you should + use when computing the frame size. It is *not* the actual toolbar + size because that depends on the selected window. Use the macros + below for that. +*/ + +#ifdef HAVE_TOOLBARS +#define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) \ + (!NILP((f)->toolbar_buttons[pos]) && !NILP ((f)->toolbar_visible_p[pos])) +#define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) \ + (!NILP ((f)->toolbar_buttons[pos]) && INTP((f)->toolbar_size[pos]) ? \ + (XINT ((f)->toolbar_size[pos])) : 0) +#define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \ + (!NILP ((f)->toolbar_buttons[pos]) && INTP((f)->toolbar_border_width[pos]) ? \ + (XINT ((f)->toolbar_border_width[pos])) : 0) +#else +#define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) 0 +#define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) 0 +#define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) 0 +#endif + +#define FRAME_THEORETICAL_TOOLBAR_SIZE(f, pos) \ + (FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE (f, pos) \ + ? FRAME_RAW_THEORETICAL_TOOLBAR_SIZE (f, pos) \ + : 0) + +#define FRAME_THEORETICAL_TOP_TOOLBAR_HEIGHT(f) \ + FRAME_THEORETICAL_TOOLBAR_SIZE (f, TOP_TOOLBAR) +#define FRAME_THEORETICAL_BOTTOM_TOOLBAR_HEIGHT(f) \ + FRAME_THEORETICAL_TOOLBAR_SIZE (f, BOTTOM_TOOLBAR) +#define FRAME_THEORETICAL_LEFT_TOOLBAR_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_SIZE (f, LEFT_TOOLBAR) +#define FRAME_THEORETICAL_RIGHT_TOOLBAR_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_SIZE (f, RIGHT_TOOLBAR) + +#define FRAME_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \ + (FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE (f, pos) \ + ? FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH (f, pos) \ + : 0) + +#define FRAME_THEORETICAL_TOP_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_BORDER_WIDTH (f, TOP_TOOLBAR) +#define FRAME_THEORETICAL_BOTTOM_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_BORDER_WIDTH (f, BOTTOM_TOOLBAR) +#define FRAME_THEORETICAL_LEFT_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_BORDER_WIDTH (f, LEFT_TOOLBAR) +#define FRAME_THEORETICAL_RIGHT_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_THEORETICAL_TOOLBAR_BORDER_WIDTH (f, RIGHT_TOOLBAR) + +/* This returns the window-local value rather than the frame-local value; + that tells you about what's actually visible rather than what should + be used when computing the frame size. */ + +#ifdef HAVE_TOOLBARS +#define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) \ + (HAS_FRAMEMETH_P (f, initialize_frame_toolbars) \ + && !NILP (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_visible_p[pos])) +#define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \ + ((INTP (XWINDOW \ + (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_border_width[pos])) ? \ + (XINT (XWINDOW \ + (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_border_width[pos])) \ + : 0) +#define FRAME_RAW_REAL_TOOLBAR_SIZE(f, pos) \ + ((INTP (XWINDOW \ + (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_size[pos])) ? \ + (XINT (XWINDOW \ + (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_size[pos])) : 0) +#define FRAME_REAL_TOOLBAR(f, pos) \ + (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar[pos]) +#else +#define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) 0 +#define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) 0 +#define FRAME_RAW_REAL_TOOLBAR_SIZE(f, pos) 0 +#define FRAME_REAL_TOOLBAR(f, pos) Qnil +#endif + +/* Note to Chuck + Note to Chuck + Note to Chuck: + + The former definitions of FRAME_REAL_FOO_TOOLBAR_VISIBLE + looked at the toolbar data to see what was there. The + current ones look at the current values of the specifiers. + This is a semantic change; the former definition returned + what was *actually* there right at the moment, while the + current one returns what *ought* to be there once redisplay + has run to completion. I think this new definition is more + correct in almost all circumstances and is much less likely + to lead to strange race conditions. I'm not completely + sure that there aren't some places in the redisplay code + that use these macros and expect the former semantics, so + if you encounter some odd toolbar behavior, you might want + to look into this. --ben */ + +#define FRAME_REAL_TOOLBAR_VISIBLE(f, pos) \ + ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \ + && FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) > 0) \ + ? FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \ + : 0) +#define FRAME_REAL_TOOLBAR_SIZE(f, pos) \ + ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \ + && FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos)) \ + ? FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) \ + : 0) +#define FRAME_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \ + ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \ + && FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos)) \ + ? FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH (f, pos) \ + : 0) + +#define FRAME_REAL_TOP_TOOLBAR_HEIGHT(f) \ + FRAME_REAL_TOOLBAR_SIZE (f, TOP_TOOLBAR) +#define FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT(f) \ + FRAME_REAL_TOOLBAR_SIZE (f, BOTTOM_TOOLBAR) +#define FRAME_REAL_LEFT_TOOLBAR_WIDTH(f) \ + FRAME_REAL_TOOLBAR_SIZE (f, LEFT_TOOLBAR) +#define FRAME_REAL_RIGHT_TOOLBAR_WIDTH(f) \ + FRAME_REAL_TOOLBAR_SIZE (f, RIGHT_TOOLBAR) + +#define FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, TOP_TOOLBAR) +#define FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, BOTTOM_TOOLBAR) +#define FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, LEFT_TOOLBAR) +#define FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH(f) \ + FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, RIGHT_TOOLBAR) + +#define FRAME_REAL_TOP_TOOLBAR_VISIBLE(f) \ + FRAME_REAL_TOOLBAR_VISIBLE (f, TOP_TOOLBAR) +#define FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE(f) \ + FRAME_REAL_TOOLBAR_VISIBLE (f, BOTTOM_TOOLBAR) +#define FRAME_REAL_LEFT_TOOLBAR_VISIBLE(f) \ + FRAME_REAL_TOOLBAR_VISIBLE (f, LEFT_TOOLBAR) +#define FRAME_REAL_RIGHT_TOOLBAR_VISIBLE(f) \ + FRAME_REAL_TOOLBAR_VISIBLE (f, RIGHT_TOOLBAR) + +#define FRAME_TOP_BORDER_START(f) \ + (FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) + \ + 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f)) +#define FRAME_TOP_BORDER_END(f) \ + (FRAME_TOP_BORDER_START (f) + FRAME_BORDER_HEIGHT (f)) + +#define FRAME_BOTTOM_BORDER_START(f) \ + (FRAME_PIXHEIGHT (f) - FRAME_BORDER_HEIGHT (f) - \ + FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) - \ + 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) +#define FRAME_BOTTOM_BORDER_END(f) \ + (FRAME_PIXHEIGHT (f) - FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) - \ + 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + +#define FRAME_LEFT_BORDER_START(f) \ + (FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) + \ + 2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f)) +#define FRAME_LEFT_BORDER_END(f) \ + (FRAME_LEFT_BORDER_START (f) + FRAME_BORDER_WIDTH (f)) + +#define FRAME_RIGHT_BORDER_START(f) \ + (FRAME_PIXWIDTH (f) - FRAME_BORDER_WIDTH (f) - \ + FRAME_REAL_RIGHT_TOOLBAR_WIDTH(f) - \ + 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f)) +#define FRAME_RIGHT_BORDER_END(f) \ + (FRAME_PIXWIDTH (f) - FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) - \ + 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH(f)) + +#endif /* INCLUDED_frame_impl_h_ */