comparison src/indent.c @ 11853:6578a356c540

(compute_motion): Handle overlay strings. New arg DID_MOTION. All callers changed.

11852:35b170692e4a

   offset TO or line TOVPOS, column TOHPOS (whichever comes first),
   and return the ending buffer position and screen location.  If we
   can't hit the requested column exactly (because of a tab or other
   multi-column character), overshoot.

   WIDTH is the number of columns available to display text;
   compute_motion uses this to handle continuation lines and such.
   HSCROLL is the number of columns not being displayed at the left
   margin; this is usually taken from a window's hscroll member.
   TAB_OFFSET is the number of columns of the first tab that aren't

   The `-1' accounts for the continuation-line backslashes; the rest
   accounts for window borders if the window is split horizontally, and
   the scroll bars if they are turned on.  */

struct position *
compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, tab_offset, win)
     int from, fromvpos, fromhpos, to, tovpos, tohpos;
     register int width;
     int hscroll, tab_offset;
     struct window *win;
{
  register int hpos = fromhpos;

       : !NILP (current_buffer->selective_display) ? -1 : 0);
  int prev_vpos = vpos, prev_hpos = 0;
  int selective_rlen
    = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
       ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
#ifdef USE_TEXT_PROPERTIES
  /* The next location where the `invisible' property changes */
  int next_invisible = from;
  Lisp_Object prop, position;
