xemacs-beta: src/extents.c comparison

comparison src/extents.c @ 207:e45d5e7c476e r20-4b2

Import from CVS: tag r20-4b2

author	cvs
date	Mon, 13 Aug 2007 10:03:52 +0200
parents	850242ba4a81
children	78478c60bfcd

comparison

equal deleted inserted replaced

-:d3e9274cbc4e
+:e45d5e7c476e
 Lisp_Object Qunique;
 Lisp_Object Qduplicable;
 Lisp_Object Qdetachable;
 Lisp_Object Qpriority;
 Lisp_Object Qmouse_face;
-Lisp_Object Qone_shot_function;
+Lisp_Object Qinitial_redisplay_function;
 Lisp_Object Qglyph_layout;  /* This exists only for backwards compatibility. */
 Lisp_Object Qbegin_glyph_layout, Qend_glyph_layout;
 Lisp_Object Qoutside_margin;
 Lisp_Object Qinside_margin;
 ((markobj) (data->end_glyph));
 ((markobj) (data->invisible));
 ((markobj) (data->children));
 ((markobj) (data->read_only));
 ((markobj) (data->mouse_face));
-((markobj) (data->one_shot_function));
+((markobj) (data->initial_redisplay_function));
 return data->parent;
 }
 void
 allocate_extent_auxiliary (EXTENT ext)
 if (!NILP (extent_face        (anc)) ||
 !NILP (extent_begin_glyph (anc)) ||
 !NILP (extent_end_glyph   (anc)) ||
 !NILP (extent_mouse_face  (anc)) ||
 !NILP (extent_invisible   (anc)) ||
-!NILP (extent_one_shot_function (anc)) ||
+!NILP (extent_initial_redisplay_function (anc)) ||
 invisibility_change)
 extent_changed_for_redisplay (extent, descendants_too,
 				  invisibility_change);
 }
 				   mouse_highlight_priority);
 	      extent_face (&dummy_lhe_extent) = extent_mouse_face (lhe);
 	      Dynarr_add (ef->extents, &dummy_lhe_extent);
 	    }
 	  /* since we are looping anyway, we might as well do this here */
-	  if (!NILP(extent_one_shot_function (e)))
+	  if ((!NILP(extent_initial_redisplay_function (e))) &&
+	      !extent_in_red_event_p(e))
 	    {
-	      Lisp_Object function = extent_one_shot_function (e);
+	      Lisp_Object function = extent_initial_redisplay_function (e);
 	      Lisp_Object obj;
-	      /* printf("One shot function called!\n "); */
+	      /* printf("initial redisplay function called!\n "); */
 	      /* print_extent_2(e);
 	         printf("\n"); */
-	      /* Do NOT use the set function here because that sets the
+	      /* FIXME: One should probably inhibit the displaying of
-		 redisplay flag.
-		 FIXME: One should probably inhibit the displaying of
 		 this extent to reduce flicker */
-	      set_extent_one_shot_function (e,Qnil); /* one shot */
+	      extent_in_red_event_p(e) = 1;
 	      /* call the function */
 	      XSETEXTENT(obj,e);
 	      if(!NILP(function))
 	         Fenqueue_eval_event(function,obj);
 	     (memoize_extent_face_internal (value)));
 return value;
 }
 /* Do we need a lisp-level function ? */
