comparison src/xterm.c @ 28686:b02f0d91b5aa

(x_produce_glyphs): Remove reference to struct it's prompt_width. Add extra line spacing.

28685:b4310b6f3b5e

	    }
	}
      else if (it->char_to_display == '\t')
	{
	  int tab_width = it->tab_width * CANON_X_UNIT (it->f);
	  int x = (it->current_x
		   - it->prompt_width
		   + it->continuation_lines_width);
	  int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
      
	  it->pixel_width = next_tab_x - x;
	  it->nglyphs = 1;
	  it->ascent = it->phys_ascent = font->ascent + boff;

  /* Accumulate dimensions.  */
  xassert (it->ascent >= 0 && it->descent > 0);
  if (it->area == TEXT_AREA)
    it->current_x += it->pixel_width;
  
  it->max_ascent = max (it->max_ascent, it->ascent);
  it->max_descent = max (it->max_descent, it->descent);
  it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent);
  it->max_phys_descent = max (it->max_phys_descent, it->phys_descent);

28686:b02f0d91b5aa

	    }
	}
      else if (it->char_to_display == '\t')
	{
	  int tab_width = it->tab_width * CANON_X_UNIT (it->f);
	  int x = it->current_x + it->continuation_lines_width;
	  int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
      
	  it->pixel_width = next_tab_x - x;
	  it->nglyphs = 1;
	  it->ascent = it->phys_ascent = font->ascent + boff;

  /* Accumulate dimensions.  */
  xassert (it->ascent >= 0 && it->descent > 0);
  if (it->area == TEXT_AREA)
    it->current_x += it->pixel_width;
  
  it->descent += it->extra_line_spacing;
  
  it->max_ascent = max (it->max_ascent, it->ascent);
  it->max_descent = max (it->max_descent, it->descent);
  it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent);
  it->max_phys_descent = max (it->max_phys_descent, it->phys_descent);