xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 408:501cfd01ee6d r21-2-34

Import from CVS: tag r21-2-34

author	cvs
date	Mon, 13 Aug 2007 11:18:11 +0200
parents	b8cc9ab3f761
children	de805c49cfc1

comparison

equal deleted inserted replaced

-:ed6218a7d4d3
+:501cfd01ee6d
 #define BEGIN_GLYPHS	0
 #define END_GLYPHS	1
 #define LEFT_GLYPHS	2
 #define RIGHT_GLYPHS	3
-/* Set the vertical clip to 0 if we are currently updating the line
-start cache.  Otherwise for buffers of line height 1 it may fail to
-be able to work properly because regenerate_window will not layout
-a single line.  */
 #define VERTICAL_CLIP(w, display)					\
-(updating_line_start_cache						\
+((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines))	        \
-? 0									\
-: ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines))	\
 ? INT_MAX								\
-: vertical_clip))
+: vertical_clip)
 /* The following structures are completely private to redisplay.c so
 we put them here instead of in a header file, for modularity. */
 /* NOTE: Bytinds not Bufpos's in this structure. */
 int vertical_clip;
 /* Minimum visible pixel width of clipped glyphs at right margin. */
 int horizontal_clip;
-/* Set if currently inside update_line_start_cache. */
-static int updating_line_start_cache;
 /* Nonzero means reading single-character input with prompt
 so put cursor on minibuffer after the prompt.  */
 int cursor_in_echo_area;
 Lisp_Object Qcursor_in_echo_area;
 		      dst += long_to_string_base ((char *)dst, data->ch, 16);
 		      break;*/
 		    case '%':
 		      dst += set_charptr_emchar (dst, '%');
 		      break;
+		      /* #### unimplemented */
 		    }
 		}
 	    }
 	  prop = add_bufbyte_string_runes (data, result, dst - result, 0);
 	}
 *   at most that many characters.  If positive, pad (with spaces)
 *   to at least that many characters.
 * - If first element is another symbol, process the cadr or caddr
 *   recursively according to whether the symbol's value is non-nil or
 *   nil.
-* - If first element is a face, process the cdr recursively
+* - If first element is an extent, process the cdr recursively
-*   without altering the depth.
+*   and handle the extent's face.
 */
 Lisp_Object car, tem;
 car = XCAR (elt);
 struct frame *f = XFRAME (w->frame);
 struct buffer *b = XBUFFER (w->buffer);
 int ypos = WINDOW_TEXT_TOP (w);
 int yend;	/* set farther down */
 int yclip = WINDOW_TEXT_TOP_CLIP (w);
+int force;
 prop_block_dynarr *prop;
 layout_bounds bounds;
 display_line_dynarr *dla;
 int need_modeline;
 Dynarr_add (prop, pb);
 }
 else
 prop = 0;
+/* When we are computing things for scrolling purposes, make
+sure at least one line is always generated */
+force = (type == CMOTION_DISP);
 /* Make sure this is set always */
 /* Note the conversion at end */
 w->window_end_pos[type] = start_pos;
-while (ypos < yend)
+while (ypos < yend || force)
 {
 struct display_line dl;
 struct display_line *dlp;
 int local;
 	  /* Although this seems strange we could have a single very
 	     tall line visible for which we need to account for both
 	     the top clip and the bottom clip. */
 	  visible_height -= (dlp->clip + dlp->top_clip);
-	  if (visible_height < VERTICAL_CLIP (w, 1))
+	  if (visible_height < VERTICAL_CLIP (w, 1) && !force)
 	    {
 	      if (local)
 		free_display_line (dlp);
 	      break;
 	    }
 /* #### This type of check needs to be done down in the
 	 generate_display_line call. */
 if (start_pos > BUF_ZV (b))
 	break;
+force = 0;
 }
 if (prop)
 Dynarr_free (prop);
 like the clicked state of button. We have to do this before
 redisplaying the gutters as subwindows get unmapped in the
 process.*/
 if (f->frame_changed || f->subwindows_changed)
 {
-reset_subwindow_cachels (f);
 /* we have to do this so the gutter gets regenerated. */
 reset_gutter_display_lines (f);
 }
