xemacs-beta: src/glyphs.c comparison

comparison src/glyphs.c @ 400:a86b2b5e0111 r21-2-30

Import from CVS: tag r21-2-30

author	cvs
date	Mon, 13 Aug 2007 11:14:34 +0200
parents	74fd4e045ea6
children	2f8bb876ab1d

comparison

equal deleted inserted replaced

-:376370fb5946
+:a86b2b5e0111
 				Lisp_Object instantiator,
 				Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 				int dest_mask, Lisp_Object glyph)
 {
 Lisp_Object ii = allocate_image_instance (device, glyph);
+Lisp_Image_Instance* p = XIMAGE_INSTANCE (ii);
 struct image_instantiator_methods *meths;
 struct gcpro gcpro1;
 int  methp = 0;
 GCPRO1 (ii);
 ("Don't know how to instantiate this image instantiator?",
 instantiator);
 MAYBE_IIFORMAT_METH (meths, instantiate, (ii, instantiator, pointer_fg,
 					    pointer_bg, dest_mask, domain));
 UNGCPRO;
+/* Some code may have already laid out the widget, if not then do it
+here. */
+if (IMAGE_INSTANCE_LAYOUT_CHANGED (p))
+image_instance_layout (ii, IMAGE_UNSPECIFIED_GEOMETRY,
+			   IMAGE_UNSPECIFIED_GEOMETRY, domain);
+/* We *must* have a clean image at this point. */
+IMAGE_INSTANCE_TEXT_CHANGED (p) = 0;
+IMAGE_INSTANCE_SIZE_CHANGED (p) = 0;
+IMAGE_INSTANCE_LAYOUT_CHANGED (p) = 0;
+IMAGE_INSTANCE_DIRTYP (p) = 0;
 return ii;
 }
 lp->width = 0;
 lp->height = 0;
 lp->parent = glyph;
 /* So that layouts get done. */
 lp->layout_changed = 1;
-lp->dirty = 1;
 XSETIMAGE_INSTANCE (val, lp);
 MARK_GLYPHS_CHANGED;
 return val;
 parent. */
 Lisp_Object image_instance_parent_glyph (Lisp_Image_Instance* ii)
 {
 if (IMAGE_INSTANCEP (IMAGE_INSTANCE_PARENT (ii)))
 {
 return image_instance_parent_glyph
 	(XIMAGE_INSTANCE (IMAGE_INSTANCE_PARENT (ii)));
 }
 return IMAGE_INSTANCE_PARENT (ii);
 }
 }
 static Lisp_Object
 image_instantiate_cache_result (Lisp_Object locative)
 {
-/* locative = (instance instantiator . subtable) */
+/* locative = (instance instantiator . subtable)
+So we are using the instantiator as the key and the instance as
+the value. Since the hashtable is key-weak this means that the
+image instance will stay around as long as the instantiator stays
+around. The instantiator is stored in the `image' slot of the
+glyph, so as long as the glyph is marked the instantiator will be
+as well and hence the cached image instance also.*/
 Fputhash (XCAR (XCDR (locative)), XCAR (locative), XCDR (XCDR (locative)));
 free_cons (XCONS (XCDR (locative)));
 free_cons (XCONS (locative));
 return Qnil;
 }
 /*****************************************************************************
 *                     glyph cachel functions                         	     *
 *****************************************************************************/
 /* #### All of this is 95% copied from face cachels.  Consider
 consolidating.
 Why do we need glyph_cachels? Simply because a glyph_cachel captures
 per-window information about a particular glyph. A glyph itself is
 not created in any particular context, so if we were to rely on a
 glyph to tell us about its dirtiness we would not be able to reset
 the dirty flag after redisplaying it as it may exist in other
 /*****************************************************************************
 *                              subwindow functions                          *
 *****************************************************************************/
