comparison src/xdisp.c @ 20926:b304072b893c

(try_window_id): Use DEC_POS only for multibyte buffer. display_text_line): Handling of a wide-column character fixed. Make the behaviour consistent with INC_POS.

20925:f61425242f70

  int last_text_vpos = 0;
  int stop_vpos;
  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);

  struct position val, bp, ep, xp, pp;
  int scroll_amount = 0;
  int delta;
  int epto, old_tick;

    {
      val.hpos = bp.prevhpos - width + lmargin;
      val.tab_offset = bp.tab_offset + bp.prevhpos - width;
      did_motion = 1;
      pos--;
      DEC_POS (pos_byte);
    }

  bp.vpos = vpos;

  /* Find first visible newline after which no more is changed.  */

      else if (xp.contin && xp.hpos != lmargin)
	{
	  val.hpos = xp.prevhpos - width + lmargin;
	  val.tab_offset = xp.tab_offset + bp.prevhpos - width;
	  pos--;
	  DEC_POS (pos_byte);
	}

      blank_end_of_window = 1;
      /* The following code is omitted because we maintain tab offset
	 in val.tab_offset.  */

  register unsigned char *p;
  GLYPH *endp;
  register GLYPH *leftmargin;
  register GLYPH *p1prev;
  register GLYPH *p1start;
  int prevpos, prevpos_byte;
  int *charstart;
  FRAME_PTR f = XFRAME (w->frame);
  int tab_width = XINT (current_buffer->tab_width);
  int ctl_arrow = !NILP (current_buffer->ctl_arrow);

         requested, if we hit a multi-column character, or the end of
         the line.  If so, back up.  */
      if (left_edge->vpos > vpos
          || left_edge->hpos > 0)
        {
          pos = left_edge->bufpos;
	  /* Since this should not be a valid multibyte character, we
             can decrease POS by 1.  */
	  pos--;
	  pos_byte = left_edge->bytepos - 1;
          hpos = left_edge->prevhpos;
        }
      else
        {
          pos = left_edge->bufpos;

      cursor_hpos = p1 - leftmargin;
    }

  while (p1 < endp)
    {
      if (pos >= pause)
	{
	  int e_t_h;

	  while (pos == next_boundary)

      if (p1 >= endp)
	break;

      p1prev = p1;

      if (multibyte)
	c = STRING_CHAR_AND_LENGTH (p, limit_byte - pos_byte, len), p += len;
      else
	c = *p++, len = 1;

	  p1++;
	}
      else if (len == 1)
	{
	  /* C is not a multibyte character.  */
	  if (p1 >= leftmargin)
	    *p1 = (fix_glyph
		   (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp))
			&& GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp)))
			? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
		    current_face)
		   | rev_dir_bit);
	  p1++;
	  if (p1 >= leftmargin && p1 < endp)
	    *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face) | rev_dir_bit;
	  p1++;
	  if (p1 >= leftmargin && p1 < endp)
	    *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face)
		   | rev_dir_bit);
	  p1++;
	  if (p1 >= leftmargin && p1 < endp)
	    *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face) | rev_dir_bit;
	  p1++;
	}
      else
	{
	  /* C is a multibyte character.  */
	  int charset = CHAR_CHARSET (c);

	  while (columns--)
	    {
	      if (p1 >= leftmargin && p1 < endp)
		*p1 = g, g |= GLYPH_MASK_PADDING;
	      p1++;
	    }
	}

      prevpos = pos;
      prevpos_byte = pos_byte;

             character code is C and the length of multi-byte form is
             LEN.  */
	  pos = prevpos;
	  pos_byte = prevpos_byte;

	  if (len == 1)
	    /* C is not a multi-byte character.  We can break it and
	       start from the middle column in the next line.  So,
	       adjust VAL.HPOS to skip the columns output on this
	       line.  */
	    val.hpos += p1prev - endp;
	  else
	    {
	      /* C is a multibyte character.  Since we can't broke it
		 in the middle, the whole character should be driven
		 into the next line.  */
	      /* As the result, the actual columns occupied by the
		 text on this line is less than WIDTH.  VAL.TAB_OFFSET
		 must be adjusted.  */
	      taboffset = taboffset + (p1prev - endp);
	      /* Let's fill unused columns with TRUNCATOR or CONTINUER.  */

	  else
	    {
	      *p1++ = fix_glyph (f, continuer, 0);
	      val.vpos = 0;
	      lastpos--;
	      DEC_POS (lastpos_byte);
	      val.tab_offset = taboffset + width;
	    }
	}
    }
  else

