Mercurial > hg > xemacs-beta
comparison src/device.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 | 190b164ddcac |
children | 943eaba38521 |
comparison
equal
deleted
inserted
replaced
616:4f1c7a4ac1e6 | 617:af57a77cbc92 |
---|---|
81 static Lisp_Object | 81 static Lisp_Object |
82 mark_device (Lisp_Object obj) | 82 mark_device (Lisp_Object obj) |
83 { | 83 { |
84 struct device *d = XDEVICE (obj); | 84 struct device *d = XDEVICE (obj); |
85 | 85 |
86 mark_object (d->name); | 86 #define MARKED_SLOT(x) mark_object (d->x) |
87 mark_object (d->connection); | 87 #include "devslots.h" |
88 mark_object (d->canon_connection); | |
89 mark_object (d->console); | |
90 mark_object (d->selected_frame); | |
91 mark_object (d->frame_with_focus_real); | |
92 mark_object (d->frame_with_focus_for_hooks); | |
93 mark_object (d->frame_that_ought_to_have_focus); | |
94 mark_object (d->device_class); | |
95 mark_object (d->user_defined_tags); | |
96 mark_object (d->pixel_to_glyph_cache.obj1); | |
97 mark_object (d->pixel_to_glyph_cache.obj2); | |
98 | |
99 mark_object (d->color_instance_cache); | |
100 mark_object (d->font_instance_cache); | |
101 #ifdef MULE | |
102 mark_object (d->charset_font_cache); | |
103 #endif | |
104 mark_object (d->image_instance_cache); | |
105 | 88 |
106 if (d->devmeths) | 89 if (d->devmeths) |
107 { | 90 { |
108 mark_object (d->devmeths->symbol); | 91 mark_object (d->devmeths->symbol); |
109 MAYBE_DEVMETH (d, mark_device, (d)); | 92 MAYBE_DEVMETH (d, mark_device, (d)); |
159 ()) | 142 ()) |
160 { | 143 { |
161 return Fcopy_sequence (Vdevice_class_list); | 144 return Fcopy_sequence (Vdevice_class_list); |
162 } | 145 } |
163 | 146 |
147 static void | |
148 nuke_all_device_slots (struct device *d, Lisp_Object zap) | |
149 { | |
150 zero_lcrecord (d); | |
151 | |
152 #define MARKED_SLOT(x) d->x = zap | |
153 #include "devslots.h" | |
154 } | |
155 | |
164 static struct device * | 156 static struct device * |
165 allocate_device (Lisp_Object console) | 157 allocate_device (Lisp_Object console) |
166 { | 158 { |
167 Lisp_Object device; | 159 Lisp_Object device; |
168 struct device *d = alloc_lcrecord_type (struct device, &lrecord_device); | 160 struct device *d = alloc_lcrecord_type (struct device, &lrecord_device); |
169 struct gcpro gcpro1; | 161 struct gcpro gcpro1; |
170 | 162 |
171 zero_lcrecord (d); | |
172 | |
173 XSETDEVICE (device, d); | 163 XSETDEVICE (device, d); |
174 GCPRO1 (device); | 164 GCPRO1 (device); |
175 | 165 |
176 d->name = Qnil; | 166 nuke_all_device_slots (d, Qnil); |
167 | |
177 d->console = console; | 168 d->console = console; |
178 d->connection = Qnil; | |
179 d->canon_connection = Qnil; | |
180 d->frame_list = Qnil; | |
181 d->selected_frame = Qnil; | |
182 d->frame_with_focus_real = Qnil; | |
183 d->frame_with_focus_for_hooks = Qnil; | |
184 d->frame_that_ought_to_have_focus = Qnil; | |
185 d->device_class = Qnil; | |
186 d->user_defined_tags = Qnil; | |
187 d->pixel_to_glyph_cache.obj1 = Qnil; | |
188 d->pixel_to_glyph_cache.obj2 = Qnil; | |
189 | |
190 d->infd = d->outfd = -1; | 169 d->infd = d->outfd = -1; |
191 | 170 |
192 /* #### is 20 reasonable? */ | 171 /* #### is 20 reasonable? */ |
193 d->color_instance_cache = | 172 d->color_instance_cache = |
194 make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQUAL); | 173 make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQUAL); |
300 { | 279 { |
301 XSETDEVICE (device, decode_device (device)); | 280 XSETDEVICE (device, decode_device (device)); |
302 CHECK_LIVE_FRAME (frame); | 281 CHECK_LIVE_FRAME (frame); |
303 | 282 |
304 if (! EQ (device, FRAME_DEVICE (XFRAME (frame)))) | 283 if (! EQ (device, FRAME_DEVICE (XFRAME (frame)))) |
305 invalid_argument ("In `set-device-selected-frame', FRAME is not on DEVICE", Qunbound); | 284 invalid_argument ("In `set-device-selected-frame', FRAME is not on DEVICE", |
285 Qunbound); | |
306 | 286 |
307 if (EQ (device, Fselected_device (Qnil))) | 287 if (EQ (device, Fselected_device (Qnil))) |
308 return Fselect_frame (frame); | 288 return Fselect_frame (frame); |
309 | 289 |
310 set_device_selected_frame (XDEVICE (device), frame); | 290 set_device_selected_frame (XDEVICE (device), frame); |
821 Vdefault_device = find_other_device (device, 0); | 801 Vdefault_device = find_other_device (device, 0); |
822 | 802 |
823 MAYBE_DEVMETH (d, delete_device, (d)); | 803 MAYBE_DEVMETH (d, delete_device, (d)); |
824 | 804 |
825 CONSOLE_DEVICE_LIST (c) = delq_no_quit (device, CONSOLE_DEVICE_LIST (c)); | 805 CONSOLE_DEVICE_LIST (c) = delq_no_quit (device, CONSOLE_DEVICE_LIST (c)); |
806 | |
826 RESET_CHANGED_SET_FLAGS; | 807 RESET_CHANGED_SET_FLAGS; |
808 | |
809 /* Nobody should be accessing anything in this object any more, and | |
810 making all Lisp_Objects Qnil allows for better GC'ing in case a | |
811 pointer to the dead device continues to hang around. Zero all | |
812 other structs in case someone tries to access something through | |
813 them. */ | |
814 nuke_all_device_slots (d, Qnil); | |
827 d->devmeths = dead_console_methods; | 815 d->devmeths = dead_console_methods; |
816 | |
828 UNGCPRO; | 817 UNGCPRO; |
829 } | 818 } |
830 | 819 |
831 /* delete a device as a result of an I/O error. Called from | 820 /* delete a device as a result of an I/O error. Called from |
832 an enqueued magic-eval event. */ | 821 an enqueued magic-eval event. */ |
1360 | 1349 |
1361 Vdevice_class_list = list3 (Qcolor, Qgrayscale, Qmono); | 1350 Vdevice_class_list = list3 (Qcolor, Qgrayscale, Qmono); |
1362 staticpro (&Vdevice_class_list); | 1351 staticpro (&Vdevice_class_list); |
1363 | 1352 |
1364 /* Death to devices.el !!! */ | 1353 /* Death to devices.el !!! */ |
1365 Fprovide(intern("devices")); | 1354 Fprovide (intern ("devices")); |
1366 } | 1355 } |