diff src/redisplay.c @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 6504113e7c2d
line wrap: on
line diff
--- a/src/redisplay.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/redisplay.c	Sun Mar 31 08:30:17 2002 +0000
@@ -264,6 +264,8 @@
 				     Charbpos point, int no_regen);
 static int point_visible (struct window *w, Charbpos point, int type);
 
+static void sledgehammer_check_redisplay_structs (void);
+
 /* This used to be 10 but 30 seems to give much better performance. */
 #define INIT_MAX_PREEMPTS	30
 static int max_preempts;
@@ -4226,10 +4228,7 @@
       if (Dynarr_length (dla) == 0)
 	{
 	  if (Dynarr_largest (dla) > 0)
-	    {
-	      struct display_line *mlp = Dynarr_atp (dla, 0);
-	      Dynarr_add (dla, *mlp);
-	    }
+	    Dynarr_increment (dla);
 	  else
 	    {
 	      struct display_line modeline;
@@ -6627,6 +6626,9 @@
 
  done:
   unbind_to (count);
+#ifdef ERROR_CHECK_DISPLAY
+  sledgehammer_check_redisplay_structs ();
+#endif /* ERROR_CHECK_DISPLAY */
 }
 
 void
@@ -9136,6 +9138,35 @@
 
 #endif /* MEMORY_USAGE_STATS */
 
+static int
+sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
+{
+  int i, j;
+  display_line_dynarr *dl;
+
+  dl = window_display_lines (w, CURRENT_DISP);
+  
+  for (i = 0; i < Dynarr_largest (dl); i++)
+    for (j = i + 1; j < Dynarr_largest (dl); j++)
+      assert (Dynarr_atp (dl, i)->display_blocks !=
+	      Dynarr_atp (dl, j)->display_blocks);
+
+  dl = window_display_lines (w, DESIRED_DISP);
+
+  for (i = 0; i < Dynarr_largest (dl); i++)
+    for (j = i + 1; j < Dynarr_largest (dl); j++)
+      assert (Dynarr_atp (dl, i)->display_blocks !=
+	      Dynarr_atp (dl, j)->display_blocks);
+
+  return 0;
+}
+
+static void
+sledgehammer_check_redisplay_structs (void)
+{
+  map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
+}
+
 
 /***************************************************************************/
 /*									   */