-DEFUN ("set-extent-one-shot-function", Fset_extent_one_shot_function,
+DEFUN ("set-extent-initial-redisplay-function", Fset_extent_initial_redisplay_function,
 2,2,0,/*
-Set one-shot-function of EXTENT to the function
+Note: This feature is experimental!
-FUNCTION. This function will be called with EXTENT as its only
-argument shortly after (part of) the extent has been under
+Set initial-redisplay-function of EXTENT to the function
-consideration for display. The property is then cleared.
+FUNCTION.
+The first time the EXTENT is (re)displayed, an eval event will be
+dispatched calling FUNCTION with EXTENT as its only argument.
 */
 (extent, function))
 {
 EXTENT e = decode_extent(extent, DE_MUST_BE_ATTACHED);
 e = extent_ancestor (e);  /* Is this needed? Macro also does chasing!*/
-set_extent_one_shot_function(e,function);
+set_extent_initial_redisplay_function(e,function);
+extent_in_red_event_p(e) = 0;  /* If the function changed we can spawn
+				new events */
 extent_changed_for_redisplay(e,1,0); /* Do we need to mark children too ?*/
 return function;
 }
 By default, extents have the `end-open' but not the
 `start-open' property set.
 read-only          Text within this extent will be unmodifiable.
-one-shot-function  function to be called the first time (part of) the extent
+initial-redisplay-function (EXPERIMENTAL)
+function to be called the first time (part of) the extent
 is redisplayed. It will be called with the extent as its
 first argument.
+		    Note: The function will not be called immediately
+		    during redisplay, an eval event will be dispatched.
 detachable         Whether the extent gets detached (as with
 `detach-extent') when all the text within the
 extent is deleted.  This is true by default.  If
 this property is not set, the extent becomes a
 }
 else if (EQ (property, Qpriority))
 Fset_extent_priority (extent, value);
 else if (EQ (property, Qface))
 Fset_extent_face (extent, value);
-else if (EQ (property, Qone_shot_function))
+else if (EQ (property, Qinitial_redisplay_function))
-Fset_extent_one_shot_function (extent, value);
+Fset_extent_initial_redisplay_function (extent, value);
 else if (EQ (property, Qmouse_face))
 Fset_extent_mouse_face (extent, value);
 /* Obsolete: */
 else if (EQ (property, Qhighlight))
 Fset_extent_mouse_face (extent, Qhighlight);
 set_extent_openness (e, start_open, end_open);
 }
 else
 {
 if (EQ (property, Qkeymap))
-	while (NILP (Fkeymapp (value)))
+	while (!NILP (value) && NILP (Fkeymapp (value)))
 	  value = wrong_type_argument (Qkeymapp, value);
 external_plist_put (extent_plist_addr (e), property, value, 0, ERROR_ME);
 }
 return extent_read_only (e);
 else if (EQ (property, Qinvisible))
 return extent_invisible (e);
 else if (EQ (property, Qface))
 return Fextent_face (extent);
-else if (EQ (property, Qone_shot_function))
+else if (EQ (property, Qinitial_redisplay_function))
-return extent_one_shot_function (e);
+return extent_initial_redisplay_function (e);
 else if (EQ (property, Qmouse_face))
 return Fextent_mouse_face (extent);
 /* Obsolete: */
 else if (EQ (property, Qhighlight))
 return !NILP (Fextent_mouse_face (extent)) ? Qt : Qnil;
 if (extent_priority (anc) != 0)
 result = Fcons (Qpriority, Fcons (make_int (extent_priority (anc)),
 				      result));
-if (!NILP (extent_one_shot_function (anc)))
+if (!NILP (extent_initial_redisplay_function (anc)))
-result = Fcons (Qone_shot_function, Fcons (extent_one_shot_function (anc), result));
+result = Fcons (Qinitial_redisplay_function, Fcons (extent_initial_redisplay_function (anc), result));
 if (!NILP (extent_invisible (anc)))
 result = Fcons (Qinvisible, Fcons (extent_invisible (anc), result));
 if (!NILP (extent_read_only (anc)))
 defsymbol (&Qunique, "unique");
 defsymbol (&Qduplicable, "duplicable");
 defsymbol (&Qdetachable, "detachable");
 defsymbol (&Qpriority, "priority");
 defsymbol (&Qmouse_face, "mouse-face");
-defsymbol (&Qone_shot_function,"one-shot-function");
+defsymbol (&Qinitial_redisplay_function,"initial-redisplay-function");
 defsymbol (&Qglyph_layout, "glyph-layout");	/* backwards compatibility */
 defsymbol (&Qbegin_glyph_layout, "begin-glyph-layout");
 defsymbol (&Qbegin_glyph_layout, "end-glyph-layout");
 DEFSUBR (Fextent_in_region_p);
 DEFSUBR (Fmap_extents);
 DEFSUBR (Fmap_extent_children);
 DEFSUBR (Fextent_at);
-DEFSUBR (Fset_extent_one_shot_function);
+DEFSUBR (Fset_extent_initial_redisplay_function);
 DEFSUBR (Fextent_face);
 DEFSUBR (Fset_extent_face);
 DEFSUBR (Fextent_mouse_face);
 DEFSUBR (Fset_extent_mouse_face);
 DEFSUBR (Fset_extent_begin_glyph);
 extent_auxiliary_defaults.children = Qnil;
 extent_auxiliary_defaults.priority = 0;
 extent_auxiliary_defaults.invisible = Qnil;
 extent_auxiliary_defaults.read_only = Qnil;
 extent_auxiliary_defaults.mouse_face = Qnil;
-extent_auxiliary_defaults.one_shot_function = Qnil;
+extent_auxiliary_defaults.initial_redisplay_function = Qnil;
 }
 void
 complex_vars_of_extents (void)
 {

Mercurial > hg > xemacs-beta

comparison src/extents.c @ 207:e45d5e7c476e r20-4b2