Mercurial > emacs
comparison src/xterm.c @ 28686:b02f0d91b5aa
(x_produce_glyphs): Remove reference to struct it's
prompt_width. Add extra line spacing.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 24 Apr 2000 13:54:04 +0000 |
parents | 437e522505fb |
children | 796eafcfc070 |
comparison
equal
deleted
inserted
replaced
28685:b4310b6f3b5e | 28686:b02f0d91b5aa |
---|---|
1904 } | 1904 } |
1905 } | 1905 } |
1906 else if (it->char_to_display == '\t') | 1906 else if (it->char_to_display == '\t') |
1907 { | 1907 { |
1908 int tab_width = it->tab_width * CANON_X_UNIT (it->f); | 1908 int tab_width = it->tab_width * CANON_X_UNIT (it->f); |
1909 int x = (it->current_x | 1909 int x = it->current_x + it->continuation_lines_width; |
1910 - it->prompt_width | |
1911 + it->continuation_lines_width); | |
1912 int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; | 1910 int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; |
1913 | 1911 |
1914 it->pixel_width = next_tab_x - x; | 1912 it->pixel_width = next_tab_x - x; |
1915 it->nglyphs = 1; | 1913 it->nglyphs = 1; |
1916 it->ascent = it->phys_ascent = font->ascent + boff; | 1914 it->ascent = it->phys_ascent = font->ascent + boff; |
2228 | 2226 |
2229 /* Accumulate dimensions. */ | 2227 /* Accumulate dimensions. */ |
2230 xassert (it->ascent >= 0 && it->descent > 0); | 2228 xassert (it->ascent >= 0 && it->descent > 0); |
2231 if (it->area == TEXT_AREA) | 2229 if (it->area == TEXT_AREA) |
2232 it->current_x += it->pixel_width; | 2230 it->current_x += it->pixel_width; |
2231 | |
2232 it->descent += it->extra_line_spacing; | |
2233 | 2233 |
2234 it->max_ascent = max (it->max_ascent, it->ascent); | 2234 it->max_ascent = max (it->max_ascent, it->ascent); |
2235 it->max_descent = max (it->max_descent, it->descent); | 2235 it->max_descent = max (it->max_descent, it->descent); |
2236 it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent); | 2236 it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent); |
2237 it->max_phys_descent = max (it->max_phys_descent, it->phys_descent); | 2237 it->max_phys_descent = max (it->max_phys_descent, it->phys_descent); |