comparison src/redisplay.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 98528da0b7fc
children fdefd0186b75
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
250 { 250 {
251 Dynarr_declare (glyph_block); 251 Dynarr_declare (glyph_block);
252 } glyph_block_dynarr; 252 } glyph_block_dynarr;
253 253
254 /*************************************************************************/ 254 /*************************************************************************/
255 /* display lines */ 255 /* display lines */
256 /*************************************************************************/ 256 /*************************************************************************/
257 257
258 /* Modeline commentary: IMO the modeline is handled very badly, we 258 /* Modeline commentary: IMO the modeline is handled very badly, we
259 special case virtually *everything* in the redisplay routines for 259 special case virtually *everything* in the redisplay routines for
260 the modeline. The fact that dl->bufpos can be either a buffer 260 the modeline. The fact that dl->bufpos can be either a buffer
721 struct window **w, Bufpos *bufpos, 721 struct window **w, Bufpos *bufpos,
722 Bufpos *closest, Charcount *modeline_closest, 722 Bufpos *closest, Charcount *modeline_closest,
723 Lisp_Object *obj1, Lisp_Object *obj2); 723 Lisp_Object *obj1, Lisp_Object *obj2);
724 void glyph_to_pixel_translation (struct window *w, int char_x, 724 void glyph_to_pixel_translation (struct window *w, int char_x,
725 int char_y, int *pix_x, int *pix_y); 725 int char_y, int *pix_x, int *pix_y);
726 void mark_redisplay (void);
727 int point_in_line_start_cache (struct window *w, Bufpos point, 726 int point_in_line_start_cache (struct window *w, Bufpos point,
728 int min_past); 727 int min_past);
729 int point_would_be_visible (struct window *w, Bufpos startp, 728 int point_would_be_visible (struct window *w, Bufpos startp,
730 Bufpos point); 729 Bufpos point);
731 Bufpos start_of_last_line (struct window *w, Bufpos startp); 730 Bufpos start_of_last_line (struct window *w, Bufpos startp);
751 int get_next_display_block (layout_bounds bounds, 750 int get_next_display_block (layout_bounds bounds,
752 display_block_dynarr *dba, int start_pos, 751 display_block_dynarr *dba, int start_pos,
753 int *next_start); 752 int *next_start);
754 void redisplay_output_layout (Lisp_Object domain, 753 void redisplay_output_layout (Lisp_Object domain,
755 Lisp_Object image_instance, 754 Lisp_Object image_instance,
756 struct display_box* db, struct display_glyph_area* dga, 755 struct display_box* db,
757 face_index findex, int cursor_start, int cursor_width, 756 struct display_glyph_area* dga,
757 face_index findex, int cursor_start,
758 int cursor_width,
758 int cursor_height); 759 int cursor_height);
759 void redisplay_output_subwindow (struct window *w, 760 void redisplay_output_subwindow (struct window *w,
760 Lisp_Object image_instance, 761 Lisp_Object image_instance,
761 struct display_box* db, struct display_glyph_area* dga, 762 struct display_box* db,
762 face_index findex, int cursor_start, int cursor_width, 763 struct display_glyph_area* dga,
764 face_index findex, int cursor_start,
765 int cursor_width,
763 int cursor_height); 766 int cursor_height);
764 void redisplay_unmap_subwindows_maybe (struct frame* f, int x, int y, int width, int height); 767 void redisplay_unmap_subwindows_maybe (struct frame* f, int x, int y,
768 int width, int height);
765 void redisplay_output_pixmap (struct window *w, 769 void redisplay_output_pixmap (struct window *w,
766 Lisp_Object image_instance, 770 Lisp_Object image_instance,
767 struct display_box* db, struct display_glyph_area* dga, 771 struct display_box* db,
768 face_index findex, int cursor_start, int cursor_width, 772 struct display_glyph_area* dga,
773 face_index findex, int cursor_start,
774 int cursor_width,
769 int cursor_height, int offset_bitmap); 775 int cursor_height, int offset_bitmap);
770 int redisplay_calculate_display_boxes (struct display_line *dl, int xpos, 776 int redisplay_calculate_display_boxes (struct display_line *dl, int xpos,
771 int xoffset, int start_pixpos, int width, 777 int xoffset, int start_pixpos,
778 int width,
772 struct display_box* dest, 779 struct display_box* dest,
773 struct display_glyph_area* src); 780 struct display_glyph_area* src);
774 int redisplay_normalize_glyph_area (struct display_box* dest, 781 int redisplay_normalize_glyph_area (struct display_box* dest,
775 struct display_glyph_area* glyphsrc); 782 struct display_glyph_area* glyphsrc);
776 void redisplay_clear_to_window_end (struct window *w, int ypos1, int ypos2); 783 void redisplay_clear_to_window_end (struct window *w, int ypos1, int ypos2);