Mercurial > hg > xemacs-beta
view src/bufslots.h @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
author | ben |
---|---|
date | Mon, 18 Jun 2001 07:10:32 +0000 |
parents | 1ccc32a20af4 |
children | 943eaba38521 |
line wrap: on
line source
/* Definitions of marked slots in buffers Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. 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: Mule 2.0, FSF 19.30. Split out of buffer.h. */ /* Authorship: FSF: long ago (part of buffer.h). JWZ: separated out from buffer.h, early in Lemacs. XEmacs: a few other changes. */ /* We define the Lisp_Objects in the buffer structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. No need to undefine; that happens automatically. */ #ifndef BUFFER_SLOTS_FIRST_NAME #define BUFFER_SLOTS_FIRST_NAME name #endif /* The name of this buffer. */ MARKED_SLOT (name); /* The name of the file visited in this buffer, or nil. */ MARKED_SLOT (filename); /* Dir for expanding relative file names. */ MARKED_SLOT (directory); /* True iff this buffer has been backed up (if you write to the visited file and it hasn't been backed up, then a backup will be made). */ /* #### This isn't really used by the C code, so could be deleted. */ MARKED_SLOT (backed_up); /* Length of file when last read or saved. This is not in the struct buffer_text because it's not used in indirect buffers at all. */ MARKED_SLOT (saved_size); /* File name used for auto-saving this buffer. This is not in the struct buffer_text because it's not used in indirect buffers at all. */ MARKED_SLOT (auto_save_file_name); /* Non-nil if buffer read-only. */ MARKED_SLOT (read_only); /* "The mark". This is a marker which may point into this buffer or may point nowhere. */ MARKED_SLOT (mark); /* Alist of elements (SYMBOL . VALUE-IN-THIS-BUFFER) for all per-buffer variables of this buffer. Specifically, this lists those variables that have a buffer-local value in this buffer: i.e. those whose value does not shadow the default value. (Remember that for any particular variable created with `make-local-variable' or `make-variable-buffer-local', it will have a per-buffer value in some buffers and a default value in others.) Variables declared in C with DEFVAR_BUFFER_LOCAL() (i.e. those stored in the struct buffer) are not listed here. */ MARKED_SLOT (local_var_alist); /* Symbol naming major mode (eg, lisp-mode). */ MARKED_SLOT (major_mode); /* Pretty name of major mode (eg, "Lisp"). */ MARKED_SLOT (mode_name); /* Modeline element that controls format of modeline. */ MARKED_SLOT (modeline_format); /* Keys that are bound local to this buffer. */ MARKED_SLOT (keymap); /* This buffer's local abbrev table. */ MARKED_SLOT (abbrev_table); /* This buffer's syntax table. */ MARKED_SLOT (syntax_table); /* Massaged values from the syntax table, for faster lookup. */ MARKED_SLOT (mirror_syntax_table); #ifdef MULE /* This buffer's category table. */ MARKED_SLOT (category_table); #endif /* MULE */ #ifdef FILE_CODING /* This buffer's coding system. */ MARKED_SLOT (buffer_file_coding_system); #endif /* Values of several buffer-local variables. tab-width is buffer-local so that redisplay can find it in buffers that are not current */ MARKED_SLOT (case_fold_search); MARKED_SLOT (tab_width); MARKED_SLOT (fill_column); MARKED_SLOT (left_margin); /* Function to call when insert space past fill column. */ MARKED_SLOT (auto_fill_function); /* Case table for case-conversion in this buffer. */ MARKED_SLOT (case_table); /* It contais following char-tables: */ /* Char-table maps each char into its lower-case version. */ /* Char-table mapping each char to its upper-case version. */ /* Char-table for conversion for case-folding search. */ /* Char-table of equivalences for case-folding search. */ /* #### This ought to be a specifier: */ /* Non-nil means do not display continuation lines. */ MARKED_SLOT (truncate_lines); /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means display ctl chars with uparrow. */ MARKED_SLOT (ctl_arrow); /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means do selective display; see doc string in syms_of_buffer (buffer.c) for details. */ MARKED_SLOT (selective_display); /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means show ... at end of line followed by invisible lines. */ MARKED_SLOT (selective_display_ellipses); /* Alist of (FUNCTION . STRING) for each minor mode enabled in buffer. */ /* Unused: MARKED_SLOT (minor_modes); */ /* t if "self-insertion" should overwrite */ MARKED_SLOT (overwrite_mode); /* non-nil means abbrev mode is on. Expand abbrevs automatically. */ MARKED_SLOT (abbrev_mode); /* No display table here. It's a specifier. */ #if 0 /* FSFmacs */ /* t means the mark and region are currently active. */ MARKED_SLOT (mark_active); #endif /* Changes in the buffer are recorded here for undo. t means don't record anything. This information belongs to the base buffer of an indirect buffer, But we can't store it in the struct buffer_text because local variables have to be right in the struct buffer. So we copy it around in set_buffer_internal. */ MARKED_SLOT (undo_list); /* FSFmacs has overlay stuff here. We have extent info elsewhere in the struct buffer. */ /* dedicated_frame in lisp */ /* Lisp of symbols naming the file format used for visited file. */ MARKED_SLOT (file_format); #ifdef REGION_CACHE_NEEDS_WORK /* True if the newline position cache and width run cache are enabled. See search.c and indent.c. */ MARKED_SLOT (cache_long_line_scans); /* If the width run cache is enabled, this table contains the character widths width_run_cache (see above) assumes. When we do a thorough redisplay, we compare this against the buffer's current display table to see whether the display table has affected the widths of any characters. If it has, we invalidate the width run cache, and re-initialize width_table. */ MARKED_SLOT (width_table); #endif /* REGION_CACHE_NEEDS_WORK */ /* A redundant copy of text.pt, in the form of a marker. Every time one is updated, so is the other. */ MARKED_SLOT (point_marker); /* FSFmacs has pt_marker, begv_marker, zv_marker here, used for indirect buffers. We don't need them because we handle these values directly instead of playing games with markers. */ /* This holds the point value before the last scroll operation. Explicitly setting point sets this to nil. */ MARKED_SLOT (point_before_scroll); /* Truename of the visited file (via the realpath() system call), or nil. */ MARKED_SLOT (file_truename); /* Invisibility spec of this buffer. t => any non-nil `invisible' property means invisible. A list => `invisible' property means invisible if it is memq in that list. */ MARKED_SLOT (invisibility_spec); /* The string generated by formatting the modeline in this buffer. */ MARKED_SLOT (generated_modeline_string); /* A hash table that maps from a "generic extent" (an extent in `modeline-format') into a buffer-specific extent. */ MARKED_SLOT (modeline_extent_table); #ifndef BUFFER_SLOTS_LAST_NAME #define BUFFER_SLOTS_LAST_NAME modeline_extent_table #endif #undef MARKED_SLOT