Mercurial > hg > xemacs-beta
comparison src/frame.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 |
comparison
equal
deleted
inserted
replaced
616:4f1c7a4ac1e6 | 617:af57a77cbc92 |
---|---|
131 #include "frameslots.h" | 131 #include "frameslots.h" |
132 | 132 |
133 if (FRAME_LIVE_P (f)) /* device is nil for a dead frame */ | 133 if (FRAME_LIVE_P (f)) /* device is nil for a dead frame */ |
134 MAYBE_FRAMEMETH (f, mark_frame, (f)); | 134 MAYBE_FRAMEMETH (f, mark_frame, (f)); |
135 | 135 |
136 #ifdef HAVE_SCROLLBARS | |
137 if (f->sb_vcache) | |
138 mark_object (wrap_scrollbar_instance (f->sb_vcache)); | |
139 if (f->sb_hcache) | |
140 mark_object (wrap_scrollbar_instance (f->sb_hcache)); | |
141 #endif | |
142 | |
143 mark_gutters (f); | |
144 | |
136 return Qnil; | 145 return Qnil; |
137 } | 146 } |
138 | 147 |
139 static void | 148 static void |
140 print_frame (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) | 149 print_frame (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) |
159 struct frame); | 168 struct frame); |
160 | 169 |
161 static void | 170 static void |
162 nuke_all_frame_slots (struct frame *f) | 171 nuke_all_frame_slots (struct frame *f) |
163 { | 172 { |
173 zero_lcrecord (f); | |
174 | |
164 #define MARKED_SLOT(x) f->x = Qnil | 175 #define MARKED_SLOT(x) f->x = Qnil |
165 #include "frameslots.h" | 176 #include "frameslots.h" |
166 } | 177 } |
167 | 178 |
168 /* Allocate a new frame object and set all its fields to reasonable | 179 /* Allocate a new frame object and set all its fields to reasonable |
175 /* This function can GC */ | 186 /* This function can GC */ |
176 Lisp_Object frame; | 187 Lisp_Object frame; |
177 Lisp_Object root_window; | 188 Lisp_Object root_window; |
178 struct frame *f = alloc_lcrecord_type (struct frame, &lrecord_frame); | 189 struct frame *f = alloc_lcrecord_type (struct frame, &lrecord_frame); |
179 | 190 |
180 zero_lcrecord (f); | |
181 nuke_all_frame_slots (f); | 191 nuke_all_frame_slots (f); |
182 XSETFRAME (frame, f); | 192 XSETFRAME (frame, f); |
183 | 193 |
184 f->device = device; | 194 f->device = device; |
185 f->framemeths = XDEVICE (device)->devmeths; | 195 f->framemeths = XDEVICE (device)->devmeths; |
1568 QUIT checker happens to get invoked, because the frame list is in | 1578 QUIT checker happens to get invoked, because the frame list is in |
1569 an inconsistent state. */ | 1579 an inconsistent state. */ |
1570 d->frame_list = delq_no_quit (frame, d->frame_list); | 1580 d->frame_list = delq_no_quit (frame, d->frame_list); |
1571 RESET_CHANGED_SET_FLAGS; | 1581 RESET_CHANGED_SET_FLAGS; |
1572 | 1582 |
1573 f->dead = 1; | |
1574 f->visible = 0; | 1583 f->visible = 0; |
1575 | 1584 |
1576 free_window_mirror (f->root_mirror); | 1585 free_window_mirror (XWINDOW_MIRROR (f->root_mirror)); |
1577 /* free_line_insertion_deletion_costs (f); */ | 1586 /* free_line_insertion_deletion_costs (f); */ |
1578 | 1587 |
1579 /* If we've deleted the last non-minibuf frame, then try to find | 1588 /* If we've deleted the last non-minibuf frame, then try to find |
1580 another one. */ | 1589 another one. */ |
1581 if (EQ (frame, CONSOLE_LAST_NONMINIBUF_FRAME (con))) | 1590 if (EQ (frame, CONSOLE_LAST_NONMINIBUF_FRAME (con))) |
1658 else | 1667 else |
1659 /* No frames left on this console--say no minibuffer either. */ | 1668 /* No frames left on this console--say no minibuffer either. */ |
1660 con->default_minibuffer_frame = Qnil; | 1669 con->default_minibuffer_frame = Qnil; |
1661 } | 1670 } |
1662 | 1671 |
1663 nuke_all_frame_slots (f); /* nobody should be accessing the device | 1672 /* Nobody should be accessing anything in this object any more, and |
1664 or anything else any more, and making | 1673 making all Lisp_Objects Qnil allows for better GC'ing in case a |
1665 them Qnil allows for better GC'ing | 1674 pointer to the dead frame continues to hang around. Zero all |
1666 in case a pointer to the dead frame | 1675 other structs in case someone tries to access something through |
1667 continues to hang around. */ | 1676 them. */ |
1677 | |
1678 nuke_all_frame_slots (f); | |
1668 f->framemeths = dead_console_methods; | 1679 f->framemeths = dead_console_methods; |
1680 | |
1669 UNGCPRO; | 1681 UNGCPRO; |
1670 } | 1682 } |
1671 | 1683 |
1672 void | 1684 void |
1673 io_error_delete_frame (Lisp_Object frame) | 1685 io_error_delete_frame (Lisp_Object frame) |