Mercurial > hg > xemacs-beta
view src/marker.c @ 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 | 183866b06e0b |
children | fdefd0186b75 |
line wrap: on
line source
/* Markers: examining, setting and killing. Copyright (C) 1985, 1992, 1993, 1994, 1995 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: FSF 19.30. */ /* This file has been Mule-ized. */ /* Note that markers are currently kept in an unordered list. This means that marker operations may be inefficient if there are a bunch of markers in the buffer. This probably won't have a significant impact on redisplay (which uses markers), but if it does, it wouldn't be too hard to change to an ordered gap array. (Just copy the code from extents.c.) */ #include <config.h> #include "lisp.h" #include "buffer.h" static Lisp_Object mark_marker (Lisp_Object obj) { Lisp_Marker *marker = XMARKER (obj); Lisp_Object buf; /* DO NOT mark through the marker's chain. The buffer's markers chain does not preserve markers from gc; Instead, markers are removed from the chain when they are freed by gc. */ if (!marker->buffer) return (Qnil); XSETBUFFER (buf, marker->buffer); return (buf); } static void print_marker (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Marker *marker = XMARKER (obj); char buf[200]; if (print_readably) printing_unreadable_object ("#<marker 0x%lx>", (long) marker); write_c_string (GETTEXT ("#<marker "), printcharfun); if (!marker->buffer) write_c_string (GETTEXT ("in no buffer"), printcharfun); else { sprintf (buf, "at %ld in ", (long) marker_position (obj)); write_c_string (buf, printcharfun); print_internal (marker->buffer->name, printcharfun, 0); } sprintf (buf, " 0x%lx>", (long) marker); write_c_string (buf, printcharfun); } static int marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) { Lisp_Marker *marker1 = XMARKER (obj1); Lisp_Marker *marker2 = XMARKER (obj2); return ((marker1->buffer == marker2->buffer) && (marker1->memind == marker2->memind || /* All markers pointing nowhere are equal */ !marker1->buffer)); } static unsigned long marker_hash (Lisp_Object obj, int depth) { unsigned long hash = (unsigned long) XMARKER (obj)->buffer; if (hash) hash = HASH2 (hash, XMARKER (obj)->memind); return hash; } static const struct lrecord_description marker_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_Marker, next) }, { XD_LISP_OBJECT, offsetof (Lisp_Marker, prev) }, { XD_LISP_OBJECT, offsetof (Lisp_Marker, buffer) }, { XD_END } }; DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker, mark_marker, print_marker, 0, marker_equal, marker_hash, marker_description, Lisp_Marker); /* Operations on markers. */ DEFUN ("marker-buffer", Fmarker_buffer, 1, 1, 0, /* Return the buffer that MARKER points into, or nil if none. Return nil if MARKER points into a dead buffer or doesn't point anywhere. */ (marker)) { struct buffer *buf; CHECK_MARKER (marker); /* Return marker's buffer only if it is not dead. */ if ((buf = XMARKER (marker)->buffer) && BUFFER_LIVE_P (buf)) { Lisp_Object buffer; XSETBUFFER (buffer, buf); return buffer; } return Qnil; } DEFUN ("marker-position", Fmarker_position, 1, 1, 0, /* Return the position MARKER points at, as a character number. Return `nil' if marker doesn't point anywhere. */ (marker)) { CHECK_MARKER (marker); return XMARKER (marker)->buffer ? make_int (marker_position (marker)) : Qnil; } #if 0 /* useful debugging function */ static void check_marker_circularities (struct buffer *buf) { Lisp_Marker *tortoise, *hare; tortoise = BUF_MARKERS (buf); hare = tortoise; if (!tortoise) return; while (1) { assert (hare->buffer == buf); hare = hare->next; if (!hare) return; assert (hare->buffer == buf); hare = hare->next; if (!hare) return; tortoise = tortoise->next; assert (tortoise != hare); } } #endif static Lisp_Object set_marker_internal (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer, int restricted_p) { Bufpos charno; struct buffer *b; Lisp_Marker *m; int point_p; CHECK_MARKER (marker); point_p = POINT_MARKER_P (marker); /* If position is nil or a marker that points nowhere, make this marker point nowhere. */ if (NILP (position) || (MARKERP (position) && !XMARKER (position)->buffer)) { if (point_p) invalid_operation ("Can't make point-marker point nowhere", marker); if (XMARKER (marker)->buffer) unchain_marker (marker); return marker; } CHECK_INT_COERCE_MARKER (position); if (NILP (buffer)) b = current_buffer; else { CHECK_BUFFER (buffer); b = XBUFFER (buffer); /* If buffer is dead, set marker to point nowhere. */ if (!BUFFER_LIVE_P (XBUFFER (buffer))) { if (point_p) invalid_operation ("Can't move point-marker in a killed buffer", marker); if (XMARKER (marker)->buffer) unchain_marker (marker); return marker; } } charno = XINT (position); m = XMARKER (marker); if (restricted_p) { if (charno < BUF_BEGV (b)) charno = BUF_BEGV (b); if (charno > BUF_ZV (b)) charno = BUF_ZV (b); } else { if (charno < BUF_BEG (b)) charno = BUF_BEG (b); if (charno > BUF_Z (b)) charno = BUF_Z (b); } if (point_p) { #ifndef moving_point_by_moving_its_marker_is_a_bug BUF_SET_PT (b, charno); /* this will move the marker */ #else /* It's not a feature, so it must be a bug */ invalid_operation ("DEBUG: attempt to move point via point-marker", marker); #endif } else { m->memind = bufpos_to_memind (b, charno); } if (m->buffer != b) { if (point_p) invalid_operation ("Can't change buffer of point-marker", marker); if (m->buffer != 0) unchain_marker (marker); m->buffer = b; marker_next (m) = BUF_MARKERS (b); marker_prev (m) = 0; if (BUF_MARKERS (b)) marker_prev (BUF_MARKERS (b)) = m; BUF_MARKERS (b) = m; } return marker; } DEFUN ("set-marker", Fset_marker, 2, 3, 0, /* Move MARKER to position POSITION in BUFFER. POSITION can be a marker, an integer or nil. If POSITION is an integer, make MARKER point before the POSITIONth character in BUFFER. If POSITION is nil, makes MARKER point nowhere. Then it no longer slows down editing in any buffer. If POSITION is less than 1, move MARKER to the beginning of BUFFER. If POSITION is greater than the size of BUFFER, move MARKER to the end of BUFFER. BUFFER defaults to the current buffer. If this marker was returned by (point-marker t), then changing its position moves point. You cannot change its buffer or make it point nowhere. The return value is MARKER. */ (marker, position, buffer)) { return set_marker_internal (marker, position, buffer, 0); } /* This version of Fset_marker won't let the position be outside the visible part. */ Lisp_Object set_marker_restricted (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) { return set_marker_internal (marker, position, buffer, 1); } /* This is called during garbage collection, so we must be careful to ignore and preserve mark bits, including those in chain fields of markers. */ void unchain_marker (Lisp_Object m) { Lisp_Marker *marker = XMARKER (m); struct buffer *b = marker->buffer; if (b == 0) return; #ifdef ERROR_CHECK_GC assert (BUFFER_LIVE_P (b)); #endif if (marker_next (marker)) marker_prev (marker_next (marker)) = marker_prev (marker); if (marker_prev (marker)) marker_next (marker_prev (marker)) = marker_next (marker); else BUF_MARKERS (b) = marker_next (marker); #ifdef ERROR_CHECK_GC assert (marker != XMARKER (b->point_marker)); #endif marker->buffer = 0; } Bytind bi_marker_position (Lisp_Object marker) { Lisp_Marker *m = XMARKER (marker); struct buffer *buf = m->buffer; Bytind pos; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); /* FSF claims that marker indices could end up denormalized, i.e. in the gap. This is way bogus if it ever happens, and means something fucked up elsewhere. Since I've overhauled all this shit, I don't think this can happen. In any case, the following macro has an assert() in it that will catch these denormalized positions. */ pos = memind_to_bytind (buf, m->memind); #ifdef ERROR_CHECK_BUFPOS if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) abort (); #endif return pos; } Bufpos marker_position (Lisp_Object marker) { struct buffer *buf = XMARKER (marker)->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); return bytind_to_bufpos (buf, bi_marker_position (marker)); } void set_bi_marker_position (Lisp_Object marker, Bytind pos) { Lisp_Marker *m = XMARKER (marker); struct buffer *buf = m->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); #ifdef ERROR_CHECK_BUFPOS if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) abort (); #endif m->memind = bytind_to_memind (buf, pos); } void set_marker_position (Lisp_Object marker, Bufpos pos) { struct buffer *buf = XMARKER (marker)->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); set_bi_marker_position (marker, bufpos_to_bytind (buf, pos)); } static Lisp_Object copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) { REGISTER Lisp_Object new; while (1) { if (INTP (marker) || MARKERP (marker)) { if (noseeum) new = noseeum_make_marker (); else new = Fmake_marker (); Fset_marker (new, marker, (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil)); XMARKER (new)->insertion_type = !NILP (type); return new; } else marker = wrong_type_argument (Qinteger_or_marker_p, marker); } RETURN_NOT_REACHED (Qnil) /* not reached */ } DEFUN ("copy-marker", Fcopy_marker, 1, 2, 0, /* Return a new marker pointing at the same place as MARKER-OR-INTEGER. If MARKER-OR-INTEGER is an integer, return a new marker pointing at that position in the current buffer. Optional argument MARKER-TYPE specifies the insertion type of the new marker; see `marker-insertion-type'. */ (marker_or_integer, marker_type)) { return copy_marker_1 (marker_or_integer, marker_type, 0); } Lisp_Object noseeum_copy_marker (Lisp_Object marker, Lisp_Object marker_type) { return copy_marker_1 (marker, marker_type, 1); } DEFUN ("marker-insertion-type", Fmarker_insertion_type, 1, 1, 0, /* Return insertion type of MARKER: t if it stays after inserted text. nil means the marker stays before text inserted there. */ (marker)) { CHECK_MARKER (marker); return XMARKER (marker)->insertion_type ? Qt : Qnil; } DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, 2, 2, 0, /* Set the insertion-type of MARKER to TYPE. If TYPE is t, it means the marker advances when you insert text at it. If TYPE is nil, it means the marker stays behind when you insert text at it. */ (marker, type)) { CHECK_MARKER (marker); XMARKER (marker)->insertion_type = ! NILP (type); return type; } /* #### What is the possible use of this? It looks quite useless to me, because there is no way to find *which* markers are positioned at POSITION. Additional bogosity bonus: (buffer-has-markers-at (point)) will always return t because of the `point-marker'. The same goes for the position of mark. Bletch! Someone should discuss this with Stallman, but I don't have the stomach. In fact, this function sucks so badly that I'm disabling it by default (although I've debugged it). If you want to use it, use extents instead. --hniksic */ #if 0 xxDEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, 1, 1, 0, /* Return t if there are markers pointing at POSITION in the current buffer. */ (position)) { Lisp_Marker *marker; Memind pos; /* A small optimization trick: convert POS to memind now, rather than converting every marker's memory index to bufpos. */ pos = bytind_to_memind (current_buffer, get_buffer_pos_byte (current_buffer, position, GB_COERCE_RANGE)); for (marker = BUF_MARKERS (current_buffer); marker; marker = marker_next (marker)) { /* We use marker->memind, so we don't have to go through the unwieldy operation of creating a Lisp_Object for marker_position() every time around. */ if (marker->memind == pos) return Qt; } return Qnil; } #endif /* 0 */ #ifdef MEMORY_USAGE_STATS int compute_buffer_marker_usage (struct buffer *b, struct overhead_stats *ovstats) { Lisp_Marker *m; int total = 0; int overhead; for (m = BUF_MARKERS (b); m; m = m->next) total += sizeof (Lisp_Marker); ovstats->was_requested += total; overhead = fixed_type_block_overhead (total); /* #### claiming this is all malloc overhead is not really right, but it has to go somewhere. */ ovstats->malloc_overhead += overhead; return total + overhead; } #endif /* MEMORY_USAGE_STATS */ void syms_of_marker (void) { INIT_LRECORD_IMPLEMENTATION (marker); DEFSUBR (Fmarker_position); DEFSUBR (Fmarker_buffer); DEFSUBR (Fset_marker); DEFSUBR (Fcopy_marker); DEFSUBR (Fmarker_insertion_type); DEFSUBR (Fset_marker_insertion_type); #if 0 /* FSFmacs crock */ DEFSUBR (Fbuffer_has_markers_at); #endif } void init_buffer_markers (struct buffer *b) { Lisp_Object buf; XSETBUFFER (buf, b); b->mark = Fmake_marker (); BUF_MARKERS (b) = 0; b->point_marker = Fmake_marker (); Fset_marker (b->point_marker, /* For indirect buffers, point is already set. */ b->base_buffer ? make_int (BUF_PT (b)) : make_int (1), buf); } void uninit_buffer_markers (struct buffer *b) { /* Unchain all markers of this buffer and leave them pointing nowhere. */ REGISTER Lisp_Marker *m, *next; for (m = BUF_MARKERS (b); m; m = next) { m->buffer = 0; next = marker_next (m); marker_next (m) = 0; marker_prev (m) = 0; } BUF_MARKERS (b) = 0; }