-/* update the displayed characteristics of a subwindow */
+/* Update the displayed characteristics of a subwindow. This function
+should generally only get called if the subwindow is actually
+dirty. The only other time it gets called is if subwindow state
+changed, when we can't actually tell whether its going to be dirty
+or not.
+#### I suspect what we should really do is re-evaluate all the
+gui slots that could affect this and then mark the instance as
+dirty. Right now, updating everything is safe but expensive. */
 void
 update_subwindow (Lisp_Object subwindow)
 {
 Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
+int count = specpdl_depth ();
+/* The update method is allowed to call eval.  Since it is quite
+common for this function to get called from somewhere in
+redisplay we need to make sure that quits are ignored.  Otherwise
+Fsignal will abort. */
+specbind (Qinhibit_quit, Qt);
 if (IMAGE_INSTANCE_TYPE (ii) == IMAGE_WIDGET
 ||
 IMAGE_INSTANCE_TYPE (ii) == IMAGE_LAYOUT)
 {
 if (IMAGE_INSTANCE_TYPE (ii) == IMAGE_WIDGET)
-	  update_widget (subwindow);
+	update_widget (subwindow);
 /* Reset the changed flags. */
 IMAGE_INSTANCE_WIDGET_FACE_CHANGED (ii) = 0;
 IMAGE_INSTANCE_WIDGET_PERCENT_CHANGED (ii) = 0;
 IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (ii) = 0;
 IMAGE_INSTANCE_TEXT_CHANGED (ii) = 0;
 {
 MAYBE_DEVMETH (XDEVICE (ii->device), update_subwindow, (ii));
 }
 IMAGE_INSTANCE_SIZE_CHANGED (ii) = 0;
+unbind_to (count, Qnil);
 }
 /* Update all the subwindows on a frame. */
 void
 update_frame_subwindows (struct frame *f)
 for (elt = 0; elt < Dynarr_length (f->subwindow_cachels); elt++)
 {
 	struct subwindow_cachel *cachel =
 	  Dynarr_atp (f->subwindow_cachels, elt);
-	if (cachel->being_displayed)
+	if (cachel->being_displayed
+	    &&
+	    /* We only want to update if something has really
+changed. */
+	    (f->subwindows_state_changed
+	     ||
+	     XIMAGE_INSTANCE_DIRTYP (cachel->subwindow)))
 	  {
 	    update_subwindow (cachel->subwindow);
 	  }
 }
 }
 cachel->x = x;
 cachel->y = y;
 cachel->width = dga->width;
 cachel->height = dga->height;
 cachel->being_displayed = 1;
-#if 0
-/* This forces any pending display changes to happen to the image
-before we show it. I'm not sure whether or not we need mark as
-clean here, but for now we will. */
-if (IMAGE_INSTANCE_DIRTYP (ii))
-{
-update_subwindow (subwindow);
-IMAGE_INSTANCE_DIRTYP (ii) = 0;
-}
-#endif
 MAYBE_DEVMETH (XDEVICE (ii->device), map_subwindow, (ii, x, y, dga));
 }
 static int
 		% IMAGE_INSTANCE_PIXMAP_MAXSLICE (ii);
 	      /* We might need to kick redisplay at this point - but we
 		 also might not. */
 	      MARK_DEVICE_FRAMES_GLYPHS_CHANGED
 		(XDEVICE (IMAGE_INSTANCE_DEVICE (ii)));
 	      /* Cascade dirtiness so that we can have an animated glyph in a layout
 		 for instance. */
 	      set_image_instance_dirty_p (value, 1);
 	    }
 	}
 }
 *****************************************************************************/
 void
 syms_of_glyphs (void)
 {
+INIT_LRECORD_IMPLEMENTATION (glyph);
+INIT_LRECORD_IMPLEMENTATION (image_instance);
 /* image instantiators */
 DEFSUBR (Fimage_instantiator_format_list);
 DEFSUBR (Fvalid_image_instantiator_format_p);
 DEFSUBR (Fset_console_type_image_conversion_list);

Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 400:a86b2b5e0111 r21-2-30