[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.

--- a/src/window.h	Mon Jun 11 07:47:20 2001 +0000
+++ b/src/window.h	Mon Jun 18 07:10:32 2001 +0000
@@ -89,21 +89,6 @@
 {
   struct lcrecord_header header;
 
-  /* The frame this window is on.  */
-  Lisp_Object frame;
-  /* t if this window is a minibuffer window.  */
-  Lisp_Object mini_p;
-  /* Following child (to right or down) at same level of tree */
-  Lisp_Object next;
-  /* Preceding child (to left or up) at same level of tree */
-  Lisp_Object prev;
-  /* First child of this window. */
-  /* vchild is used if this is a vertical combination,
-     hchild if this is a horizontal combination. */
-  Lisp_Object hchild, vchild;
-  /* The window this one is a child of. */
-  Lisp_Object parent;
-
   /* The upper left corner coordinates of this window,
      as integers (pixels) relative to upper left corner of frame = 0, 0 */
   int pixel_left;
@@ -112,20 +97,6 @@
   int pixel_height;
   int pixel_width;
 
-  /* The buffer displayed in this window */
-  /* Of the fields vchild, hchild and buffer, only one is non-nil.  */
-  Lisp_Object buffer;
-  /* A marker pointing to where in the text to start displaying */
-  /* need one for each set of display structures */
-  Lisp_Object start[3];
-  /* A marker pointing to where in the text point is in this window,
-     used only when the window is not selected.
-     This exists so that when multiple windows show one buffer
-     each one can have its own value of point.  */
-  /* need one for each set of display structures */
-  Lisp_Object pointm[3];
-  /* A marker pointing to where in the text the scrollbar is pointing */
-  Lisp_Object sb_point;
   /* Number of columns display within the window is scrolled to the left. */
   int hscroll;
   /* Idem for the window's modeline */
@@ -138,33 +109,14 @@
      scrolling. Hscroll will remain constant but this will be
      incremented to incrementally shift lines left.*/
   int left_xoffset;
-  /* Number saying how recently window was selected */
-  Lisp_Object use_time;
-  /* text.modified of displayed buffer as of last time display completed */
-  Lisp_Object last_modified[3];
-  /* Value of point at that time */
-  Lisp_Object last_point[3];
-  /* Value of start at that time */
-  Lisp_Object last_start[3];
-  /* buf.face_change as of last time display completed */
-  Lisp_Object last_facechange[3];
 
   /* face cache elements correct for this window and its current buffer */
   face_cachel_dynarr *face_cachels;
   /* glyph cache elements correct for this window and its current buffer */
   glyph_cachel_dynarr *glyph_cachels;
-  /* we cannot have a per-device cache of widgets / subwindows because
-     each visible instance needs to be a separate instance. The lowest
-     level of granularity we can get easily is the window that the
-     subwindow is in. This will fail if we attach the same subwindow
-     twice to a buffer. However, we are quite unlikely to do this,
-     especially with buttons which will need individual callbacks. The
-     proper solution is probably not worth the effort. */
-  Lisp_Object subwindow_instance_cache;
   /* List of starting positions for display lines.  Only valid if
      buffer has not changed. */
   line_start_cache_dynarr *line_start_cache;
-  Lisp_Object line_cache_last_updated;
   int line_cache_validation_override;
 
   /* Length of longest line currently displayed.  Used to control the
@@ -180,10 +132,6 @@
   /* need one for each set of display structures */
   int window_end_pos[3];
 
-  /* If redisplay in this window goes beyond this buffer position,
-     must run the redisplay-end-trigger-functions.  */
-  Lisp_Object redisplay_end_trigger;
-
   /* Set by the extent code when extents in the gutter are changed. */
   int gutter_extent_modiff[4];
 
@@ -192,7 +140,7 @@
   Bufpos last_redisplay_pos;
 
 #define WINDOW_SLOT_DECLARATION
-#define WINDOW_SLOT(slot, compare) Lisp_Object slot
+#define WINDOW_SLOT(slot) Lisp_Object slot;
 #include "winslots.h"
 
   /* one-bit flags: */
@@ -217,12 +165,22 @@
   unsigned int need_vertical_divider_valid_p :1;
 };
 
+DECLARE_LRECORD (window, struct window);
+#define XWINDOW(x) XRECORD (x, window, struct window)
+#define XSETWINDOW(x, p) XSETRECORD (x, p, window)
+#define wrap_window(p) wrap_record (p, window)
+#define WINDOWP(x) RECORDP (x, window)
+#define CHECK_WINDOW(x) CHECK_RECORD (x, window)
+#define CONCHECK_WINDOW(x) CONCHECK_RECORD (x, window)
+
 #define CURRENT_DISP	0
 #define DESIRED_DISP	1
 #define CMOTION_DISP	2
 
 struct window_mirror
 {
+  struct lcrecord_header header;
+
   /* Frame this mirror is on. */
   struct frame *frame;
 
@@ -259,14 +217,13 @@
   unsigned int truncate_win :1;
 };
 
-#ifdef emacs  /* some things other than emacs want the structs */
-
-DECLARE_LRECORD (window, struct window);
-#define XWINDOW(x) XRECORD (x, window, struct window)
-#define XSETWINDOW(x, p) XSETRECORD (x, p, window)
-#define WINDOWP(x) RECORDP (x, window)
-#define CHECK_WINDOW(x) CHECK_RECORD (x, window)
-#define CONCHECK_WINDOW(x) CONCHECK_RECORD (x, window)
+DECLARE_LRECORD (window_mirror, struct window_mirror);
+#define XWINDOW_MIRROR(x) XRECORD (x, window_mirror, struct window_mirror)
+#define XSETWINDOW_MIRROR(x, p) XSETRECORD (x, p, window_mirror)
+#define wrap_window_mirror(p) wrap_record (p, window_mirror)
+#define WINDOW_MIRRORP(x) RECORDP (x, window_mirror)
+#define CHECK_WINDOW_MIRROR(x) CHECK_RECORD (x, window_mirror)
+#define CONCHECK_WINDOW_MIRROR(x) CONCHECK_RECORD (x, window_mirror)
 
 #define WINDOW_LIVE_P(x) (!(x)->dead)
 #define CHECK_LIVE_WINDOW(x) do {			\
@@ -375,7 +332,6 @@
 struct window *decode_window (Lisp_Object window);
 struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win);
 
-/* new functions to handle the window mirror */
 void free_window_mirror (struct window_mirror *mir);
 Lisp_Object real_window (struct window_mirror *mir, int no_abort);
 struct window_mirror *find_window_mirror (struct window *w);
@@ -439,6 +395,4 @@
   ? 10								\
   : MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win))
 
-#endif /* emacs */
-
 #endif /* INCLUDED_window_h_ */