20926:b304072b893c

  int last_text_vpos = 0;
  int stop_vpos;
  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
  struct position val, bp, ep, xp, pp;
  int scroll_amount = 0;
  int delta;
  int epto, old_tick;

    {
      val.hpos = bp.prevhpos - width + lmargin;
      val.tab_offset = bp.tab_offset + bp.prevhpos - width;
      did_motion = 1;
      pos--;
      if (multibyte)
	DEC_POS (pos_byte);
      else
	pos_byte--;
    }

  bp.vpos = vpos;

  /* Find first visible newline after which no more is changed.  */

      else if (xp.contin && xp.hpos != lmargin)
	{
	  val.hpos = xp.prevhpos - width + lmargin;
	  val.tab_offset = xp.tab_offset + bp.prevhpos - width;
	  pos--;
	  if (multibyte)
	    DEC_POS (pos_byte);
	  else
	    pos_byte--;
	}

      blank_end_of_window = 1;
      /* The following code is omitted because we maintain tab offset
	 in val.tab_offset.  */

  register unsigned char *p;
  GLYPH *endp;
  register GLYPH *leftmargin;
  register GLYPH *p1prev;
  register GLYPH *p1start;
  GLYPH *p1_wide_column_end = (GLYPH *) 0;
  int prevpos, prevpos_byte;
  int *charstart;
  FRAME_PTR f = XFRAME (w->frame);
  int tab_width = XINT (current_buffer->tab_width);
  int ctl_arrow = !NILP (current_buffer->ctl_arrow);

         requested, if we hit a multi-column character, or the end of
         the line.  If so, back up.  */
      if (left_edge->vpos > vpos
          || left_edge->hpos > 0)
        {
          pos = left_edge->bufpos - 1;
	  pos_byte = left_edge->bytepos;
	  if (multibyte)
	    DEC_POS (pos_byte);
	  else
	    pos_byte--;
          hpos = left_edge->prevhpos;
        }
      else
        {
          pos = left_edge->bufpos;

      cursor_hpos = p1 - leftmargin;
    }

  while (p1 < endp)
    {
      int eat_following_binary_data;

      if (pos >= pause)
	{
	  int e_t_h;

	  while (pos == next_boundary)

      if (p1 >= endp)
	break;

      p1prev = p1;
      p1_wide_column_end = (GLYPH *) 0;

      if (multibyte)
	c = STRING_CHAR_AND_LENGTH (p, limit_byte - pos_byte, len), p += len;
      else
	c = *p++, len = 1;

	  p1++;
	}
      else if (len == 1)
	{
	  /* C is not a multibyte character.  */
	  eat_following_binary_data = multibyte && BASE_LEADING_CODE_P (c);
	  
	label_display_binary_data:
	  do {
	    if (p1 >= leftmargin && p1 < endp)
	      *p1 = (fix_glyph
		     (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp))
			  && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp)))
			  ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
		      current_face)
		     | rev_dir_bit);
	    p1++;
	    if (p1 >= leftmargin && p1 < endp)
	      *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face) | rev_dir_bit;
	    p1++;
	    if (p1 >= leftmargin && p1 < endp)
	      *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face)
		     | rev_dir_bit);
	    p1++;
	    if (p1 >= leftmargin && p1 < endp)
	      *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face) | rev_dir_bit;
	    p1++;
	  } while (eat_following_binary_data
		   && (pos_byte + len) < limit_byte
		   && ! CHAR_HEAD_P (*p)
		   && ((c = *p++), len++));
	}
      else
	{
	  /* C is a multibyte character.  */
	  int charset = CHAR_CHARSET (c);

	  while (columns--)
	    {
	      if (p1 >= leftmargin && p1 < endp)
		*p1 = g, g |= GLYPH_MASK_PADDING;
	      p1++;
	    }

	  p1_wide_column_end = p1;
	  /* Check if binary data follows it.  */
	  if (pos_byte + len < limit_byte
	      && ! CHAR_HEAD_P (*p))
	    {
	      eat_following_binary_data = 1;
	      c = *p++;
	      len++;
	      goto label_display_binary_data;
	    }
	}

      prevpos = pos;
      prevpos_byte = pos_byte;

             character code is C and the length of multi-byte form is
             LEN.  */
	  pos = prevpos;
	  pos_byte = prevpos_byte;

	  if (p1_wide_column_end < endp)
	    /* As ENDP is not in the middle of wide-column character,
	       we can break the line at ENDP and start from the middle
	       column in the next line.  So, adjust VAL.HPOS to skip
	       the columns output on this line.  */
	    val.hpos += p1prev - endp;
	  else
	    {
	      /* We displayed a wide-column character at around ENDP.
		 Since we can't broke it in the middle, the whole
		 character should be driven into the next line.  */
	      /* As the result, the actual columns occupied by the
		 text on this line is less than WIDTH.  VAL.TAB_OFFSET
		 must be adjusted.  */
	      taboffset = taboffset + (p1prev - endp);
	      /* Let's fill unused columns with TRUNCATOR or CONTINUER.  */

	  else
	    {
	      *p1++ = fix_glyph (f, continuer, 0);
	      val.vpos = 0;
	      lastpos--;
	      if (multibyte)
		DEC_POS (lastpos_byte);
	      else
		lastpos_byte--;
	      val.tab_offset = taboffset + width;
	    }
	}
    }
  else