Mercurial > emacs
changeset 23518:6303fc8c3e7c
(Fx_list_fonts): Access frame parameters throught
general macros. Don't call x_list_font directory, instead call a
function set in list_fonts_func.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 21 Oct 1998 11:50:56 +0000 |
| parents | 73f09e7bc96e |
| children | 78085d485d73 |
| files | src/x-list-font.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/x-list-font.c Wed Oct 21 11:50:56 1998 +0000 +++ b/src/x-list-font.c Wed Oct 21 11:50:56 1998 +0000 @@ -25,7 +25,7 @@ int size, cols; int maxnames; - check_x (); + (*check_window_system_func) (); CHECK_STRING (pattern, 0); if (!NILP (face)) CHECK_SYMBOL (face, 1); @@ -50,7 +50,7 @@ CHECK_LIVE_FRAME (frame, 0); f = XFRAME (frame); } - if (! FRAME_X_P (f)) + if (! FRAME_WINDOW_P (f)) { /* Perhaps we have not yet created any frame. */ f = NULL; @@ -70,9 +70,9 @@ if (face_id < 0 || face_id >= FRAME_N_PARAM_FACES (f) || FRAME_PARAM_FACES (f) [face_id] == 0 || FRAME_PARAM_FACES (f) [face_id]->font == (XFontStruct *) (~0)) - size = f->output_data.x->font->max_bounds.width; + size = FONT_WIDTH (FRAME_FONT (f)); else - size = FRAME_PARAM_FACES (f) [face_id]->font->max_bounds.width; + size = FONT_WIDTH (FRAME_PARAM_FACES (f) [face_id]->font); if (!NILP (width)) size *= XINT (width); @@ -81,7 +81,7 @@ { Lisp_Object args[2]; - args[0] = x_list_fonts (f, pattern, size, maxnames); + args[0] = (*list_fonts_func) (f, pattern, size, maxnames); if (f == NULL) /* We don't have to check fontsets. */ return args[0];