Mercurial > hg > xemacs-beta

diff src/redisplay-output.c @ 851:e7ee5f8bde58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-05-23 11:46:08 by ben] fix for raymond toy's crash, alloca crashes, some recover-session improvements files.el: Recover-session improvements: Only show session files where some files can actually be recovered, and show in chronological order. subr.el, menubar-items.el: As promised to rms, the functionality in truncate-string-with-continuation-dots has been merged into truncate-string-to-width. Change callers in menubar-items.el. select.el: Document some of these funs better. Fix problem where we were doing own-clipboard twice. Makefile.in.in: Add alloca.o. Ensure that alloca.s doesn't compile into alloca.o, but allocax.o (not that it's currently used or anything.) EmacsFrame.c, abbrev.c, alloc.c, alloca.c, callint.c, callproc.c, config.h.in, device-msw.c, device-x.c, dired.c, doc.c, editfns.c, emacs.c, emodules.c, eval.c, event-Xt.c, event-msw.c, event-stream.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-x.c, input-method-xlib.c, intl-win32.c, lisp.h, lread.c, menubar-gtk.c, menubar-msw.c, menubar.c, mule-wnnfns.c, nt.c, objects-msw.c, process-nt.c, realpath.c, redisplay-gtk.c, redisplay-output.c, redisplay-x.c, redisplay.c, search.c, select-msw.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: Fix Raymond Toy's crash. Repeat to self: 2^21 - 1 is NOT the same as (2 << 21) - 1. Fix crashes due to excessive alloca(). replace alloca() with ALLOCA(), which calls the C alloca() [which uses xmalloc()] when the size is too big. Insert in various places calls to try to flush the C alloca() stored info if there is any. Add MALLOC_OR_ALLOCA(), for places that expect to be alloca()ing large blocks. This xmalloc()s when too large and records an unwind-protect to free -- relying on the caller to unbind_to() elsewhere in the function. Use it in concat(). Use MALLOC instead of ALLOCA in select-msw.c. xemacs.mak: Add alloca.o.
author ben
date Thu, 23 May 2002 11:46:46 +0000
parents 6728e641994e
children 42375619fa45
line wrap: on
line diff
--- a/src/redisplay-output.c	Tue May 21 23:47:40 2002 +0000
+++ b/src/redisplay-output.c	Thu May 23 11:46:46 2002 +0000
@@ -305,6 +305,86 @@
     return 1;
 }
 
+#if 0
+void
+compare_runes_2 (struct window *w, struct rune *crb, struct rune *drb)
+{
+  if (crb->type == DGLYPH)
+    {
+      if (!EQ (crb->object.dglyph.glyph, drb->object.dglyph.glyph) ||
+	  !EQ (crb->object.dglyph.extent, drb->object.dglyph.extent) ||
+	  crb->object.dglyph.xoffset != drb->object.dglyph.xoffset ||
+	  crb->object.dglyph.yoffset != drb->object.dglyph.yoffset ||
+	  crb->object.dglyph.ascent != drb->object.dglyph.ascent ||
+	  crb->object.dglyph.descent != drb->object.dglyph.descent)
+	return 0;
+      /* Only check dirtiness if we know something has changed. */
+      else if (XGLYPH_DIRTYP (crb->object.dglyph.glyph) ||
+	       crb->findex != drb->findex)
+	{
+	  /* We need some way of telling redisplay_output_layout () that the
+	     only reason we are outputting it is because something has
+	     changed internally. That way we can optimize whether we need
+	     to clear the layout first and also only output the components
+	     that have changed. The image_instance dirty flag and
+	     display_hash are no good to us because these will invariably
+	     have been set anyway if the layout has changed. So it looks
+	     like we need yet another change flag that we can set here and
+	     then clear in redisplay_output_layout (). */
+	  Lisp_Object window, image;
+	  Lisp_Image_Instance* ii;
+	  window = wrap_window (w);
+	  image = glyph_image_instance (crb->object.dglyph.glyph,
+					window, crb->object.dglyph.matchspec,
+					ERROR_ME_DEBUG_WARN, 1);
+	  
+	  if (!IMAGE_INSTANCEP (image))
+	    return 0;
+	  ii = XIMAGE_INSTANCE (image);
+	  
+	  if (TEXT_IMAGE_INSTANCEP (image) &&
+	      (crb->findex != drb->findex ||
+	       WINDOW_FACE_CACHEL_DIRTY (w, drb->findex)))
+	    return 0;
+	  
+	  /* It is quite common for the two glyphs to be EQ since in many
+	     cases they will actually be the same object. This does not
+	     mean, however, that nothing has changed. We therefore need to
+	     check the current hash of the glyph against the last recorded
+	     display hash and the pending display items. See
+	     update_widget () ^^#### which function?. */
+	  if (image_instance_changed (image) ||
+	      crb->findex != drb->findex ||
+	      WINDOW_FACE_CACHEL_DIRTY (w, drb->findex))
+	    {
+	      /* Now we are going to re-output the glyph, but since
+		 this is for some internal reason not related to geometry
+		 changes, send a hint to the output routines that they can
+		 take some short cuts. This is most useful for
+		 layouts. This flag should get reset by the output
+		 routines.
+		 
+		 #### It is possible for us to get here when the
+		 face_cachel is dirty. I do not know what the implications
+		 of this are.*/
+	      IMAGE_INSTANCE_OPTIMIZE_OUTPUT (ii) = 1;
+	      return 0;
+	    }
+	  else
+	    return 1;
+	}
+      else if (crb->findex != drb->findex ||
+	       WINDOW_FACE_CACHEL_DIRTY (w, drb->findex))
+	return 0;
+      else
+	return 1;
+    }
+  else return !(memcmp (crb, drb, sizeof (*crb)) ||
+		WINDOW_FACE_CACHEL_DIRTY (w, drb->findex));
+}
+#endif
+
+
 /*****************************************************************************
  get_next_display_block