-else
-mark_subwindow_cachels_as_not_updated (f);
 hold_frame_size_changes ();
 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
 /* Within this section, we are defenseless and assume that the
 we simply return. #### We should abort instead.
 #### If a frame-size change does occur we should probably
 actually be preempting redisplay. */
+MAYBE_DEVMETH (d, frame_output_begin, (f));
 /* We can now update the gutters, safe in the knowledge that our
 efforts won't get undone. */
 /* This can call lisp, but redisplay is protected by binding
 inhibit_quit.  More importantly the code involving display lines
 update_frame_gutters (f);
 /* Erase the frame before outputting its contents. */
 if (f->clear)
 {
-DEVMETH (d, clear_frame, (f));
+MAYBE_DEVMETH (d, clear_frame, (f));
 }
 /* Do the selected window first. */
 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
 /* Then do the rest. */
 redisplay_windows (f->root_window, 1);
-/* We now call the output_end routine for tty frames.  We delay
+MAYBE_DEVMETH (d, frame_output_end, (f));
-doing so in order to avoid cursor flicker.  So much for 100%
-encapsulation. */
-if (FRAME_TTY_P (f))
-DEVMETH (d, output_end, (d));
 update_frame_title (f);
 CLASS_RESET_CHANGED_FLAGS (f);
 f->window_face_cache_reset = 0;
 line_start_cache_dynarr *cache = w->line_start_cache;
 Bufpos low_bound, high_bound;
 validate_line_start_cache (w);
 w->line_cache_validation_override++;
-updating_line_start_cache = 1;
 if (from < BUF_BEGV (b))
 from = BUF_BEGV (b);
 if (to > BUF_ZV (b))
 to = BUF_ZV (b);
 if (from > to)
 {
-updating_line_start_cache = 0;
 w->line_cache_validation_override--;
 return;
 }
 if (Dynarr_length (cache))
 high_bound = line_start_cache_end (w);
 /* Check to see if the desired range is already in the cache. */
 if (from >= low_bound && to <= high_bound)
 	{
-	  updating_line_start_cache = 0;
 	  w->line_cache_validation_override--;
 	  return;
 	}
 /* Check to make sure that the desired range is adjacent to the
 Bufpos start, end;
 update_internal_cache_list (w, DESIRED_DISP);
 if (!Dynarr_length (internal_cache))
 	{
-	  updating_line_start_cache = 0;
 	  w->line_cache_validation_override--;
 	  return;
 	}
 start = Dynarr_atp (internal_cache, 0)->start;
 if (!Dynarr_length (cache))
 	{
 	  Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
 			   Dynarr_length (internal_cache));
-	  updating_line_start_cache = 0;
 	  w->line_cache_validation_override--;
 	  return;
 	}
 /* An extra check just in case the calling function didn't pass in
 the bounds of the DESIRED structs in the first place. */
 if (start >= low_bound && end <= high_bound)
 	{
-	  updating_line_start_cache = 0;
 	  w->line_cache_validation_override--;
 	  return;
 	}
 /* At this point we know that the internal cache partially overlaps
 	  if (!(ic_elt >= 0))
 	    {
 	      Dynarr_reset (cache);
 	      Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
 			       Dynarr_length (internal_cache));
-	      updating_line_start_cache = 0;
 	      w->line_cache_validation_override--;
 	      return;
 	    }
 	  Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
 	  if (!(ic_elt < Dynarr_length (internal_cache)))
 	    {
 	      Dynarr_reset (cache);
 	      Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
 			       Dynarr_length (internal_cache));
-	      updating_line_start_cache = 0;
 	      w->line_cache_validation_override--;
 	      return;
 	    }
 	  Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
 			   Dynarr_length (internal_cache) - ic_elt);
 	}
-updating_line_start_cache = 0;
 w->line_cache_validation_override--;
 return;
 }
 if (!Dynarr_length (cache) || from < low_bound)
 	  regenerate_window (w, startp, point, CMOTION_DISP);
 	  update_internal_cache_list (w, CMOTION_DISP);
 	  /* If this assert is triggered then regenerate_window failed
-to layout a single line.  That is not supposed to be
+to layout a single line. This is not possible since we
-possible because we impose a minimum height on the buffer
+	     force at least a single line to be layout for CMOTION_DISP */
-and override vertical clip when we are in here. */
+	  assert (Dynarr_length (internal_cache));
-	  /* #### Ah, but it is because the window may temporarily
-exist but not have any lines at all if the minibuffer is
-real big.  Look into that situation better. */
-	  if (!Dynarr_length (internal_cache))
-	    {
-	      if (old_lb == -1 && low_bound == -1)
-		{
-		  updating_line_start_cache = 0;
-		  w->line_cache_validation_override--;
-		  return;
-		}
-	      assert (Dynarr_length (internal_cache));
-	    }
 	  assert (startp == Dynarr_atp (internal_cache, 0)->start);
 	  ic_elt = Dynarr_length (internal_cache) - 1;
 	  if (low_bound != -1)
 	    {
 	  if (startp < low_bound || low_bound == -1)
 	    low_bound = startp;
 	  startp = new_startp;
 	  if (startp > BUF_ZV (b))
 	    {
-	      updating_line_start_cache = 0;
 	      w->line_cache_validation_override--;
 	      return;
 	    }
 	}
 }
 	  startp = high_bound + 1;
 	}
 while (to > high_bound);
 }
