X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c3ca24d48c10fb771ee02eb58f7d49bd82d6306e..11dde529083c0b3df2e8e91913426ed4975b77c3:/src/w32font.c diff --git a/src/w32font.c b/src/w32font.c index 365f8b78a5..2046927496 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1,5 +1,5 @@ -/* Font backend for the Microsoft W32 API. - Copyright (C) 2007-2011 Free Software Foundation, Inc. +/* Font backend for the Microsoft Windows API. + Copyright (C) 2007-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -18,10 +18,10 @@ along with GNU Emacs. If not, see . */ #include #include +#include #include #include #include -#include #include "lisp.h" #include "w32term.h" @@ -62,7 +62,6 @@ static Lisp_Object Qserif, Qscript, Qdecorative; static Lisp_Object Qraster, Qoutline, Qunknown; /* antialiasing */ -extern Lisp_Object Qnone; /* reuse from w32fns.c */ static Lisp_Object Qstandard, Qsubpixel, Qnatural; /* languages */ @@ -75,7 +74,7 @@ static Lisp_Object Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu; static Lisp_Object Qkannada, Qmalayalam, Qsinhala, Qthai, Qlao; static Lisp_Object Qtibetan, Qmyanmar, Qgeorgian, Qhangul, Qethiopic; static Lisp_Object Qcherokee, Qcanadian_aboriginal, Qogham, Qrunic; -static Lisp_Object Qkhmer, Qmongolian, Qsymbol, Qbraille, Qhan; +static Lisp_Object Qkhmer, Qmongolian, Qbraille, Qhan; static Lisp_Object Qideographic_description, Qcjk_misc, Qkana, Qbopomofo; static Lisp_Object Qkanbun, Qyi, Qbyzantine_musical_symbol; static Lisp_Object Qmusical_symbol, Qmathematical, Qcham, Qphonetic; @@ -100,7 +99,7 @@ static Lisp_Object Qw32_charset_thai, Qw32_charset_johab, Qw32_charset_mac; /* Font spacing symbols - defined in font.c. */ extern Lisp_Object Qc, Qp, Qm; -static void fill_in_logfont (FRAME_PTR, LOGFONT *, Lisp_Object); +static void fill_in_logfont (struct frame *, LOGFONT *, Lisp_Object); static BYTE w32_antialias_type (Lisp_Object); static Lisp_Object lispy_antialias_type (BYTE); @@ -150,6 +149,7 @@ static BOOL g_b_init_get_outline_metrics_w; static BOOL g_b_init_get_text_metrics_w; static BOOL g_b_init_get_glyph_outline_w; static BOOL g_b_init_get_glyph_outline_w; +static BOOL g_b_init_get_char_width_32_w; typedef UINT (WINAPI * GetOutlineTextMetricsW_Proc) ( HDC hdc, @@ -166,6 +166,11 @@ typedef DWORD (WINAPI * GetGlyphOutlineW_Proc) ( DWORD cbBuffer, LPVOID lpvBuffer, const MAT2 *lpmat2); +typedef BOOL (WINAPI * GetCharWidth32W_Proc) ( + HDC hdc, + UINT uFirstChar, + UINT uLastChar, + LPINT lpBuffer); /* Several "wide" functions we use to support the font backends are unavailable on Windows 9X, unless UNICOWS.DLL is installed (their @@ -235,8 +240,7 @@ get_outline_metrics_w(HDC hdc, UINT cbData, LPOUTLINETEXTMETRICW lpotmw) s_pfn_Get_Outline_Text_MetricsW = (GetOutlineTextMetricsW_Proc) GetProcAddress (hm_unicows, "GetOutlineTextMetricsW"); } - if (s_pfn_Get_Outline_Text_MetricsW == NULL) - abort (); /* cannot happen */ + eassert (s_pfn_Get_Outline_Text_MetricsW != NULL); return s_pfn_Get_Outline_Text_MetricsW (hdc, cbData, lpotmw); } @@ -253,8 +257,7 @@ get_text_metrics_w(HDC hdc, LPTEXTMETRICW lptmw) s_pfn_Get_Text_MetricsW = (GetTextMetricsW_Proc) GetProcAddress (hm_unicows, "GetTextMetricsW"); } - if (s_pfn_Get_Text_MetricsW == NULL) - abort (); /* cannot happen */ + eassert (s_pfn_Get_Text_MetricsW != NULL); return s_pfn_Get_Text_MetricsW (hdc, lptmw); } @@ -272,12 +275,28 @@ get_glyph_outline_w (HDC hdc, UINT uChar, UINT uFormat, LPGLYPHMETRICS lpgm, s_pfn_Get_Glyph_OutlineW = (GetGlyphOutlineW_Proc) GetProcAddress (hm_unicows, "GetGlyphOutlineW"); } - if (s_pfn_Get_Glyph_OutlineW == NULL) - abort (); /* cannot happen */ + eassert (s_pfn_Get_Glyph_OutlineW != NULL); return s_pfn_Get_Glyph_OutlineW (hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, lpmat2); } +static DWORD WINAPI get_char_width_32_w (HDC hdc, UINT uFirstChar, + UINT uLastChar, LPINT lpBuffer) +{ + static GetCharWidth32W_Proc s_pfn_Get_Char_Width_32W = NULL; + HMODULE hm_unicows = NULL; + if (g_b_init_get_char_width_32_w == 0) + { + g_b_init_get_char_width_32_w = 1; + hm_unicows = w32_load_unicows_or_gdi32 (); + if (hm_unicows) + s_pfn_Get_Char_Width_32W = (GetCharWidth32W_Proc) + GetProcAddress (hm_unicows, "GetCharWidth32W"); + } + eassert (s_pfn_Get_Char_Width_32W != NULL); + return s_pfn_Get_Char_Width_32W (hdc, uFirstChar, uLastChar, lpBuffer); +} + static int memq_no_quit (Lisp_Object elt, Lisp_Object list) { @@ -289,29 +308,21 @@ memq_no_quit (Lisp_Object elt, Lisp_Object list) Lisp_Object intern_font_name (char * string) { - Lisp_Object obarray, tem, str; - int len; - - str = DECODE_SYSTEM (build_string (string)); - len = SCHARS (str); - - /* The following code is copied from the function intern (in lread.c). */ - obarray = Vobarray; - if (!VECTORP (obarray) || ASIZE (obarray) == 0) - obarray = check_obarray (obarray); - tem = oblookup (obarray, SDATA (str), len, len); - if (SYMBOLP (tem)) - return tem; - return Fintern (str, obarray); + Lisp_Object str = DECODE_SYSTEM (build_string (string)); + int len = SCHARS (str); + Lisp_Object obarray = check_obarray (Vobarray); + Lisp_Object tem = oblookup (obarray, SDATA (str), len, len); + /* This code is similar to intern function from lread.c. */ + return SYMBOLP (tem) ? tem : Fintern (str, obarray); } /* w32 implementation of get_cache for font backend. Return a cache of font-entities on FRAME. The cache must be a cons whose cdr part is the actual cache area. */ Lisp_Object -w32font_get_cache (FRAME_PTR f) +w32font_get_cache (struct frame *f) { - struct w32_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); + struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); return (dpyinfo->name_list_element); } @@ -321,21 +332,21 @@ w32font_get_cache (FRAME_PTR f) is a vector of font-entities. This is the sole API that allocates font-entities. */ static Lisp_Object -w32font_list (Lisp_Object frame, Lisp_Object font_spec) +w32font_list (struct frame *f, Lisp_Object font_spec) { - Lisp_Object fonts = w32font_list_internal (frame, font_spec, 0); + Lisp_Object fonts = w32font_list_internal (f, font_spec, 0); FONT_ADD_LOG ("w32font-list", font_spec, fonts); return fonts; } /* w32 implementation of match for font backend. Return a font entity most closely matching with FONT_SPEC on - FRAME. The closeness is detemined by the font backend, thus + FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. */ static Lisp_Object -w32font_match (Lisp_Object frame, Lisp_Object font_spec) +w32font_match (struct frame *f, Lisp_Object font_spec) { - Lisp_Object entity = w32font_match_internal (frame, font_spec, 0); + Lisp_Object entity = w32font_match_internal (f, font_spec, 0); FONT_ADD_LOG ("w32font-match", font_spec, entity); return entity; } @@ -344,12 +355,11 @@ w32font_match (Lisp_Object frame, Lisp_Object font_spec) List available families. The value is a list of family names (symbols). */ static Lisp_Object -w32font_list_family (Lisp_Object frame) +w32font_list_family (struct frame *f) { Lisp_Object list = Qnil; LOGFONT font_match_pattern; HDC dc; - FRAME_PTR f = XFRAME (frame); memset (&font_match_pattern, 0, sizeof (font_match_pattern)); font_match_pattern.lfCharSet = DEFAULT_CHARSET; @@ -368,7 +378,7 @@ w32font_list_family (Lisp_Object frame) Open a font specified by FONT_ENTITY on frame F. If the font is scalable, open it with PIXEL_SIZE. */ static Lisp_Object -w32font_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) +w32font_open (struct frame *f, Lisp_Object font_entity, int pixel_size) { Lisp_Object font_object = font_make_object (VECSIZE (struct w32font_info), @@ -389,26 +399,28 @@ w32font_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) return font_object; } -/* w32 implementation of close for font_backend. - Close FONT on frame F. */ +/* w32 implementation of close for font_backend. */ void -w32font_close (FRAME_PTR f, struct font *font) +w32font_close (struct font *font) { - int i; struct w32font_info *w32_font = (struct w32font_info *) font; - /* Delete the GDI font object. */ - DeleteObject (w32_font->hfont); - - /* Free all the cached metrics. */ - if (w32_font->cached_metrics) + if (w32_font->hfont) { - for (i = 0; i < w32_font->n_cache_blocks; i++) - { - xfree (w32_font->cached_metrics[i]); - } - xfree (w32_font->cached_metrics); - w32_font->cached_metrics = NULL; + /* Delete the GDI font object. */ + DeleteObject (w32_font->hfont); + w32_font->hfont = NULL; + + /* Free all the cached metrics. */ + if (w32_font->cached_metrics) + { + int i; + + for (i = 0; i < w32_font->n_cache_blocks; i++) + xfree (w32_font->cached_metrics[i]); + xfree (w32_font->cached_metrics); + w32_font->cached_metrics = NULL; + } } } @@ -462,7 +474,7 @@ w32font_has_char (Lisp_Object entity, int c) Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. - For speed, the gdi backend uses unicode (Emacs calls encode_char + For speed, the gdi backend uses Unicode (Emacs calls encode_char far too often for it to be efficient). But we still need to detect which characters are not supported by the font. */ @@ -529,9 +541,7 @@ w32font_text_extents (struct font *font, unsigned *code, if (!w32_font->cached_metrics[block]) { w32_font->cached_metrics[block] - = xmalloc (CACHE_BLOCKSIZE * sizeof (struct w32_metric_cache)); - memset (w32_font->cached_metrics[block], 0, - CACHE_BLOCKSIZE * sizeof (struct w32_metric_cache)); + = xzalloc (CACHE_BLOCKSIZE * sizeof (struct w32_metric_cache)); } char_metric = w32_font->cached_metrics[block] + pos_in_block; @@ -620,7 +630,7 @@ w32font_text_extents (struct font *font, unsigned *code, total_width = size.cx; } - /* On 95/98/ME, only some unicode functions are available, so fallback + /* On 95/98/ME, only some Unicode functions are available, so fallback on doing a dummy draw to find the total width. */ if (!total_width) { @@ -649,9 +659,9 @@ w32font_text_extents (struct font *font, unsigned *code, /* w32 implementation of draw for font backend. Optional. Draw glyphs between FROM and TO of S->char2b at (X Y) pixel - position of frame F with S->FACE and S->GC. If WITH_BACKGROUND - is nonzero, fill the background in advance. It is assured that - WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars). + position of frame F with S->FACE and S->GC. If WITH_BACKGROUND, + fill the background in advance. It is assured that WITH_BACKGROUND + is false when (FROM > 0 || TO < S->nchars). TODO: Currently this assumes that the colors and fonts are already set in the DC. This seems to be true now, but maybe only due to @@ -661,7 +671,7 @@ w32font_text_extents (struct font *font, unsigned *code, int w32font_draw (struct glyph_string *s, int from, int to, - int x, int y, int with_background) + int x, int y, bool with_background) { UINT options; HRGN orig_clip = NULL; @@ -746,13 +756,13 @@ w32font_free_entity (Lisp_Object entity); storing some data in FACE->extra. If successful, return 0. Otherwise, return -1. static int -w32font_prepare_face (FRAME_PTR f, struct face *face); +w32font_prepare_face (struct frame *f, struct face *face); */ /* w32 implementation of done_face for font backend. Optional. Done FACE for displaying characters by FACE->font on frame F. static void -w32font_done_face (FRAME_PTR f, struct face *face); */ +w32font_done_face (struct frame *f, struct face *face); */ /* w32 implementation of get_bitmap for font backend. Optional. @@ -786,7 +796,7 @@ w32font_free_outline (struct font *font, void *outline); Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if - the operations was successfull. Otherwise return -1. + the operations was successful. Otherwise return -1. static int w32font_anchor_point (struct font *font, unsigned code, int index, int *x, int *y); @@ -818,22 +828,21 @@ static int w32font_otf_drive (struct font *font, Lisp_Object features, Lisp_Object gstring_in, int from, int to, Lisp_Object gstring_out, int idx, - int alternate_subst); + bool alternate_subst); */ /* Internal implementation of w32font_list. Additional parameter opentype_only restricts the returned fonts to opentype fonts, which can be used with the Uniscribe backend. */ Lisp_Object -w32font_list_internal (Lisp_Object frame, Lisp_Object font_spec, int opentype_only) +w32font_list_internal (struct frame *f, Lisp_Object font_spec, int opentype_only) { struct font_callback_data match_data; HDC dc; - FRAME_PTR f = XFRAME (frame); match_data.orig_font_spec = font_spec; match_data.list = Qnil; - match_data.frame = frame; + XSETFRAME (match_data.frame, f); memset (&match_data.pattern, 0, sizeof (LOGFONT)); fill_in_logfont (f, &match_data.pattern, font_spec); @@ -878,14 +887,13 @@ w32font_list_internal (Lisp_Object frame, Lisp_Object font_spec, int opentype_on Additional parameter opentype_only restricts the returned fonts to opentype fonts, which can be used with the Uniscribe backend. */ Lisp_Object -w32font_match_internal (Lisp_Object frame, Lisp_Object font_spec, int opentype_only) +w32font_match_internal (struct frame *f, Lisp_Object font_spec, int opentype_only) { struct font_callback_data match_data; HDC dc; - FRAME_PTR f = XFRAME (frame); match_data.orig_font_spec = font_spec; - match_data.frame = frame; + XSETFRAME (match_data.frame, f); match_data.list = Qnil; memset (&match_data.pattern, 0, sizeof (LOGFONT)); @@ -906,7 +914,7 @@ w32font_match_internal (Lisp_Object frame, Lisp_Object font_spec, int opentype_o } int -w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity, +w32font_open_internal (struct frame *f, Lisp_Object font_entity, int pixel_size, Lisp_Object font_object) { int len, size; @@ -991,6 +999,7 @@ w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity, = DECODE_SYSTEM (build_string (logfont.lfFaceName)); } + font->frame = f; font->max_width = w32_font->metrics.tmMaxCharWidth; /* Parts of Emacs display assume that height = ascent + descent... so height is defined later, after ascent and descent. @@ -1001,11 +1010,9 @@ w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity, font->space_width = font->average_width = w32_font->metrics.tmAveCharWidth; font->vertical_centering = 0; - font->encoding_type = 0; font->baseline_offset = 0; font->relative_compose = 0; font->default_ascent = w32_font->metrics.tmAscent; - font->font_encoder = NULL; font->pixel_size = size; font->driver = &w32font_driver; /* Use format cached during list, as the information we have access to @@ -1153,7 +1160,7 @@ w32_enumfont_pattern_entity (Lisp_Object frame, else ASET (entity, FONT_SIZE_INDEX, make_number (0)); - /* Cache unicode codepoints covered by this font, as there is no other way + /* Cache Unicode codepoints covered by this font, as there is no other way of getting this information easily. */ if (font_type & TRUETYPE_FONTTYPE) { @@ -1284,8 +1291,8 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font, { /* Only truetype fonts will have information about what scripts they support. This probably means the user - will have to force Emacs to use raster, postscript - or atm fonts for non-ASCII text. */ + will have to force Emacs to use raster, PostScript + or ATM fonts for non-ASCII text. */ if (type & TRUETYPE_FONTTYPE) { Lisp_Object support @@ -1404,7 +1411,7 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font, currently appear in fontset.el, so it isn't worth creating a mapping table of codepages/scripts to languages or opening the font to see if there are any language tags - in it that the W32 API does not expose. Fontset + in it that the Windows API does not expose. Fontset spec should have a fallback, as some backends do not recognize language at all. */ return 0; @@ -1450,6 +1457,9 @@ w32font_coverage_ok (FONTSIGNATURE * coverage, BYTE charset) return 1; } +#ifndef WINDOWSNT +#define _strlwr strlwr +#endif /* !WINDOWSNT */ static int check_face_name (LOGFONT *font, char *full_name) @@ -1464,7 +1474,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is installed, we run into problems with the Uniscribe backend which tries to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica - with Arial's characteristics, since that attempt to use Truetype works + with Arial's characteristics, since that attempt to use TrueType works some places, but not others. */ if (!xstrcasecmp (font->lfFaceName, "helvetica")) { @@ -1492,7 +1502,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Callback function for EnumFontFamiliesEx. - * Checks if a font matches everything we are trying to check agaist, + * Checks if a font matches everything we are trying to check against, * and if so, adds it to a list. Both the data we are checking against * and the list to which the fonts are added are passed in via the * lparam argument, in the form of a font_callback_data struct. */ @@ -1514,7 +1524,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, /* Skip non matching fonts. */ /* For uniscribe backend, consider only truetype or opentype fonts - that have some unicode coverage. */ + that have some Unicode coverage. */ if (match_data->opentype_only && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE) && !(font_type & TRUETYPE_FONTTYPE)) @@ -1557,7 +1567,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, Lisp_Object spec_charset = AREF (match_data->orig_font_spec, FONT_REGISTRY_INDEX); - /* iso10646-1 fonts must contain unicode mapping tables. */ + /* iso10646-1 fonts must contain Unicode mapping tables. */ if (EQ (spec_charset, Qiso10646_1)) { if (!is_unicode) @@ -1572,7 +1582,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, && !(physical_font->ntmFontSig.fsUsb[0] & 0x007F001F)) return 1; } - /* unicode-sip fonts must contain characters in unicode plane 2. + /* unicode-sip fonts must contain characters in Unicode plane 2. so look for bit 57 (surrogates) in the Unicode subranges, plus the bits for CJK ranges that include those characters. */ else if (EQ (spec_charset, Qunicode_sip)) @@ -1597,7 +1607,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, ASET (entity, FONT_REGISTRY_INDEX, spec_charset); } /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT - fonts as unicode and skip other charsets. */ + fonts as Unicode and skip other charsets. */ else if (match_data->opentype_only) { if (logical_font->elfLogFont.lfCharSet == ANSI_CHARSET @@ -1640,7 +1650,7 @@ x_to_w32_charset (char * lpcs) if (strncmp (lpcs, "*-#", 3) == 0) return atoi (lpcs + 3); - /* All Windows fonts qualify as unicode. */ + /* All Windows fonts qualify as Unicode. */ if (!strncmp (lpcs, "iso10646", 8)) return DEFAULT_CHARSET; @@ -1925,7 +1935,7 @@ w32_registry (LONG w32_charset, DWORD font_type) { char *charset; - /* If charset is defaulted, charset is unicode or unknown, depending on + /* If charset is defaulted, charset is Unicode or unknown, depending on font type. */ if (w32_charset == DEFAULT_CHARSET) return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown; @@ -1976,10 +1986,10 @@ w32_to_fc_weight (int n) /* Fill in all the available details of LOGFONT from FONT_SPEC. */ static void -fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec) +fill_in_logfont (struct frame *f, LOGFONT *logfont, Lisp_Object font_spec) { Lisp_Object tmp, extra; - int dpi = FRAME_W32_DISPLAY_INFO (f)->resy; + int dpi = FRAME_RES_Y (f); tmp = AREF (font_spec, FONT_DPI_INDEX); if (INTEGERP (tmp)) @@ -2045,8 +2055,11 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec) /* Font families are interned, but allow for strings also in case of user input. */ else if (SYMBOLP (tmp)) - strncpy (logfont->lfFaceName, - SDATA (ENCODE_SYSTEM (SYMBOL_NAME (tmp))), LF_FACESIZE); + { + strncpy (logfont->lfFaceName, + SDATA (ENCODE_SYSTEM (SYMBOL_NAME (tmp))), LF_FACESIZE); + logfont->lfFaceName[LF_FACESIZE-1] = '\0'; + } } tmp = AREF (font_spec, FONT_ADSTYLE_INDEX); @@ -2080,7 +2093,7 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec) { Lisp_Object key, val; key = XCAR (tmp), val = XCDR (tmp); - /* Only use QCscript if charset is not provided, or is unicode + /* Only use QCscript if charset is not provided, or is Unicode and a single script is specified. This is rather crude, and is only used to narrow down the fonts returned where there is a definite match. Some scripts, such as latin, han, @@ -2123,7 +2136,7 @@ static void list_all_matching_fonts (struct font_callback_data *match_data) { HDC dc; - Lisp_Object families = w32font_list_family (match_data->frame); + Lisp_Object families = w32font_list_family (XFRAME (match_data->frame)); struct frame *f = XFRAME (match_data->frame); dc = get_frame_dc (f); @@ -2447,6 +2460,7 @@ compute_metrics (HDC dc, struct w32font_info *w32_font, unsigned int code, GLYPHMETRICS gm; MAT2 transform; unsigned int options = GGO_METRICS; + INT width; if (w32_font->glyph_idx) options |= GGO_GLYPH_INDEX; @@ -2463,6 +2477,13 @@ compute_metrics (HDC dc, struct w32font_info *w32_font, unsigned int code, metrics->width = gm.gmCellIncX; metrics->status = W32METRIC_SUCCESS; } + else if (get_char_width_32_w (dc, code, code, &width) != 0) + { + metrics->lbearing = 0; + metrics->rbearing = width; + metrics->width = width; + metrics->status = W32METRIC_SUCCESS; + } else metrics->status = W32METRIC_FAIL; } @@ -2476,7 +2497,7 @@ If EXCLUDE-PROPORTIONAL is non-nil, exclude proportional fonts in the font selection dialog. */) (Lisp_Object frame, Lisp_Object exclude_proportional) { - FRAME_PTR f = check_x_frame (frame); + struct frame *f = decode_window_system_frame (frame); CHOOSEFONT cf; LOGFONT lf; TEXTMETRIC tm; @@ -2641,7 +2662,6 @@ syms_of_w32font (void) DEFSYM (Qrunic, "runic"); DEFSYM (Qkhmer, "khmer"); DEFSYM (Qmongolian, "mongolian"); - DEFSYM (Qsymbol, "symbol"); DEFSYM (Qbraille, "braille"); DEFSYM (Qhan, "han"); DEFSYM (Qideographic_description, "ideographic-description"); @@ -2738,4 +2758,5 @@ globals_of_w32font (void) g_b_init_get_outline_metrics_w = 0; g_b_init_get_text_metrics_w = 0; g_b_init_get_glyph_outline_w = 0; + g_b_init_get_char_width_32_w = 0; }