#endif

  /* For computing runs of characters with similar widths.
     Invariant: width_run_width is zero, or all the characters
     from width_run_start to width_run_end have a fixed width of
     width_run_width.  */

    /* If the window has its own display table, we can't use the width
       run cache, because that's based on the buffer's display table.  */
    width_table = 0;

  if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
  for (pos = from; pos < to; )
    {
      /* Stop if past the target screen position.  */
      if (vpos > tovpos
	  || (vpos == tovpos && hpos >= tohpos))
	break;

      prev_vpos = vpos;
      prev_hpos = hpos;

#ifdef USE_TEXT_PROPERTIES
      /* if the `invisible' property is set, we can skip to
	 the next property change */
      while (pos == next_invisible && pos < to)
	{
	  XSETFASTINT (position, pos);

	  /* Give faster response for overlay lookup near POS.  */
	  recenter_overlay_lists (current_buffer, pos);

	  prop = Fget_char_property (position,
				     Qinvisible,
				     Fcurrent_buffer ());
	  {
	    Lisp_Object end, limit, proplimit;

	    /* We must not advance farther than the next overlay change.
	       The overlay change might change the invisible property;
	       we have no way of telling.  */
	    limit = Fnext_overlay_change (position);
	    /* As for text properties, this gives a lower bound
	       for where the invisible text property could change.  */
	    proplimit = Fnext_property_change (position, buffer, Qt);
	    if (XFASTINT (limit) < XFASTINT (proplimit))
	      proplimit = limit;
	    /* PROPLIMIT is now a lower bound for the next change
	       in invisible status.  If that is plenty far away,
	       use that lower bound.  */
	    if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
	      next_invisible = XINT (proplimit);
	    /* Otherwise, scan for the next `invisible' property change.  */
	    else
	      {
		/* Don't scan terribly far.  */
		XSETFASTINT (proplimit, min (pos + 100, to));
		/* No matter what. don't go past next overlay change.  */
		if (XFASTINT (limit) < XFASTINT (proplimit))
		  proplimit = limit;
		end = Fnext_single_property_change (position, Qinvisible,
						    buffer, proplimit);
		if (INTEGERP (end) && XINT (end) < to)
		  next_invisible = XINT (end);
		else
		  next_invisible = to;
	      }
	    if (TEXT_PROP_MEANS_INVISIBLE (prop))
	      pos = next_invisible;
	  }
	}
      if (pos >= to)
	break;
#endif

      /* Consult the width run cache to see if we can avoid inspecting
         the text character-by-character.  */
      if (current_buffer->width_run_cache && pos >= next_width_run)
        {

          next_width_run = run_end + 1;
        }

      /* We have to scan the text character-by-character.  */
      else
        {
          c = FETCH_CHAR (pos);
          pos++;

          /* Perhaps add some info to the width_run_cache.  */
          if (current_buffer->width_run_cache)
            {
              /* Is this character part of the current run?  If so, extend
                 the run.  */
              if (pos - 1 == width_run_end
                  && width_table[c] == width_run_width)
                width_run_end = pos;

              /* The previous run is over, since this is a character at a
                 different position, or a different width.  */
              else
                {
                  /* Have we accumulated a run to put in the cache?
                     (Currently, we only cache runs of width == 1).  */
                  if (width_run_start < width_run_end
                      && width_run_width == 1)
                    know_region_cache (current_buffer,
                                       current_buffer->width_run_cache,
                                       width_run_start, width_run_end);

                  /* Start recording a new width run.  */
                  width_run_width = width_table[c];
                  width_run_start = pos - 1;
                  width_run_end = pos;
                }
            }

          if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
            hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
          else if (c >= 040 && c < 0177)
            hpos++;
          else if (c == '\t')
            {
              hpos += tab_width - ((hpos + tab_offset + hscroll - (hscroll > 0)
                                    /* Add tab_width here to make sure
                                       positive.  hpos can be negative
                                       after continuation but can't be
                                       less than -tab_width.  */
                                    + tab_width)
                                   % tab_width);
            }
          else if (c == '\n')
            {
              if (selective > 0 && indented_beyond_p (pos, selective))
                {
                  /* Skip any number of invisible lines all at once */
                  do
                    pos = find_before_next_newline (pos, to, 1) + 1;
                  while (pos < to
                         && indented_beyond_p (pos, selective));
                  /* Allow for the " ..." that is displayed for them. */
                  if (selective_rlen)
                    {
                      hpos += selective_rlen;
                      if (hpos >= width)
                        hpos = width;
                    }
		  --pos;
                  /* We have skipped the invis text, but not the
                     newline after.  */
                }
              else
                {
                  /* A visible line.  */
                  vpos++;
                  hpos = 0;
                  hpos -= hscroll;
                  /* Count the truncation glyph on column 0 */
                  if (hscroll > 0)
                    hpos++;
                  tab_offset = 0;
                }
            }
          else if (c == CR && selective < 0)
            {
              /* In selective display mode,
                 everything from a ^M to the end of the line is invisible.
                 Stop *before* the real newline.  */
              pos = find_before_next_newline (pos, to, 1);
              /* Allow for the " ..." that is displayed for them. */
              if (selective_rlen)
                {
                  hpos += selective_rlen;
                  if (hpos >= width)
                    hpos = width;
                }
            }
          else
            hpos += (ctl_arrow && c < 0200) ? 2 : 4;
        }

      /* Handle right margin.  */
      if (hpos >= width
	  && (hpos > width
	      || (pos < ZV
		  && FETCH_CHAR (pos) != '\n')))
	{
	  if (vpos > tovpos
	      || (vpos == tovpos && hpos >= tohpos))
	    break;
	  if (hscroll
	      || (truncate_partial_width_windows
		  && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
	      || !NILP (current_buffer->truncate_lines))
	    {
	      /* Truncating: skip to newline.  */
              pos = find_before_next_newline (pos, to, 1);
	      hpos = width;
	    }
	  else
	    {
	      /* Continuing.  */
	      vpos++;
	      hpos -= width;
	      tab_offset += width;
	    }

	}
    }

  /* Remember any final width run in the cache.  */
  if (current_buffer->width_run_cache

    window = Fselected_window ();
  else
    CHECK_LIVE_WINDOW (window, 0);

  pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
			XINT (XCONS (frompos)->car),
			XINT (to), XINT (XCONS (topos)->cdr),
			XINT (XCONS (topos)->car),
			XINT (width), hscroll, tab_offset,
			XWINDOW (window));

    = (INTEGERP (current_buffer->selective_display)
       ? XINT (current_buffer->selective_display)
       : !NILP (current_buffer->selective_display) ? -1 : 0);
  Lisp_Object window;
  int start_hpos = 0;

  XSETWINDOW (window, w);

  /* The omission of the clause
         && marker_position (w->start) == BEG

			 find_next_newline_no_quit (XFASTINT (prevline) - 1,
						    -1));
	  pos = *compute_motion (XFASTINT (prevline), 0,
				 lmargin + (XFASTINT (prevline) == BEG
					    ? start_hpos : 0),
				 from, 1 << (INTBITS - 2), 0,
				 width, hscroll, 0, w);
	  vpos -= pos.vpos;
	  first = 0;
	  from = XFASTINT (prevline);

    }
  /* Moving downward is simple, but must calculate from beg of line
     to determine hpos of starting point */
  if (from > BEGV && FETCH_CHAR (from - 1) != '\n')
    {
	Lisp_Object propval;

      XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
      while (XFASTINT (prevline) > BEGV
	     && ((selective > 0
		  && indented_beyond_p (XFASTINT (prevline), selective))

		     find_next_newline_no_quit (XFASTINT (prevline) - 1,
						-1));
      pos = *compute_motion (XFASTINT (prevline), 0,
			     lmargin + (XFASTINT (prevline) == BEG
					? start_hpos : 0),
			     from, 1 << (INTBITS - 2), 0,
			     width, hscroll, 0, w);
    }
  else
    {
      pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
      pos.vpos = 0;
    }
  return compute_motion (from, vpos, pos.hpos,
			 ZV, vtarget, - (1 << (INTBITS - 2)),
			 width, hscroll, pos.vpos * width, w);
}

DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,

11853:6578a356c540

   offset TO or line TOVPOS, column TOHPOS (whichever comes first),
   and return the ending buffer position and screen location.  If we
   can't hit the requested column exactly (because of a tab or other
   multi-column character), overshoot.

   DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
   at FROM.  This is the case if FROMVPOS and FROMVPOS came from an
   earlier call to compute_motion.  The other common case is that FROMHPOS
   is zero and FROM is a position that "belongs" at column zero, but might
   be shifted by overlay strings; in this case DID_MOTION should be 0.

   WIDTH is the number of columns available to display text;
   compute_motion uses this to handle continuation lines and such.
   HSCROLL is the number of columns not being displayed at the left
   margin; this is usually taken from a window's hscroll member.
   TAB_OFFSET is the number of columns of the first tab that aren't

   The `-1' accounts for the continuation-line backslashes; the rest
   accounts for window borders if the window is split horizontally, and
   the scroll bars if they are turned on.  */

struct position *
compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
     int from, fromvpos, fromhpos, to, tovpos, tohpos;
     int did_motion;
     register int width;
     int hscroll, tab_offset;
     struct window *win;
{
  register int hpos = fromhpos;

       : !NILP (current_buffer->selective_display) ? -1 : 0);
  int prev_vpos = vpos, prev_hpos = 0;
  int selective_rlen
    = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
       ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
  /* The next location where the `invisible' property changes, or an
     overlay starts or ends.  */
  int next_boundary = from;

  /* For computing runs of characters with similar widths.
     Invariant: width_run_width is zero, or all the characters
     from width_run_start to width_run_end have a fixed width of
     width_run_width.  */

    /* If the window has its own display table, we can't use the width
       run cache, because that's based on the buffer's display table.  */
    width_table = 0;

  if (tab_width <= 0 || tab_width > 1000) tab_width = 8;

  pos = from;
  while (1)
    {
      while (pos == next_boundary)
	{
	  /* If the caller says that the screen position came from an earlier
	     call to compute_motion, then we've already accounted for the
	     overlay strings at point.  This is only true the first time
	     through, so clear the flag after testing it.  */
	  if (!did_motion)
	    /* We need to skip past the overlay strings.  Currently those
	       strings must contain single-column printing characters;
	       if we want to relax that restriction, something will have
	       to be changed here.  */
	    hpos += overlay_strings (pos, win, (char **)0);
	  did_motion = 0;

	  if (pos >= to)
	    break;

	  {
	    Lisp_Object prop, position, end, limit, proplimit;

	    XSETFASTINT (position, pos);

	    /* Give faster response for overlay lookup near POS.  */
	    recenter_overlay_lists (current_buffer, pos);

	    /* We must not advance farther than the next overlay change.
	       The overlay change might change the invisible property;
	       or there might be overlay strings to be displayed there.  */
	    limit = Fnext_overlay_change (position);
	    /* As for text properties, this gives a lower bound
	       for where the invisible text property could change.  */
	    proplimit = Fnext_property_change (position, buffer, Qt);
	    if (XFASTINT (limit) < XFASTINT (proplimit))
	      proplimit = limit;
	    /* PROPLIMIT is now a lower bound for the next change
	       in invisible status.  If that is plenty far away,
	       use that lower bound.  */
	    if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
	      next_boundary = XFASTINT (proplimit);
	    /* Otherwise, scan for the next `invisible' property change.  */
	    else
	      {
		/* Don't scan terribly far.  */
		XSETFASTINT (proplimit, min (pos + 100, to));
		/* No matter what. don't go past next overlay change.  */
		if (XFASTINT (limit) < XFASTINT (proplimit))
		  proplimit = limit;
		end = Fnext_single_property_change (position, Qinvisible,
						    buffer, proplimit);
		next_boundary = XFASTINT (end);
	      }
	    /* if the `invisible' property is set, we can skip to
	       the next property change */
	    prop = Fget_char_property (position, Qinvisible,
				       Fcurrent_buffer ());
	    if (TEXT_PROP_MEANS_INVISIBLE (prop))
	      pos = next_boundary;
	  }
	}

      /* Handle right margin.  */
      if (hpos >= width
	  && (hpos > width
	      || (pos < ZV && FETCH_CHAR (pos) != '\n')))
	{
	  if (hscroll
	      || (truncate_partial_width_windows
		  && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
	      || !NILP (current_buffer->truncate_lines))
	    {
	      /* Truncating: skip to newline.  */
	      pos = find_before_next_newline (pos, to, 1);
	      hpos = width;
	    }
	  else
	    {
	      /* Continuing.  */
	      vpos += hpos / width;
	      tab_offset += hpos - hpos % width;
	      hpos %= width;
	    }
	}

      /* Stop if past the target buffer position or screen position.  */
      if (pos >= to)
	break;
      if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
	break;

      prev_vpos = vpos;
      prev_hpos = hpos;

      /* Consult the width run cache to see if we can avoid inspecting
         the text character-by-character.  */
      if (current_buffer->width_run_cache && pos >= next_width_run)
        {

          next_width_run = run_end + 1;
        }

      /* We have to scan the text character-by-character.  */
      else
	{
	  c = FETCH_CHAR (pos);
	  pos++;

	  /* Perhaps add some info to the width_run_cache.  */
	  if (current_buffer->width_run_cache)
	    {
	      /* Is this character part of the current run?  If so, extend
		 the run.  */
	      if (pos - 1 == width_run_end
		  && width_table[c] == width_run_width)
		width_run_end = pos;

	      /* The previous run is over, since this is a character at a
		 different position, or a different width.  */
	      else
		{
		  /* Have we accumulated a run to put in the cache?
		     (Currently, we only cache runs of width == 1).  */
		  if (width_run_start < width_run_end
		      && width_run_width == 1)
		    know_region_cache (current_buffer,
				       current_buffer->width_run_cache,
				       width_run_start, width_run_end);

		  /* Start recording a new width run.  */
		  width_run_width = width_table[c];
		  width_run_start = pos - 1;
		  width_run_end = pos;
		}
	    }

	  if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
	    hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
	  else if (c >= 040 && c < 0177)
	    hpos++;
	  else if (c == '\t')
	    {
	      int tem = (hpos + tab_offset + hscroll - (hscroll > 0)) % tab_width;
	      if (tem < 0)
		tem += tab_width;
	      hpos += tab_width - tem;
	    }
	  else if (c == '\n')
	    {
	      if (selective > 0 && indented_beyond_p (pos, selective))
		{
		  /* Skip any number of invisible lines all at once */
		  do
		    pos = find_before_next_newline (pos, to, 1) + 1;
		  while (pos < to
			 && indented_beyond_p (pos, selective));
		  /* Allow for the " ..." that is displayed for them. */
		  if (selective_rlen)
		    {
		      hpos += selective_rlen;
		      if (hpos >= width)
			hpos = width;
		    }
		  --pos;
		  /* We have skipped the invis text, but not the
		     newline after.  */
		}
	      else
		{
		  /* A visible line.  */
		  vpos++;
		  hpos = 0;
		  hpos -= hscroll;
		  /* Count the truncation glyph on column 0 */
		  if (hscroll > 0)
		    hpos++;
		  tab_offset = 0;
		}
	    }
	  else if (c == CR && selective < 0)
	    {
	      /* In selective display mode,
		 everything from a ^M to the end of the line is invisible.
		 Stop *before* the real newline.  */
	      pos = find_before_next_newline (pos, to, 1);
	      /* Allow for the " ..." that is displayed for them. */
	      if (selective_rlen)
		{
		  hpos += selective_rlen;
		  if (hpos >= width)
		    hpos = width;
		}
	    }
	  else
	    hpos += (ctl_arrow && c < 0200) ? 2 : 4;
	}
    }

  /* Remember any final width run in the cache.  */
  if (current_buffer->width_run_cache

    window = Fselected_window ();
  else
    CHECK_LIVE_WINDOW (window, 0);

  pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
			XINT (XCONS (frompos)->car), 0,
			XINT (to), XINT (XCONS (topos)->cdr),
			XINT (XCONS (topos)->car),
			XINT (width), hscroll, tab_offset,
			XWINDOW (window));

    = (INTEGERP (current_buffer->selective_display)
       ? XINT (current_buffer->selective_display)
       : !NILP (current_buffer->selective_display) ? -1 : 0);
  Lisp_Object window;
  int start_hpos = 0;
  int did_motion;

  XSETWINDOW (window, w);

  /* The omission of the clause
         && marker_position (w->start) == BEG

			 find_next_newline_no_quit (XFASTINT (prevline) - 1,
						    -1));
	  pos = *compute_motion (XFASTINT (prevline), 0,
				 lmargin + (XFASTINT (prevline) == BEG
					    ? start_hpos : 0),
				 0,
				 from, 1 << (INTBITS - 2), 0,
				 width, hscroll, 0, w);
	  vpos -= pos.vpos;
	  first = 0;
	  from = XFASTINT (prevline);

    }
  /* Moving downward is simple, but must calculate from beg of line
     to determine hpos of starting point */
  if (from > BEGV && FETCH_CHAR (from - 1) != '\n')
    {
      Lisp_Object propval;

      XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
      while (XFASTINT (prevline) > BEGV
	     && ((selective > 0
		  && indented_beyond_p (XFASTINT (prevline), selective))

		     find_next_newline_no_quit (XFASTINT (prevline) - 1,
						-1));
      pos = *compute_motion (XFASTINT (prevline), 0,
			     lmargin + (XFASTINT (prevline) == BEG
					? start_hpos : 0),
			     0,
			     from, 1 << (INTBITS - 2), 0,
			     width, hscroll, 0, w);
      did_motion = 1;
    }
  else
    {
      pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
      pos.vpos = 0;
      did_motion = 0;
    }
  return compute_motion (from, vpos, pos.hpos, did_motion,
			 ZV, vtarget, - (1 << (INTBITS - 2)),
			 width, hscroll, pos.vpos * width, w);
}

DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,