Mercurial > emacs
changeset 6770:a41377a11bf0
(x_char_height): Use line_height field.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 09 Apr 1994 06:34:27 +0000 |
| parents | 55237bfe01e5 |
| children | 0cedd76336a0 |
| files | src/xfns.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Sat Apr 09 06:34:13 1994 +0000 +++ b/src/xfns.c Sat Apr 09 06:34:27 1994 +0000 @@ -2555,7 +2555,7 @@ + (hscroll ? HSCROLL_HEIGHT : 0)), width, height, f->display.x->font, FONT_WIDTH (f->display.x->font), - FONT_HEIGHT (f->display.x->font)); + f->display.x->line_height); XFreePixmap (frame.border); XFreePixmap (frame.background); @@ -2927,7 +2927,7 @@ x_char_height (f) register struct frame *f; { - return FONT_HEIGHT (f->display.x->font); + return f->display.x->line_height; } #if 0 /* These no longer seem like the right way to do things. */ @@ -2946,7 +2946,7 @@ int height; int left = (left_char * FONT_WIDTH (f->display.x->font) + f->display.x->internal_border_width); - int top = (top_char * FONT_HEIGHT (f->display.x->font) + int top = (top_char * f->display.x->line_height + f->display.x->internal_border_width); if (chars < 0) @@ -2954,9 +2954,9 @@ else width = FONT_WIDTH (f->display.x->font) * chars; if (lines < 0) - height = FONT_HEIGHT (f->display.x->font) / 2; + height = f->display.x->line_height / 2; else - height = FONT_HEIGHT (f->display.x->font) * lines; + height = f->display.x->line_height * lines; XDrawRectangle (x_current_display, FRAME_X_WINDOW (f), gc, left, top, width, height); @@ -3074,7 +3074,7 @@ { register int ibw = f->display.x->internal_border_width; register int font_w = FONT_WIDTH (f->display.x->font); - register int font_h = FONT_HEIGHT (f->display.x->font); + register int font_h = f->display.x->line_height; int y = top_y; int x = line_len (y); XPoint *pixel_points @@ -3411,7 +3411,7 @@ XGCValues gc_values; #endif register int previous_y; - register int line = (x_mouse_y + 1) * FONT_HEIGHT (f->display.x->font) + register int line = (x_mouse_y + 1) * f->display.x->line_height + f->display.x->internal_border_width; register int left = f->display.x->internal_border_width + (w->left @@ -3450,7 +3450,7 @@ && x_mouse_y < XINT (w->top) + XINT (w->height) - 1) { previous_y = x_mouse_y; - line = (x_mouse_y + 1) * FONT_HEIGHT (f->display.x->font) + line = (x_mouse_y + 1) * f->display.x->line_height + f->display.x->internal_border_width; XDrawLine (x_current_display, FRAME_X_WINDOW (f), line_gc, left, line, right, line);