-updating_line_start_cache = 0;
 w->line_cache_validation_override--;
 assert (to <= high_bound);
 }
 	  struct frame *f = XFRAME (XCAR (frmcons));
 	  if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
 	    {
 	      Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
+	      MAYBE_DEVMETH (d, frame_output_begin, (f));
 	      /*
 	       * If the frame size has changed, there may be random
 	       * chud on the screen left from previous messages
 	       * because redisplay_frame hasn't been called yet.
 	       * Clear the screen to get rid of the potential mess.
 	       */
 	      if (f->echo_area_garbaged)
 		{
-		  DEVMETH (d, clear_frame, (f));
+		  MAYBE_DEVMETH (d, clear_frame, (f));
 		  f->echo_area_garbaged = 0;
 		}
 	      redisplay_window (window, 0);
+	      MAYBE_DEVMETH (d, frame_output_end, (f));
 	      call_redisplay_end_triggers (XWINDOW (window), 0);
 	    }
 	}
-/* We now call the output_end routine for tty frames.  We delay
-	 doing so in order to avoid cursor flicker.  So much for 100%
-	 encapsulation. */
-if (DEVICE_TTY_P (d))
-	DEVMETH (d, output_end, (d));
 }
 return Qnil;
 }
 DEFSUBR (Fredraw_modeline);
 DEFSUBR (Fforce_cursor_redisplay);
 }
 void
-reinit_vars_of_redisplay (void)
-{
-updating_line_start_cache = 0;
-}
-void
 vars_of_redisplay (void)
 {
-reinit_vars_of_redisplay ();
 #if 0
 staticpro (&last_arrow_position);
 staticpro (&last_arrow_string);
 last_arrow_position = Qnil;
 */ ,
 		     redisplay_variable_changed);
 Voverlay_arrow_position = Qnil;
 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
-String to display as an arrow.  See also `overlay-arrow-position'.
+String or glyph to display as an arrow.  See also `overlay-arrow-position'.
+(Note that despite the name of this variable, it can be set to a glyph as
+well as a string.)
 */ ,
 		     redisplay_variable_changed);
 Voverlay_arrow_string = Qnil;
 DEFVAR_INT ("scroll-step", &scroll_step /*

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 408:501cfd01ee6d r21-2-34