Mercurial > hg > xemacs-beta
diff src/window-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 | 6fa9919a9a0b |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/window-impl.h Thu Jun 20 21:19:10 2002 +0000 @@ -0,0 +1,287 @@ +/* Window definitions for XEmacs. + Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 + Free Software Foundation, Inc. + Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. + Copyright (C) 1995, 1996, 2002 Ben Wing. + Copyright (C) 1996 Chuck Thompson. + +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_window_impl_h_ +#define INCLUDED_window_impl_h_ + +#include "window.h" + +/* All windows in use are arranged into a tree, with pointers up and down. + +Windows that are leaves of the tree are actually displayed +and show the contents of buffers. Windows that are not leaves +are used for representing the way groups of leaf windows are +arranged on the frame. Leaf windows never become non-leaves. +They are deleted only by calling delete-window on them (but +this can be done implicitly). Combination windows can be created +and deleted at any time. + +A leaf window has a non-nil buffer field, and also + has markers in its start and pointm fields. Non-leaf windows + have nil in these fields. + +Non-leaf windows are either vertical or horizontal combinations. + +A vertical combination window has children that are arranged on the frame +one above the next. Its vchild field points to the uppermost child. +The parent field of each of the children points to the vertical +combination window. The next field of each child points to the +child below it, or is nil for the lowest child. The prev field +of each child points to the child above it, or is nil for the +highest child. + +A horizontal combination window has children that are side by side. +Its hchild field points to the leftmost child. In each child +the next field points to the child to the right and the prev field +points to the child to the left. + +The children of a vertical combination window may be leaf windows +or horizontal combination windows. The children of a horizontal +combination window may be leaf windows or vertical combination windows. + +At the top of the tree are two windows which have nil as parent. +The second of these is minibuf_window. The first one manages all +the frame area that is not minibuffer, and is called the root window. +Different windows can be the root at different times; +initially the root window is a leaf window, but if more windows +are created then that leaf window ceases to be root and a newly +made combination window becomes root instead. + +In any case, on screens which have an ordinary window and a +minibuffer, prev of the minibuf window is the root window and next of +the root window is the minibuf window. On minibufferless screens or +minibuffer-only screens, the root window and the minibuffer window are +one and the same, so its prev and next members are nil. + +A dead window has the `dead' flag set on it. Note that unlike other +dead objects, dead windows can be made live again through restoring a +window configuration. This means that the values in a dead window +need to be preserved, except for those that are reconstructed by from +the window configuration. */ + +struct window +{ + struct lcrecord_header header; + + /* The upper left corner coordinates of this window, + as integers (pixels) relative to upper left corner of frame = 0, 0 */ + int pixel_left; + int pixel_top; + /* The size of the window (in pixels) */ + int pixel_height; + int pixel_width; + + /* Number of columns display within the window is scrolled to the left. */ + int hscroll; + /* Idem for the window's modeline */ + Charcount modeline_hscroll; + /* Amount to clip off the top line for pixel-based scrolling. Point + will remain constant but this will be incremented to + incrementally shift lines up. */ + int top_yoffset; + /* Amount to clip off the left of the lines for pixel-based + scrolling. Hscroll will remain constant but this will be + incremented to incrementally shift lines left.*/ + int left_xoffset; + + /* face cache elements correct for this window and its current buffer */ + face_cachel_dynarr *face_cachels; + /* glyph cache elements correct for this window and its current buffer */ + glyph_cachel_dynarr *glyph_cachels; + /* List of starting positions for display lines. Only valid if + buffer has not changed. */ + line_start_cache_dynarr *line_start_cache; + int line_cache_validation_override; + + /* Length of longest line currently displayed. Used to control the + width of the horizontal scrollbars. */ + int max_line_len; + + /* Frame coords of point at that time */ + int last_point_x[3]; + int last_point_y[3]; + + /* Number of characters in buffer past bottom of window, + as of last redisplay that finished. */ + /* need one for each set of display structures */ + int window_end_pos[3]; + + /* Set by the extent code when extents in the gutter are changed. */ + int gutter_extent_modiff[4]; + + /* Set by redisplay to the last position seen. This is used + to implement the redisplay-end-trigger-functions. */ + Charbpos last_redisplay_pos; + +#define WINDOW_SLOT_DECLARATION +#define WINDOW_SLOT(slot) Lisp_Object slot; +#include "winslots.h" + + /* one-bit flags: */ + + /* marker used when restoring a window configuration */ + unsigned int config_mark :1; + /* Non-zero means window was dead. */ + unsigned int dead :1; + /* Non-zero means next redisplay must use the value of start + set up for it in advance. Set by scrolling commands. */ + unsigned int force_start :1; + /* Non-zero means must regenerate modeline of this window */ + unsigned int redo_modeline :1; + /* Non-zero means current value of `start' + was the beginning of a line when it was chosen. */ + unsigned int start_at_line_beg :1; + /* new redisplay flag */ + unsigned int windows_changed :1; + unsigned int shadow_thickness_changed :1; + /* Vertical divider flag and validity of it */ + unsigned int need_vertical_divider_p :1; + unsigned int need_vertical_divider_valid_p :1; +}; + +#define CURRENT_DISP 0 +#define DESIRED_DISP 1 +#define CMOTION_DISP 2 + +struct window_mirror +{ + struct lcrecord_header header; + + /* Frame this mirror is on. */ + struct frame *frame; + + /* Following child (to right or down) at same level of tree */ + struct window_mirror *next; + + /* There is no prev field because we never traverse this structure + backwards. Same goes for the parent field. */ + + /* First child of this window. */ + /* vchild is used if this is a vertical combination, + hchild if this is a horizontal combination. */ + struct window_mirror *hchild, *vchild; + + /* Dynamic array of display lines */ + display_line_dynarr *current_display_lines; + display_line_dynarr *desired_display_lines; + + /* Buffer current_display_lines represent. */ + struct buffer *buffer; + +#ifdef HAVE_SCROLLBARS + /* Scrollbars associated with window, if any. */ + struct scrollbar_instance *scrollbar_vertical_instance; + struct scrollbar_instance *scrollbar_horizontal_instance; +#endif /* HAVE_SCROLLBARS */ + + /* Flag indicating whether a subwindow is currently being displayed. */ + unsigned int subwindows_being_displayed :1; + + /* Keep track of the truncation status in this window so we can + detect when it has changed. #### Magic variables would be a huge + win here. */ + unsigned int truncate_win :1; +}; + +/* Redefine basic properties more efficiently */ + +#undef WINDOW_LIVE_P +#define WINDOW_LIVE_P(x) (!(x)->dead) +#undef WINDOW_FRAME +#define WINDOW_FRAME(w) ((w)->frame) +#undef WINDOW_BUFFER +#define WINDOW_BUFFER(w) ((w)->buffer) + +/* 1 if W is a minibuffer window. */ +#define MINI_WINDOW_P(W) (!NILP ((W)->mini_p)) + +/* 1 if we are dealing with a parentless window (this includes the + root window on a frame and the minibuffer window; both of these + are siblings). */ +#define TOP_LEVEL_WINDOW_P(w) NILP ((w)->parent) + +/* Set all redisplay flags indicating a window has changed */ +#define MARK_WINDOWS_CHANGED(w) do { \ + (w)->windows_changed = 1; \ + if (!NILP (w->frame)) \ + { \ + struct frame *mwc_frame = XFRAME (w->frame); \ + MARK_FRAME_WINDOWS_CHANGED (mwc_frame); \ + } \ + else \ + windows_changed = 1; \ +} while (0) + +/* #### This should be fixed not to call MARK_FRAME_CHANGED because + faces are cached per window. Also, other code which changes window's + face should use this macro. +*/ +#define MARK_WINDOW_FACES_CHANGED(w) \ + MARK_FRAME_FACES_CHANGED (XFRAME ((w)->frame)) + +#define WINDOW_TTY_P(w) FRAME_TTY_P (XFRAME ((w)->frame)) +#define WINDOW_X_P(w) FRAME_X_P (XFRAME ((w)->frame)) +#define WINDOW_NS_P(w) FRAME_NS_P (XFRAME ((w)->frame)) +#define WINDOW_WIN_P(w) FRAME_WIN_P (XFRAME ((w)->frame)) + +/* XEmacs window size and positioning macros. */ +#define WINDOW_TOP(w) ((w)->pixel_top) +#define WINDOW_TEXT_TOP(w) (WINDOW_TOP (w) + window_top_gutter_height (w)) +#define WINDOW_TEXT_TOP_CLIP(w) ((w)->top_yoffset) +#define WINDOW_BOTTOM(w) ((w)->pixel_top + (w)->pixel_height) +#define WINDOW_TEXT_BOTTOM(w) (WINDOW_BOTTOM (w) - window_bottom_gutter_height (w)) +#define WINDOW_LEFT(w) ((w)->pixel_left) +#define WINDOW_TEXT_LEFT(w) (WINDOW_LEFT (w) + window_left_gutter_width (w, 0)) +#define WINDOW_MODELINE_LEFT(w) \ + (WINDOW_LEFT (w) + window_left_gutter_width (w, 1)) +#define WINDOW_RIGHT(w) ((w)->pixel_left + (w)->pixel_width) +#define WINDOW_TEXT_RIGHT(w) \ + (WINDOW_RIGHT (w) - window_right_gutter_width (w, 0)) +#define WINDOW_MODELINE_RIGHT(w) \ + (WINDOW_RIGHT (w) - window_right_gutter_width (w, 1)) + +#define WINDOW_HEIGHT(w) ((w)->pixel_height) +#define WINDOW_TEXT_HEIGHT(w) (WINDOW_TEXT_BOTTOM (w) - WINDOW_TEXT_TOP (w)) +#define WINDOW_WIDTH(w) ((w)->pixel_width) +#define WINDOW_TEXT_WIDTH(w) (WINDOW_TEXT_RIGHT (w) - WINDOW_TEXT_LEFT (w)) + +#define WINDOW_HAS_MODELINE_P(w) (!NILP (w->has_modeline_p)) + +#define MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED(win) \ + abs ((!WINDOW_HAS_MODELINE_P (win) \ + ? ((XINT (win->modeline_shadow_thickness) > 1) \ + ? XINT (win->modeline_shadow_thickness) - 1 \ + : ((XINT (win->modeline_shadow_thickness) < -1) \ + ? XINT (win->modeline_shadow_thickness) + 1 \ + : XINT (win->modeline_shadow_thickness))) \ + : XINT (win->modeline_shadow_thickness))) + +#define MODELINE_SHADOW_THICKNESS(win) \ + (MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win) > 10 \ + ? 10 \ + : MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win)) + +#endif /* INCLUDED_window_impl_h_ */