Mercurial > hg > xemacs-beta
view src/winslots.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 | 047d37eb70d7 |
children | e22b0213b713 |
line wrap: on
line source
/* Definitions of marked slots in windows and window configs 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, 2001, 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. */ /* Split out of window.h and window.c by Kirill Katsnelson <kkm@kis.ru>, May 1998 */ /* Separation into WINDOW_SLOT / WINDOW_SAVED_SLOT by Ben Wing, June 2001. NOTE: No semicolons after slot declarations in this file! The definitions of WINDOW_SLOT (and possibly WINDOW_SAVED_SLOT) need to include a semicolon. This is because these may be defined as nothing, and some compilers don't tolerate extra semicolons in structure definitions. WINDOW_SLOT declares a Lisp_Object that is not copied into the saved_window struct of a window configuration, or is handled in a special way in window configurations. WINDOW_SLOT_ARRAY is the same for an array of Lisp_Objects. WINDOW_SAVED_SLOT declares a Lisp_Object that is copied with no special handling into the saved_window struct of a window configuration. You must also declare the comparison function, either EQ or EQUAL_WRAPPED (i.e. Feq() or Fequal()). WINDOW_SAVED_SLOT_ARRAY is the same for an array of Lisp_Objects. Callers should define WINDOW_SLOT (with a terminating semicolon if not blank), and WINDOW_SAVED_SLOT if different; otherwise the latter will be defined using WINDOW_SLOT. Callers do not define the _ARRAY versions. Instead, they either do or do not define WINDOW_SLOT_DECLARATION. It should be defined in the definition of a struct and not elsewhere. Callers do not need to undefine these definitions; it is done automatically. */ #ifndef WINDOW_SAVED_SLOT #define WINDOW_SAVED_SLOT(slot, compare) WINDOW_SLOT (slot) #endif #ifdef WINDOW_SLOT_DECLARATION #define WINDOW_SLOT_ARRAY(slot, size) WINDOW_SLOT (slot[size]) #define WINDOW_SAVED_SLOT_ARRAY(slot, size, compare) \ WINDOW_SAVED_SLOT (slot[size], compare) #else #define WINDOW_SLOT_ARRAY(slot, size) do { \ int wsaidx; \ for (wsaidx = 0; wsaidx < size; wsaidx++) \ { \ WINDOW_SLOT (slot[wsaidx]); \ } \ } while (0); #define WINDOW_SAVED_SLOT_ARRAY(slot, size, compare) do { \ int wsaidx; \ for (wsaidx = 0; wsaidx < size; wsaidx++) \ { \ WINDOW_SAVED_SLOT (slot[wsaidx], compare); \ } \ } while (0); #endif /* WINDOW_SLOT_DECLARATION */ #define EQUAL_WRAPPED(x,y) internal_equal ((x), (y), 0) /* The frame this window is on. */ WINDOW_SLOT (frame) /* t if this window is a minibuffer window. */ WINDOW_SLOT (mini_p) /* Following child (to right or down) at same level of tree */ WINDOW_SLOT (next) /* Preceding child (to left or up) at same level of tree */ WINDOW_SLOT (prev) /* First child of this window. */ /* vchild is used if this is a vertical combination, hchild if this is a horizontal combination. */ WINDOW_SLOT (hchild) WINDOW_SLOT (vchild) /* The window this one is a child of. */ WINDOW_SLOT (parent) /* The buffer displayed in this window */ /* Of the fields vchild, hchild and buffer, only one is non-nil. */ WINDOW_SLOT (buffer) /* A marker pointing to where in the text to start displaying */ /* need one for each set of display structures */ WINDOW_SLOT_ARRAY (start, 3) /* A marker pointing to where in the text point is in this window, used only when the window is not selected. This exists so that when multiple windows show one buffer each one can have its own value of point. */ /* need one for each set of display structures */ WINDOW_SLOT_ARRAY (pointm, 3) /* A marker pointing to where in the text the scrollbar is pointing; #### moved to scrollbar.c? */ WINDOW_SLOT (sb_point) /* A table that remembers (in marker form) the value of point in buffers previously displayed in this window. Switching back to those buffers causes the remembered point value to become current, rather than the buffer's point. This is so that you get sensible behavior if you have a buffer displayed in multiple windows and temporarily switch away and then back in one window. We don't save or restore this table in a window configuration, since that would be counterproductive -- we always want to remember the most recent value of point in buffers we switched away from. */ WINDOW_SLOT (saved_point_cache) /* A table that remembers (in marker form) the value of window start in buffers previously displayed in this window. Save reason as for the previous table. */ WINDOW_SLOT (saved_last_window_start_cache) /* Number saying how recently window was selected */ WINDOW_SLOT (use_time) /* text.modified of displayed buffer as of last time display completed */ WINDOW_SLOT_ARRAY (last_modified, 3) /* Value of point at that time */ WINDOW_SLOT_ARRAY (last_point, 3) /* Value of start at that time */ WINDOW_SLOT_ARRAY (last_start, 3) /* buf.face_change as of last time display completed */ WINDOW_SLOT_ARRAY (last_facechange, 3) /* we cannot have a per-device cache of widgets / subwindows because each visible instance needs to be a separate instance. The lowest level of granularity we can get easily is the window that the subwindow is in. This will fail if we attach the same subwindow twice to a buffer. However, we are quite unlikely to do this, especially with buttons which will need individual callbacks. The proper solution is probably not worth the effort. */ WINDOW_SLOT (subwindow_instance_cache) WINDOW_SLOT (line_cache_last_updated) /* If redisplay in this window goes beyond this buffer position, must run the redisplay-end-trigger-functions. */ WINDOW_SLOT (redisplay_end_trigger) /*** Non-specifier vars of window and window config ***/ /* Non-nil means window is marked as dedicated. */ WINDOW_SAVED_SLOT (dedicated, EQ) /*** specifier values cached in the struct window ***/ /* Display-table to use for displaying chars in this window. */ WINDOW_SAVED_SLOT (display_table, EQUAL_WRAPPED) /* Thickness of modeline shadow, in pixels. If negative, draw as recessed. */ WINDOW_SAVED_SLOT (modeline_shadow_thickness, EQ) /* Non-nil means to display a modeline for the buffer. */ WINDOW_SAVED_SLOT (has_modeline_p, EQ) /* Thickness of vertical divider shadow, in pixels. If negative, draw as recessed. */ WINDOW_SAVED_SLOT (vertical_divider_shadow_thickness, EQ) /* Divider surface width (not counting 3-d borders) */ WINDOW_SAVED_SLOT (vertical_divider_line_width, EQ) /* Spacing between outer edge of divider border and window edge */ WINDOW_SAVED_SLOT (vertical_divider_spacing, EQ) /* Whether vertical dividers are always displayed */ WINDOW_SAVED_SLOT (vertical_divider_always_visible_p, EQ) #ifdef HAVE_SCROLLBARS /* Width of vertical scrollbars. */ WINDOW_SAVED_SLOT (scrollbar_width, EQ) /* Height of horizontal scrollbars. */ WINDOW_SAVED_SLOT (scrollbar_height, EQ) /* Whether the scrollbars are visible */ WINDOW_SAVED_SLOT (horizontal_scrollbar_visible_p, EQ) WINDOW_SAVED_SLOT (vertical_scrollbar_visible_p, EQ) /* Scrollbar positions */ WINDOW_SAVED_SLOT (scrollbar_on_left_p, EQ) WINDOW_SAVED_SLOT (scrollbar_on_top_p, EQ) /* Pointer to use for vertical and horizontal scrollbars. */ WINDOW_SAVED_SLOT (scrollbar_pointer, EQ) #endif /* HAVE_SCROLLBARS */ #ifdef HAVE_TOOLBARS /* Toolbar specification for each of the four positions. This is not a size hog because the value here is not copied, and will be shared with the specs in the specifier. */ WINDOW_SAVED_SLOT_ARRAY (toolbar, 4, EQUAL_WRAPPED) /* Toolbar size for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (toolbar_size, 4, EQUAL_WRAPPED) /* Toolbar border width for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (toolbar_border_width, 4, EQUAL_WRAPPED) /* Toolbar visibility status for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (toolbar_visible_p, 4, EQUAL_WRAPPED) /* Caption status of toolbar. */ WINDOW_SAVED_SLOT (toolbar_buttons_captioned_p, EQ) /* The following five don't really need to be cached except that we need to know when they've changed. */ WINDOW_SAVED_SLOT (default_toolbar, EQUAL_WRAPPED) WINDOW_SAVED_SLOT (default_toolbar_width, EQ) WINDOW_SAVED_SLOT (default_toolbar_height, EQ) WINDOW_SAVED_SLOT (default_toolbar_visible_p, EQ) WINDOW_SAVED_SLOT (default_toolbar_border_width, EQ) WINDOW_SAVED_SLOT (toolbar_shadow_thickness, EQ) #endif /* HAVE_TOOLBARS */ /* Gutter specification for each of the four positions. This is not a size hog because the value here is not copied, and will be shared with the specs in the specifier. */ WINDOW_SAVED_SLOT_ARRAY (gutter, 4, EQUAL_WRAPPED) /* Real (pre-calculated) gutter specification for each of the four positions. This is not a specifier, it is calculated by the specifier change functions. */ WINDOW_SAVED_SLOT_ARRAY (real_gutter, 4, EQUAL_WRAPPED) /* Gutter size for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (gutter_size, 4, EQUAL_WRAPPED) /* Real (pre-calculated) gutter size for each of the four positions. This is not a specifier, it is calculated by the specifier change functions. */ WINDOW_SAVED_SLOT_ARRAY (real_gutter_size, 4, EQUAL_WRAPPED) /* Gutter border width for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (gutter_border_width, 4, EQUAL_WRAPPED) /* Gutter visibility status for each of the four positions. */ WINDOW_SAVED_SLOT_ARRAY (gutter_visible_p, 4, EQUAL_WRAPPED) /* The following five don't really need to be cached except that we need to know when they've changed. */ WINDOW_SAVED_SLOT (default_gutter, EQUAL_WRAPPED) WINDOW_SAVED_SLOT (default_gutter_width, EQ) WINDOW_SAVED_SLOT (default_gutter_height, EQ) WINDOW_SAVED_SLOT (default_gutter_visible_p, EQ) WINDOW_SAVED_SLOT (default_gutter_border_width, EQ) /* margins */ WINDOW_SAVED_SLOT (left_margin_width, EQ) WINDOW_SAVED_SLOT (right_margin_width, EQ) WINDOW_SAVED_SLOT (minimum_line_ascent, EQ) WINDOW_SAVED_SLOT (minimum_line_descent, EQ) WINDOW_SAVED_SLOT (use_left_overflow, EQ) WINDOW_SAVED_SLOT (use_right_overflow, EQ) #ifdef HAVE_MENUBARS /* Visibility of menubar. */ WINDOW_SAVED_SLOT (menubar_visible_p, EQ) #endif /* HAVE_MENUBARS */ WINDOW_SAVED_SLOT (text_cursor_visible_p, EQ) /* Hara-kiri */ #undef EQUAL_WRAPPED #undef WINDOW_SLOT_DECLARATION #undef WINDOW_SLOT #undef WINDOW_SLOT_ARRAY #undef WINDOW_SAVED_SLOT #undef WINDOW_SAVED_SLOT_ARRAY