comparison src/scrollbar.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
76 76
77 static void update_scrollbar_instance (struct window *w, int vertical, 77 static void update_scrollbar_instance (struct window *w, int vertical,
78 struct scrollbar_instance *instance); 78 struct scrollbar_instance *instance);
79 79
80 80
81 static Lisp_Object
82 mark_scrollbar_instance (Lisp_Object obj)
83 {
84 struct scrollbar_instance *data = XSCROLLBAR_INSTANCE (obj);
85 mark_object (wrap_window_mirror (data->mirror));
86 if (data->next)
87 return wrap_scrollbar_instance (data->next);
88 else
89 return Qnil;
90 }
91
92 DEFINE_LRECORD_IMPLEMENTATION ("scrollbar-instance", scrollbar_instance,
93 mark_scrollbar_instance,
94 internal_object_printer, 0, 0, 0, 0,
95 struct scrollbar_instance);
96
81 static void 97 static void
82 free_scrollbar_instance (struct scrollbar_instance *instance, 98 free_scrollbar_instance (struct scrollbar_instance *instance,
83 struct frame *frame) 99 struct frame *frame)
84 { 100 {
85 if (!instance) 101 if (!instance)
87 else 103 else
88 { 104 {
89 struct device *d = XDEVICE (frame->device); 105 struct device *d = XDEVICE (frame->device);
90 106
91 MAYBE_DEVMETH (d, free_scrollbar_instance, (instance)); 107 MAYBE_DEVMETH (d, free_scrollbar_instance, (instance));
92 xfree (instance); 108 /* not worth calling free_managed_lcrecord() -- scrollbar instances
109 are not created that frequently and it's dangerous. */
93 } 110 }
94 } 111 }
95 112
96 static void 113 static void
97 free_window_mirror_scrollbars (struct window_mirror *mir) 114 free_window_mirror_scrollbars (struct window_mirror *mir)
146 return; 163 return;
147 164
148 if (f->mirror_dirty) 165 if (f->mirror_dirty)
149 update_frame_window_mirror (f); 166 update_frame_window_mirror (f);
150 167
151 free_scrollbars_loop (f->root_window, f->root_mirror); 168 free_scrollbars_loop (f->root_window, XWINDOW_MIRROR (f->root_mirror));
152 169
153 while (FRAME_SB_VCACHE (f)) 170 while (FRAME_SB_VCACHE (f))
154 { 171 {
155 struct scrollbar_instance *tofree = FRAME_SB_VCACHE (f); 172 struct scrollbar_instance *tofree = FRAME_SB_VCACHE (f);
156 FRAME_SB_VCACHE (f) = FRAME_SB_VCACHE (f)->next; 173 FRAME_SB_VCACHE (f) = FRAME_SB_VCACHE (f)->next;
171 static struct scrollbar_instance * 188 static struct scrollbar_instance *
172 create_scrollbar_instance (struct frame *f, int vertical) 189 create_scrollbar_instance (struct frame *f, int vertical)
173 { 190 {
174 struct device *d = XDEVICE (f->device); 191 struct device *d = XDEVICE (f->device);
175 struct scrollbar_instance *instance = 192 struct scrollbar_instance *instance =
176 xnew_and_zero (struct scrollbar_instance); 193 alloc_lcrecord_type (struct scrollbar_instance,
177 194 &lrecord_scrollbar_instance);
195
196 zero_lcrecord (instance);
178 MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance)); 197 MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance));
179 198
180 return instance; 199 return instance;
181 } 200 }
182 201
892 /************************************************************************/ 911 /************************************************************************/
893 912
894 void 913 void
895 syms_of_scrollbar (void) 914 syms_of_scrollbar (void)
896 { 915 {
916 INIT_LRECORD_IMPLEMENTATION (scrollbar_instance);
917
897 DEFSYMBOL (Qscrollbar_line_up); 918 DEFSYMBOL (Qscrollbar_line_up);
898 DEFSYMBOL (Qscrollbar_line_down); 919 DEFSYMBOL (Qscrollbar_line_down);
899 DEFSYMBOL (Qscrollbar_page_up); 920 DEFSYMBOL (Qscrollbar_page_up);
900 DEFSYMBOL (Qscrollbar_page_down); 921 DEFSYMBOL (Qscrollbar_page_down);
901 DEFSYMBOL (Qscrollbar_to_top); 922 DEFSYMBOL (Qscrollbar_to_top);