This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
#include "w32term.h"
#endif /* HAVE_NTGUI */
-#ifdef MAC_OS
-#include "macterm.h"
-#endif /* MAC_OS */
+#ifdef HAVE_NS
+#include "nsterm.h"
+#endif /* HAVE_NS */
-#ifndef FONT_DEBUG
-#define FONT_DEBUG
+Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
+
+#ifdef HAVE_NS
+extern Lisp_Object Qfontsize;
#endif
-#ifdef FONT_DEBUG
-#undef xassert
-#define xassert(X) do {if (!(X)) abort ();} while (0)
+Lisp_Object Qopentype;
+
+/* Important character set strings. */
+Lisp_Object Qascii_0, Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
+
+#ifdef HAVE_NS
+#define DEFAULT_ENCODING Qiso10646_1
#else
-#define xassert(X) (void) 0
+#define DEFAULT_ENCODING Qiso8859_1
#endif
-int enable_font_backend;
+/* Unicode category `Cf'. */
+static Lisp_Object QCf;
-Lisp_Object Qopentype;
+/* Special vector of zero length. This is repeatedly used by (struct
+ font_driver *)->list when a specified font is not found. */
+static Lisp_Object null_vector;
-/* Important character set symbols. */
-Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
+static Lisp_Object Vfont_weight_table, Vfont_slant_table, Vfont_width_table;
-/* Like CHECK_FONT_SPEC but also validate properties of the font-spec,
- and set X to the validated result. */
+/* Vector of Vfont_weight_table, Vfont_slant_table, and Vfont_width_table. */
+static Lisp_Object font_style_table;
-#define CHECK_VALIDATE_FONT_SPEC(x) \
- do { \
- if (! FONT_SPEC_P (x)) wrong_type_argument (Qfont, x); \
- x = font_prop_validate (x); \
- } while (0)
+/* Structure used for tables mapping weight, slant, and width numeric
+ values and their names. */
-/* Number of pt per inch (from the TeXbook). */
-#define PT_PER_INCH 72.27
+struct table_entry
+{
+ int numeric;
+ /* The first one is a valid name as a face attribute.
+ The second one (if any) is a typical name in XLFD field. */
+ char *names[5];
+ Lisp_Object *symbols;
+};
-/* Return a pixel size (integer) corresponding to POINT size (double)
- on resolution DPI. */
-#define POINT_TO_PIXEL(POINT, DPI) ((POINT) * (DPI) / PT_PER_INCH + 0.5)
+/* Table of weight numeric values and their names. This table must be
+ sorted by numeric values in ascending order. */
-/* Return a point size (double) corresponding to POINT size (integer)
- on resolution DPI. */
-#define PIXEL_TO_POINT(PIXEL, DPI) ((PIXEL) * PT_PER_INCH * 10 / (DPI) + 0.5)
+static struct table_entry weight_table[] =
+{
+ { 0, { "thin" }},
+ { 20, { "ultra-light", "ultralight" }},
+ { 40, { "extra-light", "extralight" }},
+ { 50, { "light" }},
+ { 75, { "semi-light", "semilight", "demilight", "book" }},
+ { 100, { "normal", "medium", "regular" }},
+ { 180, { "semi-bold", "semibold", "demibold", "demi" }},
+ { 200, { "bold" }},
+ { 205, { "extra-bold", "extrabold" }},
+ { 210, { "ultra-bold", "ultrabold", "black" }}
+};
-/* Special string of zero length. It is used to specify a NULL name
- in a font properties (e.g. adstyle). We don't use the symbol of
- NULL name because it's confusing (Lisp printer prints nothing for
- it). */
-Lisp_Object null_string;
+/* Table of slant numeric values and their names. This table must be
+ sorted by numeric values in ascending order. */
-/* Special vector of zero length. This is repeatedly used by (struct
- font_driver *)->list when a specified font is not found. */
-Lisp_Object null_vector;
-
-/* Vector of 3 elements. Each element is an alist for one of font
- style properties (weight, slant, width). Each alist contains a
- mapping between symbolic property values (e.g. `medium' for weight)
- and numeric property values (e.g. 100). So, it looks like this:
- [((thin . 0) ... (heavy . 210))
- ((ro . 0) ... (ot . 210))
- ((ultracondensed . 50) ... (wide . 200))] */
-static Lisp_Object font_style_table;
+static struct table_entry slant_table[] =
+{
+ { 0, { "reverse-oblique", "ro" }},
+ { 10, { "reverse-italic", "ri" }},
+ { 100, { "normal", "r" }},
+ { 200, { "italic" ,"i", "ot" }},
+ { 210, { "oblique", "o" }}
+};
-/* Alist of font family vs the corresponding aliases.
- Each element has this form:
- (FAMILY ALIAS1 ALIAS2 ...) */
+/* Table of width numeric values and their names. This table must be
+ sorted by numeric values in ascending order. */
+
+static struct table_entry width_table[] =
+{
+ { 50, { "ultra-condensed", "ultracondensed" }},
+ { 63, { "extra-condensed", "extracondensed" }},
+ { 75, { "condensed", "compressed", "narrow" }},
+ { 87, { "semi-condensed", "semicondensed", "demicondensed" }},
+ { 100, { "normal", "medium", "regular" }},
+ { 113, { "semi-expanded", "semiexpanded", "demiexpanded" }},
+ { 125, { "expanded" }},
+ { 150, { "extra-expanded", "extraexpanded" }},
+ { 200, { "ultra-expanded", "ultraexpanded", "wide" }}
+};
-static Lisp_Object font_family_alist;
+extern Lisp_Object Qnormal;
/* Symbols representing keys of normal font properties. */
-extern Lisp_Object QCtype, QCfamily, QCweight, QCslant, QCwidth, QCsize, QCname;
-Lisp_Object QCfoundry, QCadstyle, QCregistry, QCextra;
+extern Lisp_Object QCtype, QCfamily, QCweight, QCslant, QCwidth;
+extern Lisp_Object QCheight, QCsize, QCname;
+
+Lisp_Object QCfoundry, QCadstyle, QCregistry;
/* Symbols representing keys of font extra info. */
-Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClanguage, QCscript;
-Lisp_Object QCantialias;
+Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth;
+Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec;
/* Symbols representing values of font spacing property. */
Lisp_Object Qc, Qm, Qp, Qd;
+Lisp_Object Vfont_encoding_alist;
+
/* Alist of font registry symbol and the corresponding charsets
information. The information is retrieved from
Vfont_encoding_alist on demand.
here. */
static struct font_driver_list *font_driver_list;
+\f
+
+/* Creaters of font-related Lisp object. */
+
+Lisp_Object
+font_make_spec ()
+{
+ Lisp_Object font_spec;
+ struct font_spec *spec
+ = ((struct font_spec *)
+ allocate_pseudovector (VECSIZE (struct font_spec),
+ FONT_SPEC_MAX, PVEC_FONT));
+ XSETFONT (font_spec, spec);
+ return font_spec;
+}
+
+Lisp_Object
+font_make_entity ()
+{
+ Lisp_Object font_entity;
+ struct font_entity *entity
+ = ((struct font_entity *)
+ allocate_pseudovector (VECSIZE (struct font_entity),
+ FONT_ENTITY_MAX, PVEC_FONT));
+ XSETFONT (font_entity, entity);
+ return font_entity;
+}
+
+/* Create a font-object whose structure size is SIZE. If ENTITY is
+ not nil, copy properties from ENTITY to the font-object. If
+ PIXELSIZE is positive, set the `size' property to PIXELSIZE. */
+Lisp_Object
+font_make_object (size, entity, pixelsize)
+ int size;
+ Lisp_Object entity;
+ int pixelsize;
+{
+ Lisp_Object font_object;
+ struct font *font
+ = (struct font *) allocate_pseudovector (size, FONT_OBJECT_MAX, PVEC_FONT);
+ int i;
+
+ XSETFONT (font_object, font);
+
+ if (! NILP (entity))
+ {
+ for (i = 1; i < FONT_SPEC_MAX; i++)
+ font->props[i] = AREF (entity, i);
+ if (! NILP (AREF (entity, FONT_EXTRA_INDEX)))
+ font->props[FONT_EXTRA_INDEX]
+ = Fcopy_sequence (AREF (entity, FONT_EXTRA_INDEX));
+ }
+ if (size > 0)
+ font->props[FONT_SIZE_INDEX] = make_number (pixelsize);
+ return font_object;
+}
+
+\f
+
static int font_pixel_size P_ ((FRAME_PTR f, Lisp_Object));
-static Lisp_Object prop_name_to_numeric P_ ((enum font_property_index,
- Lisp_Object));
-static Lisp_Object prop_numeric_to_name P_ ((enum font_property_index, int));
static Lisp_Object font_open_entity P_ ((FRAME_PTR, Lisp_Object, int));
-static void build_font_family_alist P_ ((void));
+static Lisp_Object font_matching_entity P_ ((FRAME_PTR, Lisp_Object *,
+ Lisp_Object));
/* Number of registered font drivers. */
static int num_font_drivers;
+
+/* Return a Lispy value of a font property value at STR and LEN bytes.
+ If STR is "*", it returns nil.
+ If FORCE_SYMBOL is zero and all characters in STR are digits, it
+ returns an integer. Otherwise, it returns a symbol interned from
+ STR. */
+
+Lisp_Object
+font_intern_prop (str, len, force_symbol)
+ char *str;
+ int len;
+ int force_symbol;
+{
+ int i;
+ Lisp_Object tem;
+ Lisp_Object obarray;
+
+ if (len == 1 && *str == '*')
+ return Qnil;
+ if (!force_symbol && len >=1 && isdigit (*str))
+ {
+ for (i = 1; i < len; i++)
+ if (! isdigit (str[i]))
+ break;
+ if (i == len)
+ return make_number (atoi (str));
+ }
+
+ /* The following code is copied from the function intern (in lread.c). */
+ obarray = Vobarray;
+ if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
+ obarray = check_obarray (obarray);
+ tem = oblookup (obarray, str, len, len);
+ if (SYMBOLP (tem))
+ return tem;
+ return Fintern (make_unibyte_string (str, len), obarray);
+}
+
/* Return a pixel size of font-spec SPEC on frame F. */
static int
FRAME_PTR f;
Lisp_Object spec;
{
+#ifdef HAVE_WINDOW_SYSTEM
Lisp_Object size = AREF (spec, FONT_SIZE_INDEX);
double point_size;
- int pixel_size, dpi;
- Lisp_Object extra, val;
+ int dpi, pixel_size;
+ Lisp_Object val;
if (INTEGERP (size))
return XINT (size);
if (NILP (size))
return 0;
+ font_assert (FLOATP (size));
point_size = XFLOAT_DATA (size);
- extra = AREF (spec, FONT_EXTRA_INDEX);
- val = assq_no_quit (QCdpi, extra);
- if (CONSP (val))
- {
- if (INTEGERP (XCDR (val)))
- dpi = XINT (XCDR (val));
- else
- dpi = XFLOAT_DATA (XCDR (val)) + 0.5;
- }
+ val = AREF (spec, FONT_DPI_INDEX);
+ if (INTEGERP (val))
+ dpi = XINT (val);
else
dpi = f->resy;
pixel_size = POINT_TO_PIXEL (point_size, dpi);
return pixel_size;
-}
-
-/* Return a numeric value corresponding to PROP's NAME (symbol). If
- NAME is not registered in font_style_table, return Qnil. PROP must
- be one of FONT_{WEIGHT|SLANT|SWIDTH}_INDEX. */
-
-static Lisp_Object
-prop_name_to_numeric (prop, name)
- enum font_property_index prop;
- Lisp_Object name;
-{
- int table_index = prop - FONT_WEIGHT_INDEX;
- Lisp_Object val;
-
- val = assq_no_quit (name, AREF (font_style_table, table_index));
- return (NILP (val) ? Qnil : XCDR (val));
+#else
+ return 1;
+#endif
}
-/* Return a name (symbol) corresponding to PROP's NUMERIC value. If
- no name is registered for NUMERIC in font_style_table, return a
- symbol of integer name (e.g. `123'). PROP must be one of
- FONT_{WEIGHT|SLANT|SWIDTH}_INDEX. */
+/* Return a value of PROP's VAL (symbol or integer) to be stored in a
+ font vector. If VAL is not valid (i.e. not registered in
+ font_style_table), return -1 if NOERROR is zero, and return a
+ proper index if NOERROR is nonzero. In that case, register VAL in
+ font_style_table if VAL is a symbol, and return a closest index if
+ VAL is an integer. */
-static Lisp_Object
-prop_numeric_to_name (prop, numeric)
+int
+font_style_to_value (prop, val, noerror)
enum font_property_index prop;
- int numeric;
+ Lisp_Object val;
+ int noerror;
{
- int table_index = prop - FONT_WEIGHT_INDEX;
- Lisp_Object table = AREF (font_style_table, table_index);
- char buf[10];
+ Lisp_Object table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
+ int len = ASIZE (table);
+ int i, j;
+
+ if (SYMBOLP (val))
+ {
+ unsigned char *s;
+ Lisp_Object args[2], elt;
- while (! NILP (table))
+ /* At first try exact match. */
+ for (i = 0; i < len; i++)
+ for (j = 1; j < ASIZE (AREF (table, i)); j++)
+ if (EQ (val, AREF (AREF (table, i), j)))
+ return ((XINT (AREF (AREF (table, i), 0)) << 8)
+ | (i << 4) | (j - 1));
+ /* Try also with case-folding match. */
+ s = SDATA (SYMBOL_NAME (val));
+ for (i = 0; i < len; i++)
+ for (j = 1; j < ASIZE (AREF (table, i)); j++)
+ {
+ elt = AREF (AREF (table, i), j);
+ if (xstrcasecmp (s, SDATA (SYMBOL_NAME (elt))) == 0)
+ return ((XINT (AREF (AREF (table, i), 0)) << 8)
+ | (i << 4) | (j - 1));
+ }
+ if (! noerror)
+ return -1;
+ if (len == 255)
+ abort ();
+ elt = Fmake_vector (make_number (2), make_number (255));
+ ASET (elt, 1, val);
+ args[0] = table;
+ args[1] = Fmake_vector (make_number (1), elt);
+ ASET (font_style_table, prop - FONT_WEIGHT_INDEX, Fvconcat (2, args));
+ return (255 << 8) | (i << 4);
+ }
+ else
{
- if (XINT (XCDR (XCAR (table))) >= numeric)
+ int i, last_n;
+ int numeric = XINT (val);
+
+ for (i = 0, last_n = -1; i < len; i++)
{
- if (XINT (XCDR (XCAR (table))) == numeric)
- return XCAR (XCAR (table));
- else
- break;
+ int n = XINT (AREF (AREF (table, i), 0));
+
+ if (numeric == n)
+ return (n << 8) | (i << 4);
+ if (numeric < n)
+ {
+ if (! noerror)
+ return -1;
+ return ((i == 0 || n - numeric < numeric - last_n)
+ ? (n << 8) | (i << 4): (last_n << 8 | ((i - 1) << 4)));
+ }
+ last_n = n;
}
- table = XCDR (table);
+ if (! noerror)
+ return -1;
+ return ((last_n << 8) | ((i - 1) << 4));
}
- sprintf (buf, "%d", numeric);
- return intern (buf);
}
-
-/* Return a symbol whose name is STR (length LEN). If STR contains
- uppercase letters, downcase them in advance. */
-
Lisp_Object
-intern_downcase (str, len)
- char *str;
- int len;
+font_style_symbolic (font, prop, for_face)
+ Lisp_Object font;
+ enum font_property_index prop;
+ int for_face;
{
- char *buf;
+ Lisp_Object val = AREF (font, prop);
+ Lisp_Object table, elt;
int i;
- for (i = 0; i < len; i++)
- if (isupper (str[i]))
- break;
- if (i == len)
- return Fintern (make_unibyte_string (str, len), Qnil);
- buf = alloca (len);
- if (! buf)
- return Fintern (null_string, Qnil);
- bcopy (str, buf, len);
- for (; i < len; i++)
- if (isascii (buf[i]))
- buf[i] = tolower (buf[i]);
- return Fintern (make_unibyte_string (buf, len), Qnil);
+ if (NILP (val))
+ return Qnil;
+ table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
+ i = XINT (val) & 0xFF;
+ font_assert (((i >> 4) & 0xF) < ASIZE (table));
+ elt = AREF (table, ((i >> 4) & 0xF));
+ font_assert ((i & 0xF) + 1 < ASIZE (elt));
+ return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1));
}
extern Lisp_Object Vface_alternative_font_family_alist;
-/* Setup font_family_alist of the form:
- ((FAMILY-SYMBOL ALIAS-SYMBOL ...) ...)
- from Vface_alternative_font_family_alist of the form:
- ((FAMILY-STRING ALIAS-STRING ...) ...) */
+extern Lisp_Object find_font_encoding P_ ((Lisp_Object));
+
-static void
-build_font_family_alist ()
+/* Return ENCODING or a cons of ENCODING and REPERTORY of the font
+ FONTNAME. ENCODING is a charset symbol that specifies the encoding
+ of the font. REPERTORY is a charset symbol or nil. */
+
+Lisp_Object
+find_font_encoding (fontname)
+ Lisp_Object fontname;
{
- Lisp_Object alist = Vface_alternative_font_family_alist;
+ Lisp_Object tail, elt;
- for (; CONSP (alist); alist = XCDR (alist))
+ for (tail = Vfont_encoding_alist; CONSP (tail); tail = XCDR (tail))
{
- Lisp_Object tail, elt;
-
- for (tail = XCAR (alist), elt = Qnil ; CONSP (tail); tail = XCDR (tail))
- elt = nconc2 (elt, Fcons (Fintern (XCAR (tail), Qnil), Qnil));
- font_family_alist = Fcons (elt, font_family_alist);
+ elt = XCAR (tail);
+ if (CONSP (elt)
+ && STRINGP (XCAR (elt))
+ && fast_string_match_ignore_case (XCAR (elt), fontname) >= 0
+ && (SYMBOLP (XCDR (elt))
+ ? CHARSETP (XCDR (elt))
+ : CONSP (XCDR (elt)) && CHARSETP (XCAR (XCDR (elt)))))
+ return (XCDR (elt));
}
+ /* We don't know the encoding of this font. Let's assume `ascii'. */
+ return Qascii;
}
-extern Lisp_Object find_font_encoding P_ ((Lisp_Object));
-
/* Return encoding charset and repertory charset for REGISTRY in
ENCODING and REPERTORY correspondingly. If correct information for
REGISTRY is available, return 0. Otherwise return -1. */
Lisp_Object val;
int encoding_id, repertory_id;
- val = assq_no_quit (registry, font_charset_alist);
+ val = Fassoc_string (registry, font_charset_alist, Qt);
if (! NILP (val))
{
val = XCDR (val);
/* Font property value validaters. See the comment of
font_property_table for the meaning of the arguments. */
+static Lisp_Object font_prop_validate P_ ((int, Lisp_Object, Lisp_Object));
static Lisp_Object font_prop_validate_symbol P_ ((Lisp_Object, Lisp_Object));
static Lisp_Object font_prop_validate_style P_ ((Lisp_Object, Lisp_Object));
static Lisp_Object font_prop_validate_non_neg P_ ((Lisp_Object, Lisp_Object));
static Lisp_Object font_prop_validate_spacing P_ ((Lisp_Object, Lisp_Object));
-static int get_font_prop_index P_ ((Lisp_Object, int));
-static Lisp_Object font_prop_validate P_ ((Lisp_Object));
+static int get_font_prop_index P_ ((Lisp_Object));
static Lisp_Object
font_prop_validate_symbol (prop, val)
Lisp_Object prop, val;
{
- if (EQ (prop, QCotf))
- return (SYMBOLP (val) ? val : Qerror);
if (STRINGP (val))
- val = (SCHARS (val) == 0 ? null_string
- : intern_downcase ((char *) SDATA (val), SBYTES (val)));
- else if (SYMBOLP (val))
- {
- if (SCHARS (SYMBOL_NAME (val)) == 0)
- val = null_string;
- }
- else
+ val = Fintern (val, Qnil);
+ if (! SYMBOLP (val))
val = Qerror;
+ else if (EQ (prop, QCregistry))
+ val = Fintern (Fdowncase (SYMBOL_NAME (val)), Qnil);
return val;
}
+
static Lisp_Object
-font_prop_validate_style (prop, val)
- Lisp_Object prop, val;
+font_prop_validate_style (style, val)
+ Lisp_Object style, val;
{
- if (! INTEGERP (val))
+ enum font_property_index prop = (EQ (style, QCweight) ? FONT_WEIGHT_INDEX
+ : EQ (style, QCslant) ? FONT_SLANT_INDEX
+ : FONT_WIDTH_INDEX);
+ int n;
+ if (INTEGERP (val))
{
- if (STRINGP (val))
- val = intern_downcase ((char *) SDATA (val), SBYTES (val));
- if (! SYMBOLP (val))
+ n = XINT (val);
+ if (((n >> 4) & 0xF)
+ >= ASIZE (AREF (font_style_table, prop - FONT_WEIGHT_INDEX)))
val = Qerror;
else
{
- enum font_property_index prop_index
- = (EQ (prop, QCweight) ? FONT_WEIGHT_INDEX
- : EQ (prop, QCslant) ? FONT_SLANT_INDEX
- : FONT_WIDTH_INDEX);
+ Lisp_Object elt = AREF (AREF (font_style_table, prop - FONT_WEIGHT_INDEX), (n >> 4) & 0xF);
- val = prop_name_to_numeric (prop_index, val);
- if (NILP (val))
+ if ((n & 0xF) + 1 >= ASIZE (elt))
+ val = Qerror;
+ else if (XINT (AREF (elt, 0)) != (n >> 8))
val = Qerror;
}
}
+ else if (SYMBOLP (val))
+ {
+ int n = font_style_to_value (prop, val, 0);
+
+ val = n >= 0 ? make_number (n) : Qerror;
+ }
+ else
+ val = Qerror;
return val;
}
{
if (NILP (val) || (NATNUMP (val) && XINT (val) <= FONT_SPACING_CHARCELL))
return val;
- if (EQ (val, Qc))
- return make_number (FONT_SPACING_CHARCELL);
- if (EQ (val, Qm))
- return make_number (FONT_SPACING_MONO);
- if (EQ (val, Qp))
- return make_number (FONT_SPACING_PROPORTIONAL);
+ if (SYMBOLP (val) && SBYTES (SYMBOL_NAME (val)) == 1)
+ {
+ char spacing = SDATA (SYMBOL_NAME (val))[0];
+
+ if (spacing == 'c' || spacing == 'C')
+ return make_number (FONT_SPACING_CHARCELL);
+ if (spacing == 'm' || spacing == 'M')
+ return make_number (FONT_SPACING_MONO);
+ if (spacing == 'p' || spacing == 'P')
+ return make_number (FONT_SPACING_PROPORTIONAL);
+ if (spacing == 'd' || spacing == 'D')
+ return make_number (FONT_SPACING_DUAL);
+ }
return Qerror;
}
{ &QCslant, font_prop_validate_style },
{ &QCwidth, font_prop_validate_style },
{ &QCsize, font_prop_validate_non_neg },
- { &QClanguage, font_prop_validate_symbol },
- { &QCscript, font_prop_validate_symbol },
{ &QCdpi, font_prop_validate_non_neg },
{ &QCspacing, font_prop_validate_spacing },
- { &QCscalable, NULL },
- { &QCotf, font_prop_validate_otf },
- { &QCantialias, font_prop_validate_symbol }
+ { &QCavgwidth, font_prop_validate_non_neg },
+ /* The order of the above entries must match with enum
+ font_property_index. */
+ { &QClang, font_prop_validate_symbol },
+ { &QCscript, font_prop_validate_symbol },
+ { &QCotf, font_prop_validate_otf }
};
/* Size (number of elements) of the above table. */
((sizeof font_property_table) / (sizeof *font_property_table))
/* Return an index number of font property KEY or -1 if KEY is not an
- already known property. Start searching font_property_table from
- index FROM (which is 0 or FONT_EXTRA_INDEX). */
+ already known property. */
static int
-get_font_prop_index (key, from)
+get_font_prop_index (key)
Lisp_Object key;
- int from;
{
- for (; from < FONT_PROPERTY_TABLE_SIZE; from++)
- if (EQ (key, *font_property_table[from].key))
- return from;
+ int i;
+
+ for (i = 0; i < FONT_PROPERTY_TABLE_SIZE; i++)
+ if (EQ (key, *font_property_table[i].key))
+ return i;
return -1;
}
-/* Validate font properties in SPEC (vector) while updating elements
- to regularized values. Signal an error if an invalid property is
- found. */
+/* Validate the font property. The property key is specified by the
+ symbol PROP, or the index IDX (if PROP is nil). If VAL is invalid,
+ signal an error. The value is VAL or the regularized one. */
static Lisp_Object
-font_prop_validate (spec)
- Lisp_Object spec;
+font_prop_validate (idx, prop, val)
+ int idx;
+ Lisp_Object prop, val;
{
- int i;
- Lisp_Object prop, val, extra;
+ Lisp_Object validated;
- for (i = FONT_TYPE_INDEX; i < FONT_EXTRA_INDEX; i++)
- {
- if (! NILP (AREF (spec, i)))
- {
- prop = *font_property_table[i].key;
- val = (font_property_table[i].validater) (prop, AREF (spec, i));
- if (EQ (val, Qerror))
- Fsignal (Qfont, list2 (build_string ("invalid font property"),
- Fcons (prop, AREF (spec, i))));
- ASET (spec, i, val);
- }
- }
- for (extra = AREF (spec, FONT_EXTRA_INDEX);
- CONSP (extra); extra = XCDR (extra))
+ if (NILP (val))
+ return val;
+ if (NILP (prop))
+ prop = *font_property_table[idx].key;
+ else
{
- Lisp_Object elt = XCAR (extra);
-
- prop = XCAR (elt);
- i = get_font_prop_index (prop, FONT_EXTRA_INDEX);
- if (i >= 0
- && font_property_table[i].validater)
- {
- val = (font_property_table[i].validater) (prop, XCDR (elt));
- if (EQ (val, Qerror))
- Fsignal (Qfont, list2 (build_string ("invalid font property"),
- elt));
- XSETCDR (elt, val);
- }
+ idx = get_font_prop_index (prop);
+ if (idx < 0)
+ return val;
}
- return spec;
+ validated = (font_property_table[idx].validater) (prop, val);
+ if (EQ (validated, Qerror))
+ signal_error ("invalid font property", Fcons (prop, val));
+ return validated;
}
-/* Store VAL as a value of extra font property PROP in FONT. */
+
+/* Store VAL as a value of extra font property PROP in FONT while
+ keeping the sorting order. Don't check the validity of VAL. */
Lisp_Object
font_put_extra (font, prop, val)
if (NILP (slot))
{
- extra = Fcons (Fcons (prop, val), extra);
- ASET (font, FONT_EXTRA_INDEX, extra);
+ Lisp_Object prev = Qnil;
+
+ while (CONSP (extra)
+ && NILP (Fstring_lessp (prop, XCAR (XCAR (extra)))))
+ prev = extra, extra = XCDR (extra);
+ if (NILP (prev))
+ ASET (font, FONT_EXTRA_INDEX, Fcons (Fcons (prop, val), extra));
+ else
+ XSETCDR (prev, Fcons (Fcons (prop, val), extra));
return val;
}
XSETCDR (slot, val);
\f
/* Font name parser and unparser */
-static Lisp_Object intern_font_field P_ ((char *, int));
static int parse_matrix P_ ((char *));
static int font_expand_wildcards P_ ((Lisp_Object *, int));
static int font_parse_name P_ ((char *, Lisp_Object));
};
-/* Return a Lispy value of a XLFD font field at STR and LEN bytes.
- If LEN is zero, it returns `null_string'.
- If STR is "*", it returns nil.
- If all characters in STR are digits, it returns an integer.
- Otherwise, it returns a symbol interned from downcased STR. */
-
-static Lisp_Object
-intern_font_field (str, len)
- char *str;
- int len;
-{
- int i;
-
- if (len == 0)
- return null_string;
- if (*str == '*' && len == 1)
- return Qnil;
- if (isdigit (*str))
- {
- for (i = 1; i < len; i++)
- if (! isdigit (str[i]))
- break;
- if (i == len)
- return make_number (atoi (str));
- }
- return intern_downcase (str, len);
-}
-
/* Parse P pointing the pixel/point size field of the form
`[A B C D]' which specifies a transformation matrix:
from = XLFD_POINT_INDEX, to = XLFD_AVGWIDTH_INDEX,
mask = XLFD_LARGENUM_MASK;
}
- else if (EQ (val, null_string))
+ else if (SBYTES (SYMBOL_NAME (val)) == 0)
from = XLFD_FOUNDRY_INDEX, to = XLFD_ADSTYLE_INDEX,
mask = XLFD_NULL_MASK;
else if (i == 0)
}
else if (range_from <= XLFD_WEIGHT_INDEX
&& range_to >= XLFD_WEIGHT_INDEX
- && !NILP (prop_name_to_numeric (FONT_WEIGHT_INDEX, val)))
+ && FONT_WEIGHT_NAME_NUMERIC (val) >= 0)
from = to = XLFD_WEIGHT_INDEX, mask = XLFD_WEIGHT_MASK;
else if (range_from <= XLFD_SLANT_INDEX
&& range_to >= XLFD_SLANT_INDEX
- && !NILP (prop_name_to_numeric (FONT_SLANT_INDEX, val)))
+ && FONT_SLANT_NAME_NUMERIC (val) >= 0)
from = to = XLFD_SLANT_INDEX, mask = XLFD_SLANT_MASK;
else if (range_from <= XLFD_SWIDTH_INDEX
&& range_to >= XLFD_SWIDTH_INDEX
- && !NILP (prop_name_to_numeric (FONT_WIDTH_INDEX, val)))
+ && FONT_WIDTH_NAME_NUMERIC (val) >= 0)
from = to = XLFD_SWIDTH_INDEX, mask = XLFD_SWIDTH_MASK;
else
{
#endif
+
/* Parse NAME (null terminated) as XLFD and store information in FONT
(font-spec or font-entity). Size property of FONT is set as
follows:
FONT is usually a font-spec, but when this function is called from
X font backend driver, it is a font-entity. In that case, NAME is
- a fully specified XLFD, and we set FONT_EXTRA_INDEX of FONT to a
- symbol RESX-RESY-SPACING-AVGWIDTH.
-*/
+ a fully specified XLFD. */
int
font_parse_xlfd (name, font)
Lisp_Object font;
{
int len = strlen (name);
- int i, j;
- Lisp_Object dpi, spacing;
- int avgwidth;
+ int i, j, n;
char *f[XLFD_LAST_INDEX + 1];
Lisp_Object val;
char *p;
else
i = 0;
for (p = name + i; *p; p++)
- if (*p == '-' && i < XLFD_LAST_INDEX)
- f[i++] = p + 1;
- f[i] = p;
+ if (*p == '-')
+ {
+ f[i++] = p + 1;
+ if (i == XLFD_LAST_INDEX)
+ break;
+ }
+ f[i] = name + len;
- dpi = spacing = Qnil;
- avgwidth = -1;
+#define INTERN_FIELD(N) font_intern_prop (f[N], f[(N) + 1] - 1 - f[N], 0)
+#define INTERN_FIELD_SYM(N) font_intern_prop (f[N], f[(N) + 1] - 1 - f[N], 1)
if (i == XLFD_LAST_INDEX)
{
+ /* Fully specified XLFD. */
int pixel_size;
- /* Fully specified XLFD. */
- for (i = 0, j = FONT_FOUNDRY_INDEX; i < XLFD_WEIGHT_INDEX; i++, j++)
- {
- val = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
- if (! NILP (val))
- ASET (font, j, val);
- }
- for (j = FONT_WEIGHT_INDEX; i < XLFD_ADSTYLE_INDEX; i++, j++)
+ ASET (font, FONT_FOUNDRY_INDEX, INTERN_FIELD_SYM (XLFD_FOUNDRY_INDEX));
+ ASET (font, FONT_FAMILY_INDEX, INTERN_FIELD_SYM (XLFD_FAMILY_INDEX));
+ for (i = XLFD_WEIGHT_INDEX, j = FONT_WEIGHT_INDEX;
+ i <= XLFD_SWIDTH_INDEX; i++, j++)
{
- val = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
+ val = INTERN_FIELD_SYM (i);
if (! NILP (val))
{
- Lisp_Object numeric = prop_name_to_numeric (j, val);
-
- if (INTEGERP (numeric))
- val = numeric;
- ASET (font, j, val);
+ if ((n = font_style_to_value (j, INTERN_FIELD_SYM (i), 0)) < 0)
+ return -1;
+ ASET (font, j, make_number (n));
}
}
- val = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
- if (! NILP (val))
- ASET (font, FONT_ADSTYLE_INDEX, val);
- i = XLFD_REGISTRY_INDEX;
- val = intern_font_field (f[i], f[i + 2] - f[i]);
- if (! NILP (val))
- ASET (font, FONT_REGISTRY_INDEX, val);
-
+ ASET (font, FONT_ADSTYLE_INDEX, INTERN_FIELD_SYM (XLFD_ADSTYLE_INDEX));
+ if (strcmp (f[XLFD_REGISTRY_INDEX], "*-*") == 0)
+ ASET (font, FONT_REGISTRY_INDEX, Qnil);
+ else
+ ASET (font, FONT_REGISTRY_INDEX,
+ font_intern_prop (f[XLFD_REGISTRY_INDEX],
+ f[XLFD_LAST_INDEX] - f[XLFD_REGISTRY_INDEX],
+ 1));
p = f[XLFD_PIXEL_INDEX];
if (*p == '[' && (pixel_size = parse_matrix (p)) >= 0)
ASET (font, FONT_SIZE_INDEX, make_number (pixel_size));
else
{
- i = XLFD_PIXEL_INDEX;
- val = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
- if (! NILP (val))
+ val = INTERN_FIELD (XLFD_PIXEL_INDEX);
+ if (INTEGERP (val))
ASET (font, FONT_SIZE_INDEX, val);
else
{
double point_size = -1;
- xassert (FONT_SPEC_P (font));
+ font_assert (FONT_SPEC_P (font));
p = f[XLFD_POINT_INDEX];
if (*p == '[')
point_size = parse_matrix (p);
point_size = atoi (p), point_size /= 10;
if (point_size >= 0)
ASET (font, FONT_SIZE_INDEX, make_float (point_size));
- else
- {
- i = XLFD_PIXEL_INDEX;
- val = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
- if (! NILP (val))
- ASET (font, FONT_SIZE_INDEX, val);
- }
}
}
- /* Parse RESX, RESY, SPACING, and AVGWIDTH. */
- if (FONT_ENTITY_P (font))
+ ASET (font, FONT_DPI_INDEX, INTERN_FIELD (XLFD_RESY_INDEX));
+ val = INTERN_FIELD (XLFD_SPACING_INDEX);
+ if (! NILP (val))
{
- i = XLFD_RESX_INDEX;
- ASET (font, FONT_EXTRA_INDEX,
- intern_font_field (f[i], f[XLFD_REGISTRY_INDEX] - 1 - f[i]));
- eassert (font_check_xlfd_parse (font, name));
- return 0;
+ val = font_prop_validate_spacing (QCspacing, val);
+ if (! INTEGERP (val))
+ return -1;
+ ASET (font, FONT_SPACING_INDEX, val);
}
-
- /* Here we just setup DPI, SPACING, and AVGWIDTH. They are set
- in FONT_EXTRA_INDEX later. */
- i = XLFD_RESX_INDEX;
- dpi = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
- i = XLFD_SPACING_INDEX;
- spacing = intern_font_field (f[i], f[i + 1] - 1 - f[i]);
p = f[XLFD_AVGWIDTH_INDEX];
if (*p == '~')
p++;
- if (isdigit (*p))
- avgwidth = atoi (p);
+ ASET (font, FONT_AVGWIDTH_INDEX,
+ font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0));
}
else
{
int wild_card_found = 0;
Lisp_Object prop[XLFD_LAST_INDEX];
+ if (FONT_ENTITY_P (font))
+ return -1;
for (j = 0; j < i; j++)
{
if (*f[j] == '*')
prop[j] = Qnil;
wild_card_found = 1;
}
- else if (isdigit (*f[j]))
- {
- for (p = f[j] + 1; isdigit (*p); p++);
- if (*p && *p != '-')
- prop[j] = intern_downcase (f[j], p - f[j]);
- else
- prop[j] = make_number (atoi (f[j]));
- }
else if (j + 1 < i)
- prop[j] = intern_font_field (f[j], f[j + 1] - 1 - f[j]);
+ prop[j] = INTERN_FIELD (j);
else
- prop[j] = intern_font_field (f[j], f[i] - f[j]);
+ prop[j] = font_intern_prop (f[j], f[i] - f[j], 0);
}
if (! wild_card_found)
return -1;
if (font_expand_wildcards (prop, i) < 0)
return -1;
- for (i = 0, j = FONT_FOUNDRY_INDEX; i < XLFD_WEIGHT_INDEX; i++, j++)
- if (! NILP (prop[i]))
- ASET (font, j, prop[i]);
- for (j = FONT_WEIGHT_INDEX; i < XLFD_ADSTYLE_INDEX; i++, j++)
+ ASET (font, FONT_FOUNDRY_INDEX, prop[XLFD_FOUNDRY_INDEX]);
+ ASET (font, FONT_FAMILY_INDEX, prop[XLFD_FAMILY_INDEX]);
+ for (i = XLFD_WEIGHT_INDEX, j = FONT_WEIGHT_INDEX;
+ i <= XLFD_SWIDTH_INDEX; i++, j++)
if (! NILP (prop[i]))
- ASET (font, j, prop[i]);
- if (! NILP (prop[XLFD_ADSTYLE_INDEX]))
- ASET (font, FONT_ADSTYLE_INDEX, prop[XLFD_ADSTYLE_INDEX]);
+ {
+ if ((n = font_style_to_value (j, prop[i], 1)) < 0)
+ return -1;
+ ASET (font, j, make_number (n));
+ }
+ ASET (font, FONT_ADSTYLE_INDEX, prop[XLFD_ADSTYLE_INDEX]);
val = prop[XLFD_REGISTRY_INDEX];
if (NILP (val))
{
val = prop[XLFD_ENCODING_INDEX];
if (! NILP (val))
- val = Fintern (concat2 (build_string ("*-"), SYMBOL_NAME (val)),
- Qnil);
+ val = concat2 (build_string ("*-"), SYMBOL_NAME (val));
}
else if (NILP (prop[XLFD_ENCODING_INDEX]))
- val = Fintern (concat2 (SYMBOL_NAME (val), build_string ("-*")),
- Qnil);
+ val = concat2 (SYMBOL_NAME (val), build_string ("-*"));
else
- val = Fintern (concat3 (SYMBOL_NAME (val), build_string ("-"),
- SYMBOL_NAME (prop[XLFD_ENCODING_INDEX])),
- Qnil);
+ val = concat3 (SYMBOL_NAME (val), build_string ("-"),
+ SYMBOL_NAME (prop[XLFD_ENCODING_INDEX]));
if (! NILP (val))
- ASET (font, FONT_REGISTRY_INDEX, val);
+ ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil));
if (INTEGERP (prop[XLFD_PIXEL_INDEX]))
ASET (font, FONT_SIZE_INDEX, prop[XLFD_PIXEL_INDEX]);
ASET (font, FONT_SIZE_INDEX, make_float (point_size / 10));
}
- dpi = prop[XLFD_RESX_INDEX];
- spacing = prop[XLFD_SPACING_INDEX];
+ if (INTEGERP (prop[XLFD_RESX_INDEX]))
+ ASET (font, FONT_DPI_INDEX, prop[XLFD_RESY_INDEX]);
+ if (! NILP (prop[XLFD_SPACING_INDEX]))
+ {
+ val = font_prop_validate_spacing (QCspacing,
+ prop[XLFD_SPACING_INDEX]);
+ if (! INTEGERP (val))
+ return -1;
+ ASET (font, FONT_SPACING_INDEX, val);
+ }
if (INTEGERP (prop[XLFD_AVGWIDTH_INDEX]))
- avgwidth = XINT (prop[XLFD_AVGWIDTH_INDEX]);
+ ASET (font, FONT_AVGWIDTH_INDEX, prop[XLFD_AVGWIDTH_INDEX]);
}
- if (! NILP (dpi))
- font_put_extra (font, QCdpi, dpi);
- if (! NILP (spacing))
- font_put_extra (font, QCspacing, spacing);
- if (avgwidth >= 0)
- font_put_extra (font, QCscalable, avgwidth == 0 ? Qt : Qnil);
-
return 0;
}
Lisp_Object val;
int i, j, len = 0;
- xassert (FONTP (font));
+ font_assert (FONTP (font));
for (i = FONT_FOUNDRY_INDEX, j = XLFD_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX;
i++, j++)
for (i = FONT_WEIGHT_INDEX, j = XLFD_WEIGHT_INDEX; i <= FONT_WIDTH_INDEX;
i++, j++)
{
- val = AREF (font, i);
+ val = font_style_symbolic (font, i, 0);
if (NILP (val))
f[j] = "*", len += 2;
else
{
- if (INTEGERP (val))
- val = prop_numeric_to_name (i, XINT (val));
- if (SYMBOLP (val))
- val = SYMBOL_NAME (val);
- xassert (STRINGP (val));
+ val = SYMBOL_NAME (val);
f[j] = (char *) SDATA (val), len += SBYTES (val) + 1;
}
}
val = AREF (font, FONT_SIZE_INDEX);
- xassert (NUMBERP (val) || NILP (val));
+ font_assert (NUMBERP (val) || NILP (val));
if (INTEGERP (val))
{
- int i = XINT (val);
+ i = XINT (val);
if (i <= 0)
i = pixel_size;
if (i > 0)
}
else if (FLOATP (val))
{
- int i = XFLOAT_DATA (val) * 10;
+ i = XFLOAT_DATA (val) * 10;
f[XLFD_PIXEL_INDEX] = alloca (12);
len += sprintf (f[XLFD_PIXEL_INDEX], "*-%d", i) + 1;
}
else
f[XLFD_PIXEL_INDEX] = "*-*", len += 4;
- val = AREF (font, FONT_EXTRA_INDEX);
-
- if (FONT_ENTITY_P (font)
- && EQ (AREF (font, FONT_TYPE_INDEX), Qx))
+ if (INTEGERP (AREF (font, FONT_DPI_INDEX)))
{
- /* Setup names for RESX-RESY-SPACING-AVWIDTH. */
- if (SYMBOLP (val) && ! NILP (val))
- {
- val = SYMBOL_NAME (val);
- f[XLFD_RESX_INDEX] = (char *) SDATA (val), len += SBYTES (val) + 1;
- }
- else
- f[XLFD_RESX_INDEX] = "*-*-*-*", len += 6;
+ i = XINT (AREF (font, FONT_DPI_INDEX));
+ f[XLFD_RESX_INDEX] = alloca (22);
+ len += sprintf (f[XLFD_RESX_INDEX],
+ "%d-%d", i, i) + 1;
}
else
+ f[XLFD_RESX_INDEX] = "*-*", len += 4;
+ if (INTEGERP (AREF (font, FONT_SPACING_INDEX)))
{
- Lisp_Object dpi = assq_no_quit (QCdpi, val);
- Lisp_Object spacing = assq_no_quit (QCspacing, val);
- Lisp_Object scalable = assq_no_quit (QCscalable, val);
-
- if (CONSP (dpi) || CONSP (spacing) || CONSP (scalable))
- {
- char *str = alloca (24);
- int this_len;
+ int spacing = XINT (AREF (font, FONT_SPACING_INDEX));
- if (CONSP (dpi) && INTEGERP (XCDR (dpi)))
- this_len = sprintf (str, "%d-%d",
- XINT (XCDR (dpi)), XINT (XCDR (dpi)));
- else
- this_len = sprintf (str, "*-*");
- if (CONSP (spacing) && ! NILP (XCDR (spacing)))
- {
- val = XCDR (spacing);
- if (INTEGERP (val))
- {
- if (XINT (val) < FONT_SPACING_MONO)
- val = Qp;
- else if (XINT (val) < FONT_SPACING_CHARCELL)
- val = Qm;
- else
- val = Qc;
- }
- xassert (SYMBOLP (val));
- this_len += sprintf (str + this_len, "-%c",
- SDATA (SYMBOL_NAME (val))[0]);
- }
- else
- this_len += sprintf (str + this_len, "-*");
- if (CONSP (scalable) && ! NILP (XCDR (spacing)))
- this_len += sprintf (str + this_len, "-0");
- else
- this_len += sprintf (str + this_len, "-*");
- f[XLFD_RESX_INDEX] = str;
- len += this_len;
- }
- else
- f[XLFD_RESX_INDEX] = "*-*-*-*", len += 8;
+ f[XLFD_SPACING_INDEX] = (spacing <= FONT_SPACING_PROPORTIONAL ? "p"
+ : spacing <= FONT_SPACING_DUAL ? "d"
+ : spacing <= FONT_SPACING_MONO ? "m"
+ : "c");
+ len += 2;
}
-
+ else
+ f[XLFD_SPACING_INDEX] = "*", len += 2;
+ if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX)))
+ {
+ f[XLFD_AVGWIDTH_INDEX] = alloca (11);
+ len += sprintf (f[XLFD_AVGWIDTH_INDEX],
+ "%d", XINT (AREF (font, FONT_AVGWIDTH_INDEX))) + 1;
+ }
+ else
+ f[XLFD_AVGWIDTH_INDEX] = "*", len += 2;
len++; /* for terminating '\0'. */
if (len >= nbytes)
return -1;
- return sprintf (name, "-%s-%s-%s-%s-%s-%s-%s-%s-%s",
+ return sprintf (name, "-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s",
f[XLFD_FOUNDRY_INDEX], f[XLFD_FAMILY_INDEX],
f[XLFD_WEIGHT_INDEX], f[XLFD_SLANT_INDEX],
- f[XLFD_SWIDTH_INDEX],
- f[XLFD_ADSTYLE_INDEX], f[XLFD_PIXEL_INDEX],
- f[XLFD_RESX_INDEX], f[XLFD_REGISTRY_INDEX]);
+ f[XLFD_SWIDTH_INDEX], f[XLFD_ADSTYLE_INDEX],
+ f[XLFD_PIXEL_INDEX], f[XLFD_RESX_INDEX],
+ f[XLFD_SPACING_INDEX], f[XLFD_AVGWIDTH_INDEX],
+ f[XLFD_REGISTRY_INDEX]);
}
-/* Parse NAME (null terminated) as Fonconfig's name format and store
- information in FONT (font-spec or font-entity). If NAME is
- successfully parsed, return 0. Otherwise return -1. */
+/* Parse NAME (null terminated) and store information in FONT
+ (font-spec or font-entity). NAME is supplied in either the
+ Fontconfig or GTK font name format. If NAME is successfully
+ parsed, return 0. Otherwise return -1.
-int
-font_parse_fcname (name, font)
- char *name;
- Lisp_Object font;
+ The fontconfig format is
+
+ FAMILY[-SIZE][:PROP1[=VAL1][:PROP2[=VAL2]...]]
+
+ The GTK format is
+
+ FAMILY [PROPS...] [SIZE]
+
+ This function tries to guess which format it is. */
+
+int
+font_parse_fcname (name, font)
+ char *name;
+ Lisp_Object font;
{
- char *p0, *p1;
+ char *p, *q;
+ char *size_beg = NULL, *size_end = NULL;
+ char *props_beg = NULL, *family_end = NULL;
int len = strlen (name);
- char *copy;
- int weight_set = 0;
- int slant_set = 0;
if (len == 0)
return -1;
- /* It is assured that (name[0] && name[0] != '-'). */
- if (name[0] == ':')
- p0 = name;
- else
+
+ for (p = name; *p; p++)
{
- Lisp_Object family;
- double point_size;
+ if (*p == '\\' && p[1])
+ p++;
+ else if (*p == ':')
+ {
+ props_beg = family_end = p;
+ break;
+ }
+ else if (*p == '-')
+ {
+ int decimal = 0, size_found = 1;
+ for (q = p + 1; *q && *q != ':'; q++)
+ if (! isdigit(*q))
+ {
+ if (*q != '.' || decimal)
+ {
+ size_found = 0;
+ break;
+ }
+ decimal = 1;
+ }
+ if (size_found)
+ {
+ family_end = p;
+ size_beg = p + 1;
+ size_end = q;
+ break;
+ }
+ }
+ }
- for (p0 = name + 1; *p0 && (*p0 != '-' && *p0 != ':'); p0++)
- if (*p0 == '\\' && p0[1])
- p0++;
- family = intern_font_field (name, p0 - name);
- if (*p0 == '-')
+ if (family_end)
+ {
+ /* A fontconfig name with size and/or property data. */
+ if (family_end > name)
{
- if (! isdigit (p0[1]))
- return -1;
- point_size = strtod (p0 + 1, &p1);
- if (*p1 && *p1 != ':')
- return -1;
+ Lisp_Object family;
+ family = font_intern_prop (name, family_end - name, 1);
+ ASET (font, FONT_FAMILY_INDEX, family);
+ }
+ if (size_beg)
+ {
+ double point_size = strtod (size_beg, &size_end);
ASET (font, FONT_SIZE_INDEX, make_float (point_size));
- p0 = p1;
+ if (*size_end == ':' && size_end[1])
+ props_beg = size_end;
}
- ASET (font, FONT_FAMILY_INDEX, family);
- }
+ if (props_beg)
+ {
+ /* Now parse ":KEY=VAL" patterns. */
+ Lisp_Object val;
- len -= p0 - name;
- copy = alloca (len + 1);
- if (! copy)
- return -1;
- name = copy;
+ for (p = props_beg; *p; p = q)
+ {
+ for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
+ if (*q != '=')
+ {
+ /* Must be an enumerated value. */
+ int word_len;
+ p = p + 1;
+ word_len = q - p;
+ val = font_intern_prop (p, q - p, 1);
+
+#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
+
+ if (PROP_MATCH ("light", 5)
+ || PROP_MATCH ("medium", 6)
+ || PROP_MATCH ("demibold", 8)
+ || PROP_MATCH ("bold", 4)
+ || PROP_MATCH ("black", 5))
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, val);
+ else if (PROP_MATCH ("roman", 5)
+ || PROP_MATCH ("italic", 6)
+ || PROP_MATCH ("oblique", 7))
+ FONT_SET_STYLE (font, FONT_SLANT_INDEX, val);
+ else if (PROP_MATCH ("charcell", 8))
+ ASET (font, FONT_SPACING_INDEX,
+ make_number (FONT_SPACING_CHARCELL));
+ else if (PROP_MATCH ("mono", 4))
+ ASET (font, FONT_SPACING_INDEX,
+ make_number (FONT_SPACING_MONO));
+ else if (PROP_MATCH ("proportional", 12))
+ ASET (font, FONT_SPACING_INDEX,
+ make_number (FONT_SPACING_PROPORTIONAL));
+#undef PROP_MATCH
+ }
+ else
+ {
+ /* KEY=VAL pairs */
+ Lisp_Object key;
+ int prop;
+
+ if (q - p == 10 && memcmp (p + 1, "pixelsize", 9) == 0)
+ prop = FONT_SIZE_INDEX;
+ else
+ {
+ key = font_intern_prop (p, q - p, 1);
+ prop = get_font_prop_index (key);
+ }
- /* Now parse ":KEY=VAL" patterns. Store known keys and values in
- extra, copy unknown ones to COPY. */
- while (*p0)
+ p = q + 1;
+ for (q = p; *q && *q != ':'; q++);
+ val = font_intern_prop (p, q - p, 0);
+
+ if (prop >= FONT_FOUNDRY_INDEX
+ && prop < FONT_EXTRA_INDEX)
+ ASET (font, prop, font_prop_validate (prop, Qnil, val));
+ else
+ Ffont_put (font, key, val);
+ }
+ p = q;
+ }
+ }
+ }
+ else
{
- Lisp_Object key, val;
- int prop;
+ /* Either a fontconfig-style name with no size and property
+ data, or a GTK-style name. */
+ Lisp_Object prop;
+ int word_len, prop_found = 0;
- for (p1 = p0 + 1; *p1 && *p1 != '=' && *p1 != ':'; p1++);
- if (*p1 != '=')
+ for (p = name; *p; p = *q ? q + 1 : q)
{
- /* Must be an enumerated value. */
- val = intern_font_field (p0 + 1, p1 - p0 - 1);
- if (memcmp (p0 + 1, "light", 5) == 0
- || memcmp (p0 + 1, "medium", 6) == 0
- || memcmp (p0 + 1, "demibold", 8) == 0
- || memcmp (p0 + 1, "bold", 4) == 0
- || memcmp (p0 + 1, "black", 5) == 0)
+ if (isdigit (*p))
{
- ASET (font, FONT_WEIGHT_INDEX, val);
- weight_set = 1;
+ int size_found = 1;
+
+ for (q = p + 1; *q && *q != ' '; q++)
+ if (! isdigit (*q))
+ {
+ size_found = 0;
+ break;
+ }
+ if (size_found)
+ {
+ double point_size = strtod (p, &q);
+ ASET (font, FONT_SIZE_INDEX, make_float (point_size));
+ continue;
+ }
}
- else if (memcmp (p0 + 1, "roman", 5) == 0
- || memcmp (p0 + 1, "italic", 6) == 0
- || memcmp (p0 + 1, "oblique", 7) == 0)
+
+ for (q = p + 1; *q && *q != ' '; q++)
+ if (*q == '\\' && q[1])
+ q++;
+ word_len = q - p;
+
+#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)
+
+ if (PROP_MATCH ("Ultra-Light", 11))
{
- ASET (font, FONT_SLANT_INDEX, val);
- slant_set = 1;
+ prop_found = 1;
+ prop = font_intern_prop ("ultra-light", 11, 1);
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
}
- else if (memcmp (p0 + 1, "charcell", 8) == 0
- || memcmp (p0 + 1, "mono", 4) == 0
- || memcmp (p0 + 1, "proportional", 12) == 0)
+ else if (PROP_MATCH ("Light", 5))
{
- font_put_extra (font, QCspacing,
- (p0[1] == 'c' ? Qc : p0[1] == 'm' ? Qm : Qp));
+ prop_found = 1;
+ prop = font_intern_prop ("light", 5, 1);
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
}
- else
+ else if (PROP_MATCH ("Semi-Bold", 9))
{
- /* unknown key */
- bcopy (p0, copy, p1 - p0);
- copy += p1 - p0;
+ prop_found = 1;
+ prop = font_intern_prop ("semi-bold", 9, 1);
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
}
- }
- else
- {
- if (memcmp (p0 + 1, "pixelsize=", 10) == 0)
- prop = FONT_SIZE_INDEX;
- else
+ else if (PROP_MATCH ("Bold", 4))
{
- key = intern_font_field (p0, p1 - p0);
- prop = get_font_prop_index (key, 0);
+ prop_found = 1;
+ prop = font_intern_prop ("bold", 4, 1);
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
}
- p0 = p1 + 1;
- for (p1 = p0; *p1 && *p1 != ':'; p1++);
- val = intern_font_field (p0, p1 - p0);
- if (! NILP (val))
+ else if (PROP_MATCH ("Italic", 6))
{
- if (prop >= 0 && prop < FONT_EXTRA_INDEX)
- {
- if (prop == FONT_WEIGHT_INDEX)
- weight_set = 1;
- else if (prop == FONT_SLANT_INDEX)
- slant_set = 1;
-
- ASET (font, prop, val);
- }
- else
- font_put_extra (font, key, val);
+ prop_found = 1;
+ prop = font_intern_prop ("italic", 4, 1);
+ FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
}
+ else if (PROP_MATCH ("Oblique", 7))
+ {
+ prop_found = 1;
+ prop = font_intern_prop ("oblique", 7, 1);
+ FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
+ }
+ else {
+ if (prop_found)
+ return -1; /* Unknown property in GTK-style font name. */
+ family_end = q;
+ }
}
- p0 = p1;
- }
+#undef PROP_MATCH
- if (!weight_set)
- ASET (font, FONT_WEIGHT_INDEX, build_string ("normal"));
- if (!slant_set)
- ASET (font, FONT_SLANT_INDEX, build_string ("normal"));
+ if (family_end)
+ {
+ Lisp_Object family;
+ family = font_intern_prop (name, family_end - name, 1);
+ ASET (font, FONT_FAMILY_INDEX, family);
+ }
+ }
return 0;
}
char *name;
int nbytes;
{
- Lisp_Object val;
+ Lisp_Object family, foundry;
+ Lisp_Object tail, val;
int point_size;
- int dpi, spacing, scalable;
+ int dpi;
int i, len = 1;
char *p;
Lisp_Object styles[3];
char *style_names[3] = { "weight", "slant", "width" };
+ char work[256];
- val = AREF (font, FONT_FAMILY_INDEX);
- if (SYMBOLP (val) && ! NILP (val))
- len += SBYTES (SYMBOL_NAME (val));
+ family = AREF (font, FONT_FAMILY_INDEX);
+ if (! NILP (family))
+ {
+ if (SYMBOLP (family))
+ {
+ family = SYMBOL_NAME (family);
+ len += SBYTES (family);
+ }
+ else
+ family = Qnil;
+ }
val = AREF (font, FONT_SIZE_INDEX);
if (INTEGERP (val))
len += 11; /* for "-NUM" */
}
- val = AREF (font, FONT_FOUNDRY_INDEX);
- if (SYMBOLP (val) && ! NILP (val))
- /* ":foundry=NAME" */
- len += 9 + SBYTES (SYMBOL_NAME (val));
-
- for (i = FONT_WEIGHT_INDEX; i <= FONT_WIDTH_INDEX; i++)
+ foundry = AREF (font, FONT_FOUNDRY_INDEX);
+ if (! NILP (foundry))
{
- val = AREF (font, i);
- if (INTEGERP (val))
+ if (SYMBOLP (foundry))
{
- val = prop_numeric_to_name (i, XINT (val));
+ foundry = SYMBOL_NAME (foundry);
+ len += 9 + SBYTES (foundry); /* ":foundry=NAME" */
}
- if (SYMBOLP (val) && ! NILP (val))
- len += (strlen (style_names[i - FONT_WEIGHT_INDEX])
- + 2 + SBYTES (SYMBOL_NAME (val))); /* :xxx=NAME */
- styles[i - FONT_WEIGHT_INDEX] = val;
- }
-
- val = AREF (font, FONT_EXTRA_INDEX);
- if (FONT_ENTITY_P (font)
- && EQ (AREF (font, FONT_TYPE_INDEX), Qx))
- {
- char *p;
-
- /* VAL is a symbol of name `RESX-RESY-SPACING-AVWIDTH'. */
- p = (char *) SDATA (SYMBOL_NAME (val));
- dpi = atoi (p);
- for (p++; *p != '-'; p++); /* skip RESX */
- for (p++; *p != '-'; p++); /* skip RESY */
- spacing = (*p == 'c' ? FONT_SPACING_CHARCELL
- : *p == 'm' ? FONT_SPACING_MONO
- : FONT_SPACING_PROPORTIONAL);
- for (p++; *p != '-'; p++); /* skip SPACING */
- scalable = (atoi (p) == 0);
- /* The longest pattern is ":dpi=NUM:scalable=False:spacing=100" */
- len += 42;
+ else
+ foundry = Qnil;
}
- else
+
+ for (i = 0; i < 3; i++)
+ {
+ styles[i] = font_style_symbolic (font, FONT_WEIGHT_INDEX + i, 0);
+ if (! NILP (styles[i]))
+ len += sprintf (work, ":%s=%s", style_names[i],
+ SDATA (SYMBOL_NAME (styles[i])));
+ }
+
+ if (INTEGERP (AREF (font, FONT_DPI_INDEX)))
+ len += sprintf (work, ":dpi=%d", dpi);
+ if (INTEGERP (AREF (font, FONT_SPACING_INDEX)))
+ len += strlen (":spacing=100");
+ if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX)))
+ len += strlen (":scalable=false"); /* or ":scalable=true" */
+ for (tail = AREF (font, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail))
{
- Lisp_Object elt;
+ Lisp_Object key = XCAR (XCAR (tail)), val = XCDR (XCAR (tail));
- dpi = spacing = scalable = -1;
- elt = assq_no_quit (QCdpi, val);
- if (CONSP (elt))
- dpi = XINT (XCDR (elt)), len += 15; /* for ":dpi=NUM" */
- elt = assq_no_quit (QCspacing, val);
- if (CONSP (elt))
- spacing = XINT (XCDR (elt)), len += 12; /* for ":spacing=100" */
- elt = assq_no_quit (QCscalable, val);
- if (CONSP (elt))
- scalable = ! NILP (XCDR (elt)), len += 15; /* for ":scalable=False" */
+ len += SBYTES (SYMBOL_NAME (key)) + 1; /* for :KEY= */
+ if (STRINGP (val))
+ len += SBYTES (val);
+ else if (INTEGERP (val))
+ len += sprintf (work, "%d", XINT (val));
+ else if (SYMBOLP (val))
+ len += (NILP (val) ? 5 : 4); /* for "false" or "true" */
}
if (len > nbytes)
return -1;
p = name;
- if (! NILP (AREF (font, FONT_FAMILY_INDEX)))
- p += sprintf(p, "%s",
- SDATA (SYMBOL_NAME (AREF (font, FONT_FAMILY_INDEX))));
+ if (! NILP (family))
+ p += sprintf (p, "%s", SDATA (family));
if (point_size > 0)
{
if (p == name)
}
else if (pixel_size > 0)
p += sprintf (p, ":pixelsize=%d", pixel_size);
- if (SYMBOLP (AREF (font, FONT_FOUNDRY_INDEX))
- && ! NILP (AREF (font, FONT_FOUNDRY_INDEX)))
+ if (! NILP (AREF (font, FONT_FOUNDRY_INDEX)))
p += sprintf (p, ":foundry=%s",
SDATA (SYMBOL_NAME (AREF (font, FONT_FOUNDRY_INDEX))));
for (i = 0; i < 3; i++)
- if (SYMBOLP (styles[i]) && ! NILP (styles [i]))
+ if (! NILP (styles[i]))
p += sprintf (p, ":%s=%s", style_names[i],
- SDATA (SYMBOL_NAME (styles [i])));
- if (dpi >= 0)
- p += sprintf (p, ":dpi=%d", dpi);
- if (spacing >= 0)
- p += sprintf (p, ":spacing=%d", spacing);
- if (scalable > 0)
- p += sprintf (p, ":scalable=True");
- else if (scalable == 0)
- p += sprintf (p, ":scalable=False");
+ SDATA (SYMBOL_NAME (styles[i])));
+ if (INTEGERP (AREF (font, FONT_DPI_INDEX)))
+ p += sprintf (p, ":dpi=%d", XINT (AREF (font, FONT_DPI_INDEX)));
+ if (INTEGERP (AREF (font, FONT_SPACING_INDEX)))
+ p += sprintf (p, ":spacing=%d", XINT (AREF (font, FONT_SPACING_INDEX)));
+ if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX)))
+ {
+ if (XINT (AREF (font, FONT_AVGWIDTH_INDEX)) == 0)
+ p += sprintf (p, ":scalable=true");
+ else
+ p += sprintf (p, ":scalable=false");
+ }
+ return (p - name);
+}
+
+/* Store GTK-style font name of FONT (font-spec or font-entity) in
+ NAME (NBYTES length), and return the name length. F is the frame
+ on which the font is displayed; it is used to calculate the point
+ size. */
+
+int
+font_unparse_gtkname (font, f, name, nbytes)
+ Lisp_Object font;
+ struct frame *f;
+ char *name;
+ int nbytes;
+{
+ char *p;
+ int len = 1;
+ Lisp_Object family, weight, slant, size;
+ int point_size = -1;
+
+ family = AREF (font, FONT_FAMILY_INDEX);
+ if (! NILP (family))
+ {
+ if (! SYMBOLP (family))
+ return -1;
+ family = SYMBOL_NAME (family);
+ len += SBYTES (family);
+ }
+
+ weight = font_style_symbolic (font, FONT_WEIGHT_INDEX, 0);
+ if (EQ (weight, Qnormal))
+ weight = Qnil;
+ else if (! NILP (weight))
+ {
+ weight = SYMBOL_NAME (weight);
+ len += SBYTES (weight);
+ }
+
+ slant = font_style_symbolic (font, FONT_SLANT_INDEX, 0);
+ if (EQ (slant, Qnormal))
+ slant = Qnil;
+ else if (! NILP (slant))
+ {
+ slant = SYMBOL_NAME (slant);
+ len += SBYTES (slant);
+ }
+
+ size = AREF (font, FONT_SIZE_INDEX);
+ /* Convert pixel size to point size. */
+ if (INTEGERP (size))
+ {
+ Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
+ int dpi = 75;
+ if (INTEGERP (font_dpi))
+ dpi = XINT (font_dpi);
+ else if (f)
+ dpi = f->resy;
+ point_size = PIXEL_TO_POINT (XINT (size), dpi);
+ len += 11;
+ }
+ else if (FLOATP (size))
+ {
+ point_size = (int) XFLOAT_DATA (size);
+ len += 11;
+ }
+
+ if (len > nbytes)
+ return -1;
+
+ p = name + sprintf (name, "%s", SDATA (family));
+
+ if (! NILP (weight))
+ {
+ char *q = p;
+ p += sprintf (p, " %s", SDATA (weight));
+ q[1] = toupper (q[1]);
+ }
+
+ if (! NILP (slant))
+ {
+ char *q = p;
+ p += sprintf (p, " %s", SDATA (slant));
+ q[1] = toupper (q[1]);
+ }
+
+ if (point_size > 0)
+ p += sprintf (p, " %d", point_size);
+
return (p - name);
}
/* Parse NAME (null terminated) and store information in FONT
(font-spec or font-entity). If NAME is successfully parsed, return
- 0. Otherwise return -1.
-
- If NAME is XLFD and FONT is a font-entity, store
- RESX-RESY-SPACING-AVWIDTH information as a symbol in
- FONT_EXTRA_INDEX. */
+ 0. Otherwise return -1. */
static int
font_parse_name (name, font)
return font_parse_fcname (name, font);
}
-/* Merge old style font specification (either a font name NAME or a
- combination of a family name FAMILY and a registry name REGISTRY
- into the font specification SPEC. */
+
+/* Merge FAMILY and REGISTRY into FONT_SPEC. FAMILY may have the form
+ "FAMILY-FOUNDRY". REGISTRY may not contain charset-encoding
+ part. */
void
-font_merge_old_spec (name, family, registry, spec)
- Lisp_Object name, family, registry, spec;
+font_parse_family_registry (family, registry, font_spec)
+ Lisp_Object family, registry, font_spec;
{
- if (STRINGP (name))
+ int len;
+ char *p0, *p1;
+
+ if (! NILP (family)
+ && NILP (AREF (font_spec, FONT_FAMILY_INDEX)))
{
- if (font_parse_xlfd ((char *) SDATA (name), spec) < 0)
+ CHECK_STRING (family);
+ len = SBYTES (family);
+ p0 = (char *) SDATA (family);
+ p1 = index (p0, '-');
+ if (p1)
{
- Lisp_Object extra = Fcons (Fcons (QCname, name), Qnil);
-
- ASET (spec, FONT_EXTRA_INDEX, extra);
+ if ((*p0 != '*' || p1 - p0 > 1)
+ && NILP (AREF (font_spec, FONT_FOUNDRY_INDEX)))
+ Ffont_put (font_spec, QCfoundry, font_intern_prop (p0, p1 - p0, 1));
+ p1++;
+ len -= p1 - p0;
+ Ffont_put (font_spec, QCfamily, font_intern_prop (p1, len, 1));
}
+ else
+ ASET (font_spec, FONT_FAMILY_INDEX, Fintern (family, Qnil));
}
- else
+ if (! NILP (registry))
{
- if (! NILP (family))
+ /* Convert "XXX" and "XXX*" to "XXX*-*". */
+ CHECK_STRING (registry);
+ len = SBYTES (registry);
+ p0 = (char *) SDATA (registry);
+ p1 = index (p0, '-');
+ if (! p1)
{
- int len;
- char *p0, *p1;
-
- xassert (STRINGP (family));
- len = SBYTES (family);
- p0 = (char *) SDATA (family);
- p1 = index (p0, '-');
- if (p1)
- {
- if ((*p0 != '*' || p1 - p0 > 1)
- && NILP (AREF (spec, FONT_FOUNDRY_INDEX)))
- ASET (spec, FONT_FOUNDRY_INDEX,
- intern_downcase (p0, p1 - p0));
- if (NILP (AREF (spec, FONT_FAMILY_INDEX)))
- ASET (spec, FONT_FAMILY_INDEX,
- intern_downcase (p1 + 1, len - (p1 + 1 - p0)));
- }
- else if (NILP (AREF (spec, FONT_FAMILY_INDEX)))
- ASET (spec, FONT_FAMILY_INDEX, intern_downcase (p0, len));
+ if (SDATA (registry)[len - 1] == '*')
+ registry = concat2 (registry, build_string ("-*"));
+ else
+ registry = concat2 (registry, build_string ("*-*"));
}
- if (! NILP (registry)
- && NILP (AREF (spec, FONT_REGISTRY_INDEX)))
- ASET (spec, FONT_REGISTRY_INDEX,
- intern_downcase ((char *) SDATA (registry), SBYTES (registry)));
+ registry = Fdowncase (registry);
+ ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil));
}
}
\f
-/* This part (through the next ^L) is still experimental and never
- tested. We may drastically change codes. */
+/* This part (through the next ^L) is still experimental and not
+ tested much. We may drastically change codes. */
/* OTF handler */
+#if 0
+
#define LGSTRING_HEADER_SIZE 6
#define LGSTRING_GLYPH_SIZE 8
if (!NILP (LGSTRING_SLOT (gstring, LGSTRING_IX_ASCENT)))
CHECK_NUMBER (LGSTRING_SLOT (gstring, LGSTRING_IX_ASCENT));
- for (i = 0; i < LGSTRING_LENGTH (gstring); i++)
+ for (i = 0; i < LGSTRING_GLYPH_LEN (gstring); i++)
{
val = LGSTRING_GLYPH (gstring, i);
CHECK_VECTOR (val);
check_otf_features (otf_features)
Lisp_Object otf_features;
{
- Lisp_Object val, elt;
+ Lisp_Object val;
CHECK_CONS (otf_features);
CHECK_SYMBOL (XCAR (otf_features));
}
static OTF *
-otf_open (entity, file)
- Lisp_Object entity;
- char *file;
+otf_open (file)
+ Lisp_Object file;
{
- Lisp_Object val = Fassoc (entity, otf_list);
+ Lisp_Object val = Fassoc (file, otf_list);
OTF *otf;
if (! NILP (val))
otf = XSAVE_VALUE (XCDR (val))->pointer;
else
{
- otf = file ? OTF_open (file) : NULL;
+ otf = STRINGP (file) ? OTF_open ((char *) SDATA (file)) : NULL;
val = make_save_value (otf, 0);
- otf_list = Fcons (Fcons (entity, val), otf_list);
+ otf_list = Fcons (Fcons (file, val), otf_list);
}
return otf;
}
Lisp_Object capability = Fcons (Qnil, Qnil);
int i;
- otf = otf_open (font->entity, font->file_name);
+ otf = otf_open (font->props[FONT_FILE_INDEX]);
if (! otf)
return Qnil;
for (i = 0; i < 2; i++)
char *features;
{
Lisp_Object val;
- char *p, *pend;
+ char *p;
int asterisk;
p = features;
error ("OTF spec too long");
}
-
Lisp_Object
font_otf_DeviceTable (device_table)
OTF_DeviceTable *device_table;
}
return val;
}
-
#endif /* HAVE_LIBOTF */
-
-/* G-string (glyph string) handler */
-
-/* G-string is a vector of the form [HEADER GLYPH ...].
- See the docstring of `font-make-gstring' for more detail. */
-
-struct font *
-font_prepare_composition (cmp, f)
- struct composition *cmp;
- FRAME_PTR f;
-{
- Lisp_Object gstring
- = AREF (XHASH_TABLE (composition_hash_table)->key_and_value,
- cmp->hash_index * 2);
-
- cmp->font = XSAVE_VALUE (LGSTRING_FONT (gstring))->pointer;
- cmp->glyph_len = LGSTRING_LENGTH (gstring);
- cmp->pixel_width = LGSTRING_WIDTH (gstring);
- cmp->lbearing = LGSTRING_LBEARING (gstring);
- cmp->rbearing = LGSTRING_RBEARING (gstring);
- cmp->ascent = LGSTRING_ASCENT (gstring);
- cmp->descent = LGSTRING_DESCENT (gstring);
- cmp->width = cmp->pixel_width / FRAME_COLUMN_WIDTH (f);
- if (cmp->width == 0)
- cmp->width = 1;
-
- return cmp->font;
-}
+#endif /* 0 */
\f
/* Font sorting */
static unsigned font_score P_ ((Lisp_Object, Lisp_Object *));
static int font_compare P_ ((const void *, const void *));
static Lisp_Object font_sort_entites P_ ((Lisp_Object, Lisp_Object,
- Lisp_Object, Lisp_Object));
+ Lisp_Object, int));
/* We sort fonts by scoring each of them against a specified
font-spec. The score value is 32 bit (`unsigned'), and the smaller
the value is, the closer the font is to the font-spec.
- Each 1-bit of the highest 4 bits of the score is used for atomic
- properties FOUNDRY, FAMILY, ADSTYLE, and REGISTRY.
+ The lowest 2 bits of the score is used for driver type. The font
+ available by the most preferred font driver is 0.
- Each 7-bit in the lowest 28 bits are used for numeric properties
+ Each 7-bit in the higher 28 bits are used for numeric properties
WEIGHT, SLANT, WIDTH, and SIZE. */
/* How many bits to shift to store the difference value of each font
- property in a score. */
+ property in a score. Note that flots for FONT_TYPE_INDEX and
+ FONT_REGISTRY_INDEX are not used. */
static int sort_shift_bits[FONT_SIZE_INDEX + 1];
/* Score font-entity ENTITY against properties of font-spec SPEC_PROP.
{
unsigned score = 0;
int i;
- /* Score four atomic fields. Maximum difference is 1. */
- for (i = FONT_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX; i++)
- if (! NILP (spec_prop[i])
- && ! EQ (spec_prop[i], AREF (entity, i)))
- score |= 1 << sort_shift_bits[i];
-
- /* Score four numeric fields. Maximum difference is 127. */
- for (i = FONT_WEIGHT_INDEX; i <= FONT_SIZE_INDEX; i++)
- {
- Lisp_Object entity_val = AREF (entity, i);
- Lisp_Object spec_val = spec_prop[i];
- /* If weight and slant are unspecified, score normal lower (low wins). */
- if (NILP (spec_val))
- {
- if (i == FONT_WEIGHT_INDEX || i == FONT_SLANT_INDEX)
- spec_val = prop_name_to_numeric (i, build_string ("normal"));
- }
+ /* Score three style numeric fields. Maximum difference is 127. */
+ for (i = FONT_WEIGHT_INDEX; i <= FONT_WIDTH_INDEX; i++)
+ if (! NILP (spec_prop[i]) && ! EQ (AREF (entity, i), spec_prop[i]))
+ {
+ int diff = (XINT (AREF (entity, i)) >> 8) - (XINT (spec_prop[i]) >> 8);
- if (! NILP (spec_val) && ! EQ (spec_val, entity_val))
- {
- if (! INTEGERP (entity_val))
- score |= 127 << sort_shift_bits[i];
- else
- {
- int diff = XINT (entity_val) - XINT (spec_val);
+ if (diff < 0)
+ diff = - diff;
+ if (diff > 0)
+ score |= min (diff, 127) << sort_shift_bits[i];
+ }
- if (diff < 0)
- diff = - diff;
- if (i == FONT_SIZE_INDEX)
- {
- if (XINT (entity_val) > 0
- && diff > FONT_PIXEL_SIZE_QUANTUM)
- score |= min (diff, 127) << sort_shift_bits[i];
- }
-#ifdef WINDOWSNT
- else if (i == FONT_WEIGHT_INDEX)
- {
- /* Windows uses a much wider range for weight (100-900)
- compared with freetype (0-210), so scale down the
- difference. A more general way of doing this
- would be to look up the values of regular and bold
- and/or light and calculate the scale factor from them,
- but the lookup would be expensive, and if only Windows
- needs it, not worth the effort. */
- score |= min (diff / 4, 127) << sort_shift_bits[i];
- }
-#endif
- else
- score |= min (diff, 127) << sort_shift_bits[i];
- }
- }
+ /* Score the size. Maximum difference is 127. */
+ i = FONT_SIZE_INDEX;
+ if (! NILP (spec_prop[i]) && XINT (AREF (entity, i)) > 0)
+ {
+ /* We use the higher 6-bit for the actual size difference. The
+ lowest bit is set if the DPI is different. */
+ int diff = XINT (spec_prop[i]) - XINT (AREF (entity, i));
+
+ if (diff < 0)
+ diff = - diff;
+ diff <<= 1;
+ if (! NILP (spec_prop[FONT_DPI_INDEX])
+ && ! EQ (spec_prop[FONT_DPI_INDEX], AREF (entity, FONT_DPI_INDEX)))
+ diff |= 1;
+ score |= min (diff, 127) << sort_shift_bits[FONT_SIZE_INDEX];
}
return score;
font_compare (d1, d2)
const void *d1, *d2;
{
- return (*(unsigned *) d1 < *(unsigned *) d2
- ? -1 : *(unsigned *) d1 > *(unsigned *) d2);
+ return (*(unsigned *) d1 - *(unsigned *) d2);
}
/* Sort font-entities in vector VEC by closeness to font-spec PREFER.
If PREFER specifies a point-size, calculate the corresponding
pixel-size from QCdpi property of PREFER or from the Y-resolution
- of FRAME before sorting. If SPEC is not nil, it is a font-spec to
- get the font-entities in VEC. */
+ of FRAME before sorting.
+
+ If BEST-ONLY is nonzero, return the best matching entity. Otherwise,
+ return the sorted VEC. */
static Lisp_Object
-font_sort_entites (vec, prefer, frame, spec)
- Lisp_Object vec, prefer, frame, spec;
+font_sort_entites (vec, prefer, frame, best_only)
+ Lisp_Object vec, prefer, frame;
+ int best_only;
{
Lisp_Object prefer_prop[FONT_SPEC_MAX];
int len, i;
struct font_sort_data *data;
+ unsigned best_score;
+ Lisp_Object best_entity, driver_type;
+ int driver_order;
+ struct frame *f = XFRAME (frame);
+ struct font_driver_list *list;
USE_SAFE_ALLOCA;
len = ASIZE (vec);
if (len <= 1)
- return vec;
+ return best_only ? AREF (vec, 0) : vec;
- for (i = FONT_FOUNDRY_INDEX; i <= FONT_SIZE_INDEX; i++)
+ for (i = FONT_WEIGHT_INDEX; i <= FONT_DPI_INDEX; i++)
prefer_prop[i] = AREF (prefer, i);
-
- if (! NILP (spec))
- {
- /* As it is assured that all fonts in VEC match with SPEC, we
- should ignore properties specified in SPEC. So, set the
- corresponding properties in PREFER_PROP to nil. */
- for (i = FONT_WEIGHT_INDEX; i <= FONT_SIZE_INDEX; i++)
- if (! NILP (AREF (spec, i)))
- prefer_prop[i++] = Qnil;
- }
-
if (FLOATP (prefer_prop[FONT_SIZE_INDEX]))
prefer_prop[FONT_SIZE_INDEX]
= make_number (font_pixel_size (XFRAME (frame), prefer));
/* Scoring and sorting. */
SAFE_ALLOCA (data, struct font_sort_data *, (sizeof *data) * len);
+ best_score = 0xFFFFFFFF;
+ /* We are sure that the length of VEC > 1. */
+ driver_type = AREF (AREF (vec, 0), FONT_TYPE_INDEX);
+ for (driver_order = 0, list = f->font_driver_list; list;
+ driver_order++, list = list->next)
+ if (EQ (driver_type, list->driver->type))
+ break;
+ best_entity = data[0].entity = AREF (vec, 0);
+ best_score = data[0].score
+ = font_score (data[0].entity, prefer_prop) | driver_order;
for (i = 0; i < len; i++)
{
+ if (!EQ (driver_type, AREF (AREF (vec, i), FONT_TYPE_INDEX)))
+ for (driver_order = 0, list = f->font_driver_list; list;
+ driver_order++, list = list->next)
+ if (EQ (driver_type, list->driver->type))
+ break;
data[i].entity = AREF (vec, i);
- data[i].score = font_score (data[i].entity, prefer_prop);
+ data[i].score = font_score (data[i].entity, prefer_prop) | driver_order;
+ if (best_only && best_score > data[i].score)
+ {
+ best_score = data[i].score;
+ best_entity = data[i].entity;
+ if (best_score == 0)
+ break;
+ }
}
- qsort (data, len, sizeof *data, font_compare);
- for (i = 0; i < len; i++)
- ASET (vec, i, data[i].entity);
+ if (! best_only)
+ {
+ qsort (data, len, sizeof *data, font_compare);
+ for (i = 0; i < len; i++)
+ ASET (vec, i, data[i].entity);
+ }
+ else
+ vec = best_entity;
SAFE_FREE ();
+ font_add_log ("sort-by", prefer, vec);
return vec;
}
font_update_sort_order (order)
int *order;
{
- int i, shift_bits = 21;
+ int i, shift_bits;
- for (i = 0; i < 4; i++, shift_bits -= 7)
+ for (i = 0, shift_bits = 23; i < 4; i++, shift_bits -= 7)
{
int xlfd_idx = order[i];
}
}
-
-/* Return weight property of FONT as symbol. */
-
-Lisp_Object
-font_symbolic_weight (font)
- Lisp_Object font;
+static int
+font_check_otf_features (script, langsys, features, table)
+ Lisp_Object script, langsys, features, table;
{
- Lisp_Object weight = AREF (font, FONT_WEIGHT_INDEX);
+ Lisp_Object val;
+ int negative;
- if (INTEGERP (weight))
- weight = prop_numeric_to_name (FONT_WEIGHT_INDEX, XINT (weight));
- return weight;
+ table = assq_no_quit (script, table);
+ if (NILP (table))
+ return 0;
+ table = XCDR (table);
+ if (! NILP (langsys))
+ {
+ table = assq_no_quit (langsys, table);
+ if (NILP (table))
+ return 0;
+ }
+ else
+ {
+ val = assq_no_quit (Qnil, table);
+ if (NILP (val))
+ table = XCAR (table);
+ else
+ table = val;
+ }
+ table = XCDR (table);
+ for (negative = 0; CONSP (features); features = XCDR (features))
+ {
+ if (NILP (XCAR (features)))
+ negative = 1;
+ if (NILP (Fmemq (XCAR (features), table)) != negative)
+ return 0;
+ }
+ return 1;
}
+/* Check if OTF_CAPABILITY satisfies SPEC (otf-spec). */
-/* Return slant property of FONT as symbol. */
-
-Lisp_Object
-font_symbolic_slant (font)
- Lisp_Object font;
+static int
+font_check_otf (Lisp_Object spec, Lisp_Object otf_capability)
{
- Lisp_Object slant = AREF (font, FONT_SLANT_INDEX);
+ Lisp_Object script, langsys = Qnil, gsub = Qnil, gpos = Qnil;
- if (INTEGERP (slant))
- slant = prop_numeric_to_name (FONT_SLANT_INDEX, XINT (slant));
- return slant;
-}
-
-
-/* Return width property of FONT as symbol. */
-
-Lisp_Object
-font_symbolic_width (font)
- Lisp_Object font;
-{
- Lisp_Object width = AREF (font, FONT_WIDTH_INDEX);
+ script = XCAR (spec);
+ spec = XCDR (spec);
+ if (! NILP (spec))
+ {
+ langsys = XCAR (spec);
+ spec = XCDR (spec);
+ if (! NILP (spec))
+ {
+ gsub = XCAR (spec);
+ spec = XCDR (spec);
+ if (! NILP (spec))
+ gpos = XCAR (spec);
+ }
+ }
- if (INTEGERP (width))
- width = prop_numeric_to_name (FONT_WIDTH_INDEX, XINT (width));
- return width;
+ if (! NILP (gsub) && ! font_check_otf_features (script, langsys, gsub,
+ XCAR (otf_capability)))
+ return 0;
+ if (! NILP (gpos) && ! font_check_otf_features (script, langsys, gpos,
+ XCDR (otf_capability)))
+ return 0;
+ return 1;
}
-/* Check if ENTITY matches with the font specification SPEC. */
+
+/* Check if FONT (font-entity or font-object) matches with the font
+ specification SPEC. */
int
-font_match_p (spec, entity)
- Lisp_Object spec, entity;
+font_match_p (spec, font)
+ Lisp_Object spec, font;
{
+ Lisp_Object prop[FONT_SPEC_MAX], *props;
+ Lisp_Object extra, font_extra;
int i;
- for (i = FONT_FOUNDRY_INDEX; i < FONT_SIZE_INDEX; i++)
+ for (i = FONT_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX; i++)
if (! NILP (AREF (spec, i))
- && ! EQ (AREF (spec, i), AREF (entity, i)))
+ && ! NILP (AREF (font, i))
+ && ! EQ (AREF (spec, i), AREF (font, i)))
return 0;
- if (INTEGERP (AREF (spec, FONT_SIZE_INDEX))
- && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0
- && (XINT (AREF (spec, FONT_SIZE_INDEX))
- != XINT (AREF (entity, FONT_SIZE_INDEX))))
+ props = XFONT_SPEC (spec)->props;
+ if (FLOATP (props[FONT_SIZE_INDEX]))
+ {
+ for (i = FONT_FOUNDRY_INDEX; i < FONT_SIZE_INDEX; i++)
+ prop[i] = AREF (spec, i);
+ prop[FONT_SIZE_INDEX]
+ = make_number (font_pixel_size (XFRAME (selected_frame), spec));
+ props = prop;
+ }
+
+ if (font_score (font, props) > 0)
return 0;
+ extra = AREF (spec, FONT_EXTRA_INDEX);
+ font_extra = AREF (font, FONT_EXTRA_INDEX);
+ for (; CONSP (extra); extra = XCDR (extra))
+ {
+ Lisp_Object key = XCAR (XCAR (extra));
+ Lisp_Object val = XCDR (XCAR (extra)), val2;
+
+ if (EQ (key, QClang))
+ {
+ val2 = assq_no_quit (key, font_extra);
+ if (NILP (val2))
+ return 0;
+ val2 = XCDR (val2);
+ if (CONSP (val))
+ {
+ if (! CONSP (val2))
+ return 0;
+ while (CONSP (val))
+ if (NILP (Fmemq (val, val2)))
+ return 0;
+ }
+ else
+ if (CONSP (val2)
+ ? NILP (Fmemq (val, XCDR (val2)))
+ : ! EQ (val, val2))
+ return 0;
+ }
+ else if (EQ (key, QCscript))
+ {
+ val2 = assq_no_quit (val, Vscript_representative_chars);
+ if (! NILP (val2))
+ for (val2 = XCDR (val2); CONSP (val2); val2 = XCDR (val2))
+ if (font_encode_char (font, XINT (XCAR (val2)))
+ == FONT_INVALID_CODE)
+ return 0;
+ }
+ else if (EQ (key, QCotf))
+ {
+ struct font *fontp;
+
+ if (! FONT_OBJECT_P (font))
+ return 0;
+ fontp = XFONT_OBJECT (font);
+ if (! fontp->driver->otf_capability)
+ return 0;
+ val2 = fontp->driver->otf_capability (fontp);
+ if (NILP (val2) || ! font_check_otf (val, val2))
+ return 0;
+ }
+ }
+
return 1;
}
+\f
-
-/* Return a lispy font object corresponding to FONT. */
-
-Lisp_Object
-font_find_object (font)
- struct font *font;
-{
- Lisp_Object tail, elt;
-
- for (tail = AREF (font->entity, FONT_OBJLIST_INDEX); CONSP (tail);
- tail = XCDR (tail))
- {
- elt = XCAR (tail);
- if (font == XSAVE_VALUE (elt)->pointer
- && XSAVE_VALUE (elt)->integer > 0)
- return elt;
- }
- abort ();
- return Qnil;
-}
-
-\f
-/* Font cache
+/* Font cache
Each font backend has the callback function get_cache, and it
returns a cons cell of which cdr part can be freely used for
val = XCDR (cache);
while (CONSP (val) && ! EQ (XCAR (XCAR (val)), driver->type))
cache = val, val = XCDR (val);
- xassert (! NILP (val));
+ font_assert (! NILP (val));
tmp = XCDR (XCAR (val));
XSETCAR (tmp, make_number (XINT (XCAR (tmp)) - 1));
if (XINT (XCAR (tmp)) == 0)
Lisp_Object val = driver->get_cache (f);
Lisp_Object type = driver->type;
- xassert (CONSP (val));
+ font_assert (CONSP (val));
for (val = XCDR (val); ! EQ (XCAR (XCAR (val)), type); val = XCDR (val));
- xassert (CONSP (val));
+ font_assert (CONSP (val));
/* VAL = ((DRIVER-TYPE NUM-FRAMES FONT-CACHE-DATA ...) ...) */
val = XCDR (XCAR (val));
return val;
for (tail = XCDR (XCDR (cache)); CONSP (tail); tail = XCDR (tail))
{
elt = XCAR (tail);
- if (CONSP (elt) && FONT_SPEC_P (XCAR (elt)))
+ if (CONSP (elt) && FONT_SPEC_P (XCAR (elt)) && VECTORP (XCDR (elt)))
{
Lisp_Object vec = XCDR (elt);
int i;
for (; CONSP (objlist); objlist = XCDR (objlist))
{
Lisp_Object val = XCAR (objlist);
- struct Lisp_Save_Value *p = XSAVE_VALUE (val);
- struct font *font = p->pointer;
-
- xassert (font && driver == font->driver);
- driver->close (f, font);
- p->pointer = NULL;
- p->integer = 0;
- num_fonts--;
+ struct font *font = XFONT_OBJECT (val);
+
+ if (! NILP (AREF (val, FONT_TYPE_INDEX)))
+ {
+ font_assert (font && driver == font->driver);
+ driver->close (f, font);
+ num_fonts--;
+ }
}
if (driver->free_entity)
driver->free_entity (entity);
static Lisp_Object scratch_font_spec, scratch_font_prefer;
+Lisp_Object
+font_delete_unmatched (list, spec, size)
+ Lisp_Object list, spec;
+ int size;
+{
+ Lisp_Object entity, val;
+ enum font_property_index prop;
-/* Return a vector of font-entities matching with SPEC on frame F. */
+ for (val = Qnil; CONSP (list); list = XCDR (list))
+ {
+ entity = XCAR (list);
+ for (prop = FONT_WEIGHT_INDEX; prop < FONT_SIZE_INDEX; prop++)
+ if (INTEGERP (AREF (spec, prop))
+ && ((XINT (AREF (spec, prop)) >> 8)
+ != (XINT (AREF (entity, prop)) >> 8)))
+ prop = FONT_SPEC_MAX;
+ if (prop < FONT_SPEC_MAX
+ && size
+ && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0)
+ {
+ int diff = XINT (AREF (entity, FONT_SIZE_INDEX)) - size;
-static Lisp_Object
+ if (diff != 0
+ && (diff < 0 ? -diff > FONT_PIXEL_SIZE_QUANTUM
+ : diff > FONT_PIXEL_SIZE_QUANTUM))
+ prop = FONT_SPEC_MAX;
+ }
+ if (prop < FONT_SPEC_MAX
+ && INTEGERP (AREF (spec, FONT_DPI_INDEX))
+ && INTEGERP (AREF (entity, FONT_DPI_INDEX))
+ && ! EQ (AREF (spec, FONT_DPI_INDEX), AREF (entity, FONT_DPI_INDEX)))
+ prop = FONT_SPEC_MAX;
+ if (prop < FONT_SPEC_MAX
+ && INTEGERP (AREF (spec, FONT_AVGWIDTH_INDEX))
+ && INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX))
+ && ! EQ (AREF (spec, FONT_AVGWIDTH_INDEX),
+ AREF (entity, FONT_AVGWIDTH_INDEX)))
+ prop = FONT_SPEC_MAX;
+ if (prop < FONT_SPEC_MAX)
+ val = Fcons (entity, val);
+ }
+ return val;
+}
+
+
+/* Return a vector of font-entities matching with SPEC on FRAME. */
+
+Lisp_Object
font_list_entities (frame, spec)
Lisp_Object frame, spec;
{
FRAME_PTR f = XFRAME (frame);
struct font_driver_list *driver_list = f->font_driver_list;
- Lisp_Object ftype, family, size, alternate_familes;
- Lisp_Object *vec = alloca (sizeof (Lisp_Object) * num_font_drivers);
+ Lisp_Object ftype, val;
+ Lisp_Object *vec;
+ int size;
+ int need_filtering = 0;
int i;
- if (! vec)
- return null_vector;
+ font_assert (FONT_SPEC_P (spec));
- family = AREF (spec, FONT_FAMILY_INDEX);
- if (NILP (family))
- alternate_familes = Qnil;
+ if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
+ size = XINT (AREF (spec, FONT_SIZE_INDEX));
+ else if (FLOATP (AREF (spec, FONT_SIZE_INDEX)))
+ size = font_pixel_size (f, spec);
else
+ size = 0;
+
+ ftype = AREF (spec, FONT_TYPE_INDEX);
+ for (i = FONT_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX; i++)
+ ASET (scratch_font_spec, i, AREF (spec, i));
+ for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++)
{
- if (NILP (font_family_alist)
- && !NILP (Vface_alternative_font_family_alist))
- build_font_family_alist ();
- alternate_familes = assq_no_quit (family, font_family_alist);
- if (! NILP (alternate_familes))
- alternate_familes = XCDR (alternate_familes);
+ ASET (scratch_font_spec, i, Qnil);
+ if (! NILP (AREF (spec, i)))
+ need_filtering = 1;
+ if (i == FONT_DPI_INDEX)
+ /* Skip FONT_SPACING_INDEX */
+ i++;
}
- size = AREF (spec, FONT_SIZE_INDEX);
- if (FLOATP (size))
- ASET (spec, FONT_SIZE_INDEX, make_number (font_pixel_size (f, spec)));
+ ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec, FONT_SPACING_INDEX));
+ ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX));
- xassert (ASIZE (spec) == FONT_SPEC_MAX);
- ftype = AREF (spec, FONT_TYPE_INDEX);
+ vec = alloca (sizeof (Lisp_Object) * num_font_drivers);
+ if (! vec)
+ return null_vector;
for (i = 0; driver_list; driver_list = driver_list->next)
if (driver_list->on
&& (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
{
Lisp_Object cache = font_get_cache (f, driver_list->driver);
- Lisp_Object tail = alternate_familes;
-
- ASET (spec, FONT_TYPE_INDEX, driver_list->driver->type);
- ASET (spec, FONT_FAMILY_INDEX, family);
- while (1)
+ ASET (scratch_font_spec, FONT_TYPE_INDEX, driver_list->driver->type);
+ val = assoc_no_quit (scratch_font_spec, XCDR (cache));
+ if (CONSP (val))
+ val = XCDR (val);
+ else
{
- Lisp_Object val = assoc_no_quit (spec, XCDR (cache));
+ Lisp_Object copy;
- if (CONSP (val))
- val = XCDR (val);
- else
- {
- val = driver_list->driver->list (frame, spec);
- if (VECTORP (val))
- XSETCDR (cache, Fcons (Fcons (Fcopy_sequence (spec), val),
- XCDR (cache)));
- }
- if (VECTORP (val) && ASIZE (val) > 0)
- {
- vec[i++] = val;
- break;
- }
- if (NILP (tail))
- break;
- ASET (spec, FONT_FAMILY_INDEX, XCAR (tail));
- tail = XCDR (tail);
+ val = driver_list->driver->list (frame, scratch_font_spec);
+ copy = Fcopy_font_spec (scratch_font_spec);
+ ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
+ XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache)));
}
+ if (! NILP (val) && need_filtering)
+ val = font_delete_unmatched (val, spec, size);
+ if (! NILP (val))
+ vec[i++] = val;
}
- ASET (spec, FONT_TYPE_INDEX, ftype);
- ASET (spec, FONT_FAMILY_INDEX, family);
- ASET (spec, FONT_SIZE_INDEX, size);
- return (i > 0 ? Fvconcat (i, vec) : null_vector);
+
+ val = (i > 0 ? Fvconcat (i, vec) : null_vector);
+ font_add_log ("list", spec, val);
+ return (val);
}
-/* Return a font entity matching with SPEC on FRAME. */
+/* Return a font entity matching with SPEC on FRAME. ATTRS, if non
+ nil, is an array of face's attributes, which specifies preferred
+ font-related attributes. */
static Lisp_Object
-font_matching_entity (frame, spec)
- Lisp_Object frame, spec;
+font_matching_entity (f, attrs, spec)
+ FRAME_PTR f;
+ Lisp_Object *attrs, spec;
{
- FRAME_PTR f = XFRAME (frame);
struct font_driver_list *driver_list = f->font_driver_list;
Lisp_Object ftype, size, entity;
+ Lisp_Object frame;
+ XSETFRAME (frame, f);
ftype = AREF (spec, FONT_TYPE_INDEX);
size = AREF (spec, FONT_SIZE_INDEX);
if (FLOATP (size))
&& (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
{
Lisp_Object cache = font_get_cache (f, driver_list->driver);
- Lisp_Object key;
+ Lisp_Object copy;
ASET (spec, FONT_TYPE_INDEX, driver_list->driver->type);
- key = Fcons (spec, Qnil);
- entity = assoc_no_quit (key, XCDR (cache));
+ entity = assoc_no_quit (spec, XCDR (cache));
if (CONSP (entity))
entity = XCDR (entity);
else
{
entity = driver_list->driver->match (frame, spec);
- if (! NILP (entity))
- {
- XSETCAR (key, Fcopy_sequence (spec));
- XSETCDR (cache, Fcons (Fcons (key, entity), XCDR (cache)));
- }
+ copy = Fcopy_font_spec (spec);
+ ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
+ XSETCDR (cache, Fcons (Fcons (copy, entity), XCDR (cache)));
}
if (! NILP (entity))
break;
}
ASET (spec, FONT_TYPE_INDEX, ftype);
ASET (spec, FONT_SIZE_INDEX, size);
+ font_add_log ("match", spec, entity);
return entity;
}
struct font_driver_list *driver_list;
Lisp_Object objlist, size, val, font_object;
struct font *font;
+ int min_width, height;
+ font_assert (FONT_ENTITY_P (entity));
size = AREF (entity, FONT_SIZE_INDEX);
- xassert (NATNUMP (size));
if (XINT (size) != 0)
pixel_size = XINT (size);
- font_object = Qnil;
for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist);
objlist = XCDR (objlist))
- {
- font = XSAVE_VALUE (XCAR (objlist))->pointer;
- if (font->pixel_size == pixel_size)
- {
- font_object = XCAR (objlist);
- XSAVE_VALUE (font_object)->integer++;
- break;
- }
- }
+ if (! NILP (AREF (XCAR (objlist), FONT_TYPE_INDEX))
+ && XFONT_OBJECT (XCAR (objlist))->pixel_size == pixel_size)
+ return XCAR (objlist);
+
+ val = AREF (entity, FONT_TYPE_INDEX);
+ for (driver_list = f->font_driver_list;
+ driver_list && ! EQ (driver_list->driver->type, val);
+ driver_list = driver_list->next);
+ if (! driver_list)
+ return Qnil;
+ font_object = driver_list->driver->open (f, entity, pixel_size);
+ font_add_log ("open", entity, font_object);
if (NILP (font_object))
+ return Qnil;
+ ASET (entity, FONT_OBJLIST_INDEX,
+ Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
+ ASET (font_object, FONT_OBJLIST_INDEX, Qnil);
+ num_fonts++;
+
+ font = XFONT_OBJECT (font_object);
+ min_width = (font->min_width ? font->min_width
+ : font->average_width ? font->average_width
+ : font->space_width ? font->space_width
+ : 1);
+ height = (font->height ? font->height : 1);
+#ifdef HAVE_WINDOW_SYSTEM
+ FRAME_X_DISPLAY_INFO (f)->n_fonts++;
+ if (FRAME_X_DISPLAY_INFO (f)->n_fonts == 1)
{
- val = AREF (entity, FONT_TYPE_INDEX);
- for (driver_list = f->font_driver_list;
- driver_list && ! EQ (driver_list->driver->type, val);
- driver_list = driver_list->next);
- if (! driver_list)
- return Qnil;
-
- font = driver_list->driver->open (f, entity, pixel_size);
- if (! font)
- return Qnil;
- font->scalable = XINT (size) == 0;
-
- font_object = make_save_value (font, 1);
- ASET (entity, FONT_OBJLIST_INDEX,
- Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
- num_fonts++;
+ FRAME_SMALLEST_CHAR_WIDTH (f) = min_width;
+ FRAME_SMALLEST_FONT_HEIGHT (f) = height;
+ fonts_changed_p = 1;
}
-
- if (FRAME_SMALLEST_CHAR_WIDTH (f) > font->min_width)
- FRAME_SMALLEST_CHAR_WIDTH (f) = font->min_width;
- if (FRAME_SMALLEST_CHAR_WIDTH (f) <= 0)
- FRAME_SMALLEST_CHAR_WIDTH (f) = 1;
- if (FRAME_SMALLEST_FONT_HEIGHT (f) > font->font.height)
- FRAME_SMALLEST_FONT_HEIGHT (f) = font->font.height;
- if (FRAME_SMALLEST_FONT_HEIGHT (f) <= 0)
- FRAME_SMALLEST_FONT_HEIGHT (f) = 1;
+ else
+ {
+ if (FRAME_SMALLEST_CHAR_WIDTH (f) > min_width)
+ FRAME_SMALLEST_CHAR_WIDTH (f) = min_width, fonts_changed_p = 1;
+ if (FRAME_SMALLEST_FONT_HEIGHT (f) > height)
+ FRAME_SMALLEST_FONT_HEIGHT (f) = height, fonts_changed_p = 1;
+ }
+#endif
return font_object;
}
FRAME_PTR f;
Lisp_Object font_object;
{
- struct font *font = XSAVE_VALUE (font_object)->pointer;
- Lisp_Object objlist;
- Lisp_Object tail, prev = Qnil;
+ struct font *font = XFONT_OBJECT (font_object);
- xassert (XSAVE_VALUE (font_object)->integer > 0);
- XSAVE_VALUE (font_object)->integer--;
- if (XSAVE_VALUE (font_object)->integer > 0)
+ if (NILP (AREF (font_object, FONT_TYPE_INDEX)))
+ /* Already closed. */
return;
-
- objlist = AREF (font->entity, FONT_OBJLIST_INDEX);
- for (prev = Qnil, tail = objlist; CONSP (tail);
- prev = tail, tail = XCDR (tail))
- if (EQ (font_object, XCAR (tail)))
- {
- if (font->driver->close)
- font->driver->close (f, font);
- XSAVE_VALUE (font_object)->pointer = NULL;
- if (NILP (prev))
- ASET (font->entity, FONT_OBJLIST_INDEX, XCDR (objlist));
- else
- XSETCDR (prev, XCDR (objlist));
- num_fonts--;
- return;
- }
- abort ();
+ font_add_log ("close", font_object, Qnil);
+ font->driver->close (f, font);
+#ifdef HAVE_WINDOW_SYSTEM
+ font_assert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
+ FRAME_X_DISPLAY_INFO (f)->n_fonts--;
+#endif
+ num_fonts--;
}
return driver_list->driver->has_char (font, c);
}
- xassert (FONT_OBJECT_P (font));
- fontp = XSAVE_VALUE (font)->pointer;
-
+ font_assert (FONT_OBJECT_P (font));
+ fontp = XFONT_OBJECT (font);
if (fontp->driver->has_char)
{
- int result = fontp->driver->has_char (fontp->entity, c);
+ int result = fontp->driver->has_char (font, c);
if (result >= 0)
return result;
Lisp_Object font_object;
int c;
{
- struct font *font = XSAVE_VALUE (font_object)->pointer;
+ struct font *font;
+ font_assert (FONT_OBJECT_P (font_object));
+ font = XFONT_OBJECT (font_object);
return font->driver->encode_char (font, c);
}
font_get_name (font_object)
Lisp_Object font_object;
{
- struct font *font = XSAVE_VALUE (font_object)->pointer;
- char *name = (font->font.full_name ? font->font.full_name
- : font->font.name ? font->font.name
- : NULL);
-
- return (name ? make_unibyte_string (name, strlen (name)) : null_string);
+ font_assert (FONT_OBJECT_P (font_object));
+ return AREF (font_object, FONT_NAME_INDEX);
}
font_get_spec (font_object)
Lisp_Object font_object;
{
- struct font *font = XSAVE_VALUE (font_object)->pointer;
- Lisp_Object spec = Ffont_spec (0, NULL);
+ Lisp_Object spec = font_make_spec ();
int i;
for (i = 0; i < FONT_SIZE_INDEX; i++)
- ASET (spec, i, AREF (font->entity, i));
- ASET (spec, FONT_SIZE_INDEX, make_number (font->pixel_size));
+ ASET (spec, i, AREF (font_object, i));
+ ASET (spec, FONT_SIZE_INDEX,
+ make_number (XFONT_OBJECT (font_object)->pixel_size));
return spec;
}
+Lisp_Object
+font_spec_from_name (font_name)
+ Lisp_Object font_name;
+{
+ Lisp_Object args[2];
-/* Return the frame on which FONT exists. FONT is a font object or a
- font entity. */
+ args[0] = QCname;
+ args[1] = font_name;
+ return Ffont_spec (2, args);
+}
-Lisp_Object
-font_get_frame (font)
- Lisp_Object font;
+
+void
+font_clear_prop (attrs, prop)
+ Lisp_Object *attrs;
+ enum font_property_index prop;
{
- if (FONT_OBJECT_P (font))
- font = ((struct font *) XSAVE_VALUE (font)->pointer)->entity;
- xassert (FONT_ENTITY_P (font));
- return AREF (font, FONT_FRAME_INDEX);
+ Lisp_Object font = attrs[LFACE_FONT_INDEX];
+
+ if (! FONTP (font))
+ return;
+ if (NILP (AREF (font, prop))
+ && prop != FONT_FAMILY_INDEX && prop != FONT_FOUNDRY_INDEX
+ && prop != FONT_SIZE_INDEX)
+ return;
+ font = Fcopy_font_spec (font);
+ ASET (font, prop, Qnil);
+ if (prop == FONT_FAMILY_INDEX || prop == FONT_FOUNDRY_INDEX)
+ {
+ if (prop == FONT_FAMILY_INDEX)
+ ASET (font, FONT_FOUNDRY_INDEX, Qnil);
+ ASET (font, FONT_ADSTYLE_INDEX, Qnil);
+ ASET (font, FONT_REGISTRY_INDEX, Qnil);
+ ASET (font, FONT_SIZE_INDEX, Qnil);
+ ASET (font, FONT_DPI_INDEX, Qnil);
+ ASET (font, FONT_SPACING_INDEX, Qnil);
+ ASET (font, FONT_AVGWIDTH_INDEX, Qnil);
+ }
+ else if (prop == FONT_SIZE_INDEX)
+ {
+ ASET (font, FONT_DPI_INDEX, Qnil);
+ ASET (font, FONT_SPACING_INDEX, Qnil);
+ ASET (font, FONT_AVGWIDTH_INDEX, Qnil);
+ }
+ attrs[LFACE_FONT_INDEX] = font;
}
+void
+font_update_lface (f, attrs)
+ FRAME_PTR f;
+ Lisp_Object *attrs;
+{
+ Lisp_Object spec;
+
+ spec = attrs[LFACE_FONT_INDEX];
+ if (! FONT_SPEC_P (spec))
+ return;
-/* Find a font entity best matching with LFACE. If SPEC is non-nil,
- the font must exactly match with it. C, if not negative, is a
+ if (! NILP (AREF (spec, FONT_FOUNDRY_INDEX)))
+ attrs[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (spec, FONT_FOUNDRY_INDEX));
+ if (! NILP (AREF (spec, FONT_FAMILY_INDEX)))
+ attrs[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (spec, FONT_FAMILY_INDEX));
+ if (! NILP (AREF (spec, FONT_WEIGHT_INDEX)))
+ attrs[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (spec);
+ if (! NILP (AREF (spec, FONT_SLANT_INDEX)))
+ attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);;
+ if (! NILP (AREF (spec, FONT_WIDTH_INDEX)))
+ attrs[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (spec);
+ if (! NILP (AREF (spec, FONT_SIZE_INDEX)))
+ {
+ int point;
+
+ if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
+ {
+ Lisp_Object val;
+ int dpi = f->resy;
+
+ val = Ffont_get (spec, QCdpi);
+ if (! NILP (val))
+ dpi = XINT (val);
+ point = PIXEL_TO_POINT (XINT (AREF (spec, FONT_SIZE_INDEX)) * 10,
+ dpi);
+ }
+ else if (FLOATP (AREF (spec, FONT_SIZE_INDEX)))
+ point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10;
+ attrs[LFACE_HEIGHT_INDEX] = make_number (point);
+ }
+}
+
+
+/* Return a font-entity satisfying SPEC and best matching with face's
+ font related attributes in ATTRS. C, if not negative, is a
character that the entity must support. */
Lisp_Object
-font_find_for_lface (f, lface, spec, c)
+font_find_for_lface (f, attrs, spec, c)
FRAME_PTR f;
- Lisp_Object *lface;
+ Lisp_Object *attrs;
Lisp_Object spec;
int c;
{
- Lisp_Object frame, entities, val;
- int i, result;
+ Lisp_Object work;
+ Lisp_Object frame, entities, val, props[FONT_REGISTRY_INDEX + 1] ;
+ Lisp_Object size, foundry[3], *family, registry[3], adstyle[3];
+ int pixel_size;
+ int i, j, k, l, result;
- XSETFRAME (frame, f);
+ registry[0] = AREF (spec, FONT_REGISTRY_INDEX);
+ if (NILP (registry[0]))
+ {
+ registry[0] = DEFAULT_ENCODING;
+ registry[1] = Qascii_0;
+ registry[2] = null_vector;
+ }
+ else
+ registry[1] = null_vector;
- if (NILP (spec))
+ if (c >= 0 && ! NILP (AREF (spec, FONT_REGISTRY_INDEX)))
{
- if (c >= 0x100)
+ struct charset *encoding, *repertory;
+
+ if (font_registry_charsets (AREF (spec, FONT_REGISTRY_INDEX),
+ &encoding, &repertory) < 0)
return Qnil;
- for (i = 0; i < FONT_SPEC_MAX; i++)
- ASET (scratch_font_spec, i, Qnil);
- ASET (scratch_font_spec, FONT_REGISTRY_INDEX, Qiso8859_1);
-
- if (! NILP (lface[LFACE_FAMILY_INDEX]))
- font_merge_old_spec (Qnil, lface[LFACE_FAMILY_INDEX], Qnil,
- scratch_font_spec);
- entities = font_list_entities (frame, scratch_font_spec);
- while (ASIZE (entities) == 0)
+ if (repertory)
{
- /* Try without FOUNDRY or FAMILY. */
- if (! NILP (AREF (scratch_font_spec, FONT_FOUNDRY_INDEX)))
- {
- ASET (scratch_font_spec, FONT_FOUNDRY_INDEX, Qnil);
- entities = font_list_entities (frame, scratch_font_spec);
- }
- else if (! NILP (AREF (scratch_font_spec, FONT_FAMILY_INDEX)))
- {
- ASET (scratch_font_spec, FONT_FAMILY_INDEX, Qnil);
- entities = font_list_entities (frame, scratch_font_spec);
- }
- else
- break;
+ if (ENCODE_CHAR (repertory, c) == CHARSET_INVALID_CODE (repertory))
+ return Qnil;
+ /* Any font of this registry support C. So, let's
+ suppress the further checking. */
+ c = -1;
}
+ else if (c > encoding->max_char)
+ return Qnil;
+ }
+
+ work = Fcopy_font_spec (spec);
+ XSETFRAME (frame, f);
+ size = AREF (spec, FONT_SIZE_INDEX);
+ pixel_size = font_pixel_size (f, spec);
+ if (pixel_size == 0)
+ {
+ double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
+
+ pixel_size = POINT_TO_PIXEL (pt / 10, f->resy);
+ }
+ ASET (work, FONT_SIZE_INDEX, Qnil);
+ foundry[0] = AREF (work, FONT_FOUNDRY_INDEX);
+ if (! NILP (foundry[0]))
+ foundry[1] = null_vector;
+ else if (STRINGP (attrs[LFACE_FOUNDRY_INDEX]))
+ {
+ val = attrs[LFACE_FOUNDRY_INDEX];
+ foundry[0] = font_intern_prop ((char *) SDATA (val), SBYTES (val), 1);
+ foundry[1] = Qnil;
+ foundry[2] = null_vector;
}
else
+ foundry[0] = Qnil, foundry[1] = null_vector;
+
+ adstyle[0] = AREF (work, FONT_ADSTYLE_INDEX);
+ if (! NILP (adstyle[0]))
+ adstyle[1] = null_vector;
+ else if (FONTP (attrs[LFACE_FONT_INDEX]))
{
- Lisp_Object registry = AREF (spec, FONT_REGISTRY_INDEX);
+ Lisp_Object face_font = attrs[LFACE_FONT_INDEX];
- if (NILP (registry))
- registry = Qiso8859_1;
+ if (! NILP (AREF (face_font, FONT_ADSTYLE_INDEX)))
+ {
+ adstyle[0] = AREF (face_font, FONT_ADSTYLE_INDEX);
+ adstyle[1] = Qnil;
+ adstyle[2] = null_vector;
+ }
+ else
+ adstyle[0] = Qnil, adstyle[1] = null_vector;
+ }
+ else
+ adstyle[0] = Qnil, adstyle[1] = null_vector;
- if (c >= 0)
+
+ val = AREF (work, FONT_FAMILY_INDEX);
+ if (NILP (val) && STRINGP (attrs[LFACE_FAMILY_INDEX]))
+ {
+ val = attrs[LFACE_FAMILY_INDEX];
+ val = font_intern_prop ((char *) SDATA (val), SBYTES (val), 1);
+ }
+ if (NILP (val))
+ {
+ family = alloca ((sizeof family[0]) * 2);
+ family[0] = Qnil;
+ family[1] = null_vector; /* terminator. */
+ }
+ else
+ {
+ Lisp_Object alters
+ = Fassoc_string (val, Vface_alternative_font_family_alist, Qt);
+
+ if (! NILP (alters))
{
- struct charset *encoding, *repertory;
+ family = alloca ((sizeof family[0]) * (XINT (Flength (alters)) + 2));
+ for (i = 0; CONSP (alters); i++, alters = XCDR (alters))
+ family[i] = XCAR (alters);
+ if (NILP (AREF (spec, FONT_FAMILY_INDEX)))
+ family[i++] = Qnil;
+ family[i] = null_vector;
+ }
+ else
+ {
+ family = alloca ((sizeof family[0]) * 3);
+ i = 0;
+ family[i++] = val;
+ if (NILP (AREF (spec, FONT_FAMILY_INDEX)))
+ family[i++] = Qnil;
+ family[i] = null_vector;
+ }
+ }
- if (font_registry_charsets (registry, &encoding, &repertory) < 0)
- return Qnil;
- if (repertory)
+ for (i = 0; SYMBOLP (family[i]); i++)
+ {
+ ASET (work, FONT_FAMILY_INDEX, family[i]);
+ for (j = 0; SYMBOLP (foundry[j]); j++)
+ {
+ ASET (work, FONT_FOUNDRY_INDEX, foundry[j]);
+ for (k = 0; SYMBOLP (registry[k]); k++)
{
- if (ENCODE_CHAR (repertory, c)
- == CHARSET_INVALID_CODE (repertory))
- return Qnil;
- /* Any font of this registry support C. So, let's
- suppress the further checking. */
- c = -1;
+ ASET (work, FONT_REGISTRY_INDEX, registry[k]);
+ for (l = 0; SYMBOLP (adstyle[l]); l++)
+ {
+ ASET (work, FONT_ADSTYLE_INDEX, adstyle[l]);
+ entities = font_list_entities (frame, work);
+ if (ASIZE (entities) > 0)
+ goto found;
+ }
}
- else if (c > encoding->max_char)
- return Qnil;
}
- for (i = 0; i < FONT_SPEC_MAX; i++)
- ASET (scratch_font_spec, i, AREF (spec, i));
- ASET (scratch_font_spec, FONT_REGISTRY_INDEX, registry);
- entities = font_list_entities (frame, scratch_font_spec);
}
-
- if (ASIZE (entities) == 0)
- return Qnil;
- if (ASIZE (entities) > 1)
+ return Qnil;
+ found:
+ if (ASIZE (entities) == 1)
+ {
+ if (c < 0)
+ return AREF (entities, 0);
+ }
+ else
{
/* Sort fonts by properties specified in LFACE. */
Lisp_Object prefer = scratch_font_prefer;
- double pt;
- if (! NILP (lface[LFACE_FAMILY_INDEX]))
- font_merge_old_spec (Qnil, lface[LFACE_FAMILY_INDEX], Qnil, prefer);
- ASET (prefer, FONT_WEIGHT_INDEX,
- font_prop_validate_style (QCweight, lface[LFACE_WEIGHT_INDEX]));
- ASET (prefer, FONT_SLANT_INDEX,
- font_prop_validate_style (QCslant, lface[LFACE_SLANT_INDEX]));
- ASET (prefer, FONT_WIDTH_INDEX,
- font_prop_validate_style (QCwidth, lface[LFACE_SWIDTH_INDEX]));
- pt = XINT (lface[LFACE_HEIGHT_INDEX]);
- ASET (prefer, FONT_SIZE_INDEX, make_float (pt / 10));
+ for (i = 0; i < FONT_EXTRA_INDEX; i++)
+ ASET (prefer, i, AREF (work, i));
+ if (FONTP (attrs[LFACE_FONT_INDEX]))
+ {
+ Lisp_Object face_font = attrs[LFACE_FONT_INDEX];
- font_sort_entites (entities, prefer, frame, spec);
+ for (i = 0; i < FONT_EXTRA_INDEX; i++)
+ if (NILP (AREF (prefer, i)))
+ ASET (prefer, i, AREF (face_font, i));
+ }
+ if (NILP (AREF (prefer, FONT_WEIGHT_INDEX)))
+ FONT_SET_STYLE (prefer, FONT_WEIGHT_INDEX, attrs[LFACE_WEIGHT_INDEX]);
+ if (NILP (AREF (prefer, FONT_SLANT_INDEX)))
+ FONT_SET_STYLE (prefer, FONT_SLANT_INDEX, attrs[LFACE_SLANT_INDEX]);
+ if (NILP (AREF (prefer, FONT_WIDTH_INDEX)))
+ FONT_SET_STYLE (prefer, FONT_WIDTH_INDEX, attrs[LFACE_SWIDTH_INDEX]);
+ ASET (prefer, FONT_SIZE_INDEX, make_number (pixel_size));
+ entities = font_sort_entites (entities, prefer, frame, c < 0);
}
-
if (c < 0)
- return AREF (entities, 0);
+ return entities;
- val = AREF (entities, 0);
- result = font_has_char (f, val, c);
- if (result > 0)
- return val;
- if (result == 0)
- return Qnil;
- val = font_open_for_lface (f, val, lface, spec);
- if (NILP (val))
- return Qnil;
- result = font_has_char (f, val, c);
- font_close_object (f, val);
- if (result > 0)
- return val;
+ for (i = 0; i < ASIZE (entities); i++)
+ {
+ int j;
+
+ val = AREF (entities, i);
+ if (i > 0)
+ {
+ for (j = FONT_FOUNDRY_INDEX; j <= FONT_REGISTRY_INDEX; j++)
+ if (! EQ (AREF (val, j), props[j]))
+ break;
+ if (j > FONT_REGISTRY_INDEX)
+ continue;
+ }
+ for (j = FONT_FOUNDRY_INDEX; j <= FONT_REGISTRY_INDEX; j++)
+ props[j] = AREF (val, j);
+ result = font_has_char (f, val, c);
+ if (result > 0)
+ return val;
+ if (result == 0)
+ return Qnil;
+ val = font_open_for_lface (f, val, attrs, spec);
+ if (NILP (val))
+ continue;
+ result = font_has_char (f, val, c);
+ font_close_object (f, val);
+ if (result > 0)
+ return AREF (entities, i);
+ }
return Qnil;
}
Lisp_Object
-font_open_for_lface (f, entity, lface, spec)
+font_open_for_lface (f, entity, attrs, spec)
FRAME_PTR f;
Lisp_Object entity;
- Lisp_Object *lface;
+ Lisp_Object *attrs;
Lisp_Object spec;
{
int size;
- if (FONT_SPEC_P (spec) && INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
- size = XINT (AREF (spec, FONT_SIZE_INDEX));
+ if (INTEGERP (AREF (entity, FONT_SIZE_INDEX))
+ && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0)
+ size = XINT (AREF (entity, FONT_SIZE_INDEX));
+ else if (FONT_SPEC_P (spec) && ! NILP (AREF (spec, FONT_SIZE_INDEX)))
+ size = font_pixel_size (f, spec);
else
{
- double pt = XINT (lface[LFACE_HEIGHT_INDEX]);
+ double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
pt /= 10;
size = POINT_TO_PIXEL (pt, f->resy);
+#ifdef HAVE_NS
+ if (size == 0)
+ {
+ Lisp_Object ffsize = get_frame_param(f, Qfontsize);
+ size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0;
+ }
+#endif
}
return font_open_entity (f, entity, size);
}
-/* Load a font best matching with FACE's font-related properties into
- FACE on frame F. If no proper font is found, record that FACE has
- no font. */
+/* Find a font satisfying SPEC and best matching with face's
+ attributes in ATTRS on FRAME, and return the opened
+ font-object. */
-void
-font_load_for_face (f, face)
+Lisp_Object
+font_load_for_lface (f, attrs, spec)
FRAME_PTR f;
- struct face *face;
+ Lisp_Object *attrs, spec;
{
- Lisp_Object font_object = face->lface[LFACE_FONT_INDEX];
-
- if (NILP (font_object))
- {
- Lisp_Object entity = font_find_for_lface (f, face->lface, Qnil, -1);
-
- if (! NILP (entity))
- font_object = font_open_for_lface (f, entity, face->lface, Qnil);
- }
- else if (STRINGP (font_object))
- {
- font_object = font_open_by_name (f, SDATA (font_object));
- }
-
- if (! NILP (font_object))
- {
- struct font *font = XSAVE_VALUE (font_object)->pointer;
+ Lisp_Object entity;
- face->font = font->font.font;
- face->font_info = (struct font_info *) font;
- face->font_info_id = 0;
- face->font_name = font->font.full_name;
- }
- else
+ entity = font_find_for_lface (f, attrs, spec, -1);
+ if (NILP (entity))
{
- face->font = NULL;
- face->font_info = NULL;
- face->font_info_id = -1;
- face->font_name = NULL;
- add_to_log ("Unable to load font for a face%s", null_string, Qnil);
+ /* No font is listed for SPEC, but each font-backend may have
+ the different criteria about "font matching". So, try
+ it. */
+ entity = font_matching_entity (f, attrs, spec);
+ if (NILP (entity))
+ return Qnil;
}
+ return font_open_for_lface (f, entity, attrs, spec);
}
FRAME_PTR f;
struct face *face;
{
- struct font *font = (struct font *) face->font_info;
-
- if (font->driver->prepare_face)
- font->driver->prepare_face (f, face);
+ if (face->font->driver->prepare_face)
+ face->font->driver->prepare_face (f, face);
}
FRAME_PTR f;
struct face *face;
{
- struct font *font = (struct font *) face->font_info;
-
- if (font->driver->done_face)
- font->driver->done_face (f, face);
+ if (face->font->driver->done_face)
+ face->font->driver->done_face (f, face);
face->extra = NULL;
}
char *name;
{
Lisp_Object args[2];
- Lisp_Object spec, prefer, size, entity, entity_list;
- Lisp_Object frame;
- int i;
- int pixel_size;
-
- XSETFRAME (frame, f);
+ Lisp_Object spec, attrs[LFACE_VECTOR_SIZE];
args[0] = QCname;
args[1] = make_unibyte_string (name, strlen (name));
spec = Ffont_spec (2, args);
- prefer = scratch_font_prefer;
- for (i = FONT_WEIGHT_INDEX; i < FONT_SIZE_INDEX; i++)
- if (NILP (AREF (spec, i)))
- ASET (prefer, i, make_number (100));
- size = AREF (spec, FONT_SIZE_INDEX);
- if (NILP (size))
- pixel_size = 0;
- else if (INTEGERP (size))
- pixel_size = XINT (size);
- else /* FLOATP (size) */
- {
- double pt = XFLOAT_DATA (size);
-
- pixel_size = POINT_TO_PIXEL (pt, f->resy);
- size = make_number (pixel_size);
- ASET (spec, FONT_SIZE_INDEX, size);
- }
- if (pixel_size == 0)
- {
- pixel_size = POINT_TO_PIXEL (12.0, f->resy);
- size = make_number (pixel_size);
- }
- ASET (prefer, FONT_SIZE_INDEX, size);
- if (NILP (AREF (spec, FONT_REGISTRY_INDEX)))
- ASET (spec, FONT_REGISTRY_INDEX, Qiso8859_1);
+ /* We set up the default font-related attributes of a face to prefer
+ a moderate font. */
+ attrs[LFACE_FAMILY_INDEX] = attrs[LFACE_FOUNDRY_INDEX] = Qnil;
+ attrs[LFACE_SWIDTH_INDEX] = attrs[LFACE_WEIGHT_INDEX]
+ = attrs[LFACE_SLANT_INDEX] = Qnormal;
+#ifndef HAVE_NS
+ attrs[LFACE_HEIGHT_INDEX] = make_number (120);
+#else
+ attrs[LFACE_HEIGHT_INDEX] = make_number (0);
+#endif
+ attrs[LFACE_FONT_INDEX] = Qnil;
- entity_list = Flist_fonts (spec, frame, make_number (1), prefer);
- if (NILP (entity_list))
- entity = font_matching_entity (frame, spec);
- else
- entity = XCAR (entity_list);
- return (NILP (entity)
- ? Qnil
- : font_open_entity (f, entity, pixel_size));
+ return font_load_for_lface (f, attrs, spec);
}
f->font_driver_list = list;
else
font_driver_list = list;
- num_font_drivers++;
-}
-
-
-/* Free font-driver list on frame F. It doesn't free font-drivers
- themselves. */
-
-void
-free_font_driver_list (f)
- FRAME_PTR f;
-{
- while (f->font_driver_list)
- {
- struct font_driver_list *next = f->font_driver_list->next;
-
- free (f->font_driver_list);
- f->font_driver_list = next;
- }
+ if (! f)
+ num_font_drivers++;
}
Lisp_Object new_drivers;
{
Lisp_Object active_drivers = Qnil;
+ struct font_driver *driver;
struct font_driver_list *list;
+ /* At first, turn off non-requested drivers, and turn on requested
+ drivers. */
for (list = f->font_driver_list; list; list = list->next)
- if (list->on)
- {
- if (! EQ (new_drivers, Qt)
- && NILP (Fmemq (list->driver->type, new_drivers)))
- {
- if (list->driver->end_for_frame)
- list->driver->end_for_frame (f);
- font_finish_cache (f, list->driver);
- list->on = 0;
- }
- }
- else
- {
- if (EQ (new_drivers, Qt)
- || ! NILP (Fmemq (list->driver->type, new_drivers)))
- {
- if (! list->driver->start_for_frame
- || list->driver->start_for_frame (f) == 0)
- {
- font_prepare_cache (f, list->driver);
- list->on = 1;
- active_drivers = nconc2 (active_drivers,
- Fcons (list->driver->type, Qnil));
- }
- }
- }
+ {
+ driver = list->driver;
+ if ((EQ (new_drivers, Qt) || ! NILP (Fmemq (driver->type, new_drivers)))
+ != list->on)
+ {
+ if (list->on)
+ {
+ if (driver->end_for_frame)
+ driver->end_for_frame (f);
+ font_finish_cache (f, driver);
+ list->on = 0;
+ }
+ else
+ {
+ if (! driver->start_for_frame
+ || driver->start_for_frame (f) == 0)
+ {
+ font_prepare_cache (f, driver);
+ list->on = 1;
+ }
+ }
+ }
+ }
+ if (NILP (new_drivers))
+ return Qnil;
+
+ if (! EQ (new_drivers, Qt))
+ {
+ /* Re-order the driver list according to new_drivers. */
+ struct font_driver_list **list_table, **next;
+ Lisp_Object tail;
+ int i;
+
+ list_table = alloca (sizeof list_table[0] * (num_font_drivers + 1));
+ for (i = 0, tail = new_drivers; ! NILP (tail); tail = XCDR (tail))
+ {
+ for (list = f->font_driver_list; list; list = list->next)
+ if (list->on && EQ (list->driver->type, XCAR (tail)))
+ break;
+ if (list)
+ list_table[i++] = list;
+ }
+ for (list = f->font_driver_list; list; list = list->next)
+ if (! list->on)
+ list_table[i] = list;
+ list_table[i] = NULL;
+
+ next = &f->font_driver_list;
+ for (i = 0; list_table[i]; i++)
+ {
+ *next = list_table[i];
+ next = &(*next)->next;
+ }
+ *next = NULL;
+ }
+
+ for (list = f->font_driver_list; list; list = list->next)
+ if (list->on)
+ active_drivers = nconc2 (active_drivers,
+ Fcons (list->driver->type, Qnil));
return active_drivers;
}
{
FRAME_PTR f;
int multibyte;
+ Lisp_Object font_object;
if (c < 0)
{
int face_id = FACE_FOR_CHAR (f, face, c, pos, string);
face = FACE_FROM_ID (f, face_id);
}
- if (! face->font_info)
+ if (! face->font)
return Qnil;
- return font_find_object ((struct font *) face->font_info);
+
+ XSETFONT (font_object, face->font);
+ return font_object;
+}
+
+
+#ifdef HAVE_WINDOW_SYSTEM
+
+/* Check how many characters after POS (at most to *LIMIT) can be
+ displayed by the same font on the window W. FACE, if non-NULL, is
+ the face selected for the character at POS. If STRING is not nil,
+ it is the string to check instead of the current buffer. In that
+ case, FACE must be not NULL.
+
+ The return value is the font-object for the character at POS.
+ *LIMIT is set to the position where that font can't be used.
+
+ It is assured that the current buffer (or STRING) is multibyte. */
+
+Lisp_Object
+font_range (pos, limit, w, face, string)
+ EMACS_INT pos, *limit;
+ struct window *w;
+ struct face *face;
+ Lisp_Object string;
+{
+ EMACS_INT pos_byte, ignore, start, start_byte;
+ int c;
+ Lisp_Object font_object = Qnil;
+
+ if (NILP (string))
+ {
+ pos_byte = CHAR_TO_BYTE (pos);
+ if (! face)
+ {
+ int face_id;
+
+ face_id = face_at_buffer_position (w, pos, 0, 0, &ignore, *limit, 0);
+ face = FACE_FROM_ID (XFRAME (w->frame), face_id);
+ }
+ }
+ else
+ {
+ font_assert (face);
+ pos_byte = string_char_to_byte (string, pos);
+ }
+
+ start = pos, start_byte = pos_byte;
+ while (pos < *limit)
+ {
+ Lisp_Object category;
+
+ if (NILP (string))
+ FETCH_CHAR_ADVANCE_NO_CHECK (c, pos, pos_byte);
+ else
+ FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, pos, pos_byte);
+ if (NILP (font_object))
+ {
+ font_object = font_for_char (face, c, pos - 1, string);
+ if (NILP (font_object))
+ return Qnil;
+ continue;
+ }
+
+ category = CHAR_TABLE_REF (Vunicode_category_table, c);
+ if (! EQ (category, QCf)
+ && font_encode_char (font_object, c) == FONT_INVALID_CODE)
+ {
+ Lisp_Object f = font_for_char (face, c, pos - 1, string);
+ EMACS_INT i, i_byte;
+
+
+ if (NILP (f))
+ {
+ *limit = pos - 1;
+ return font_object;
+ }
+ i = start, i_byte = start_byte;
+ while (i < pos - 1)
+ {
+
+ if (NILP (string))
+ FETCH_CHAR_ADVANCE_NO_CHECK (c, i, i_byte);
+ else
+ FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, i, i_byte);
+ category = CHAR_TABLE_REF (Vunicode_category_table, c);
+ if (! EQ (category, QCf)
+ && font_encode_char (f, c) == FONT_INVALID_CODE)
+ {
+ *limit = pos - 1;
+ return font_object;
+ }
+ }
+ font_object = f;
+ }
+ }
+ return font_object;
}
+#endif
\f
/* Lisp API */
-DEFUN ("fontp", Ffontp, Sfontp, 1, 1, 0,
+DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.
-Return nil otherwise. */)
- (object)
- Lisp_Object object;
+Return nil otherwise.
+Optional 2nd argument EXTRA-TYPE, if non-nil, specifies to check
+which kind of font it is. It must be one of `font-spec', `font-entity',
+`font-object'. */)
+ (object, extra_type)
+ Lisp_Object object, extra_type;
{
- return (FONTP (object) ? Qt : Qnil);
+ if (NILP (extra_type))
+ return (FONTP (object) ? Qt : Qnil);
+ if (EQ (extra_type, Qfont_spec))
+ return (FONT_SPEC_P (object) ? Qt : Qnil);
+ if (EQ (extra_type, Qfont_entity))
+ return (FONT_ENTITY_P (object) ? Qt : Qnil);
+ if (EQ (extra_type, Qfont_object))
+ return (FONT_OBJECT_P (object) ? Qt : Qnil);
+ wrong_type_argument (intern ("font-extra-type"), extra_type);
}
DEFUN ("font-spec", Ffont_spec, Sfont_spec, 0, MANY, 0,
`:adstyle'
VALUE must be a string or a symbol specifying the additional
-typographic style information of a font, e.g. ``sans''. Usually null.
+typographic style information of a font, e.g. ``sans''.
`:registry'
`:size'
VALUE must be a non-negative integer or a floating point number
-specifying the font size. It specifies the font size in 1/10 pixels
+specifying the font size. It specifies the font size in pixels
(if VALUE is an integer), or in points (if VALUE is a float).
+
+`:name'
+
+VALUE must be a string of XLFD-style or fontconfig-style font name.
usage: (font-spec ARGS ...) */)
(nargs, args)
int nargs;
Lisp_Object *args;
{
- Lisp_Object spec = Fmake_vector (make_number (FONT_SPEC_MAX), Qnil);
+ Lisp_Object spec = font_make_spec ();
int i;
for (i = 0; i < nargs; i += 2)
{
- enum font_property_index prop;
Lisp_Object key = args[i], val = args[i + 1];
- prop = get_font_prop_index (key, 0);
- if (prop < FONT_EXTRA_INDEX)
- ASET (spec, prop, val);
+ if (EQ (key, QCname))
+ {
+ CHECK_STRING (val);
+ font_parse_name ((char *) SDATA (val), spec);
+ font_put_extra (spec, key, val);
+ }
else
{
- if (EQ (key, QCname))
+ int idx = get_font_prop_index (key);
+
+ if (idx >= 0)
{
- CHECK_STRING (val);
- font_parse_name ((char *) SDATA (val), spec);
+ val = font_prop_validate (idx, Qnil, val);
+ if (idx < FONT_EXTRA_INDEX)
+ ASET (spec, idx, val);
+ else
+ font_put_extra (spec, key, val);
}
- font_put_extra (spec, key, val);
+ else
+ font_put_extra (spec, key, font_prop_validate (0, key, val));
}
}
- CHECK_VALIDATE_FONT_SPEC (spec);
return spec;
}
-
+DEFUN ("copy-font-spec", Fcopy_font_spec, Scopy_font_spec, 1, 1, 0,
+ doc: /* Return a copy of FONT as a font-spec. */)
+ (font)
+ Lisp_Object font;
+{
+ Lisp_Object new_spec, tail, prev, extra;
+ int i;
+
+ CHECK_FONT (font);
+ new_spec = font_make_spec ();
+ for (i = 1; i < FONT_EXTRA_INDEX; i++)
+ ASET (new_spec, i, AREF (font, i));
+ extra = Fcopy_sequence (AREF (font, FONT_EXTRA_INDEX));
+ /* We must remove :font-entity property. */
+ for (prev = Qnil, tail = extra; CONSP (tail); prev = tail, tail = XCDR (tail))
+ if (EQ (XCAR (XCAR (tail)), QCfont_entity))
+ {
+ if (NILP (prev))
+ extra = XCDR (extra);
+ else
+ XSETCDR (prev, XCDR (tail));
+ break;
+ }
+ ASET (new_spec, FONT_EXTRA_INDEX, extra);
+ return new_spec;
+}
+
+DEFUN ("merge-font-spec", Fmerge_font_spec, Smerge_font_spec, 2, 2, 0,
+ doc: /* Merge font-specs FROM and TO, and return a new font-spec.
+Every specified properties in FROM override the corresponding
+properties in TO. */)
+ (from, to)
+ Lisp_Object from, to;
+{
+ Lisp_Object extra, tail;
+ int i;
+
+ CHECK_FONT (from);
+ CHECK_FONT (to);
+ to = Fcopy_font_spec (to);
+ for (i = 0; i < FONT_EXTRA_INDEX; i++)
+ ASET (to, i, AREF (from, i));
+ extra = AREF (to, FONT_EXTRA_INDEX);
+ for (tail = AREF (from, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail))
+ if (! EQ (XCAR (XCAR (tail)), Qfont_entity))
+ {
+ Lisp_Object slot = assq_no_quit (XCAR (XCAR (tail)), extra);
+
+ if (! NILP (slot))
+ XSETCDR (slot, XCDR (XCAR (tail)));
+ else
+ extra = Fcons (Fcons (XCAR (XCAR (tail)), XCDR (XCAR (tail))), extra);
+ }
+ ASET (to, FONT_EXTRA_INDEX, extra);
+ return to;
+}
+
DEFUN ("font-get", Ffont_get, Sfont_get, 2, 2, 0,
doc: /* Return the value of FONT's property KEY.
FONT is a font-spec, a font-entity, or a font-object. */)
(font, key)
Lisp_Object font, key;
{
- enum font_property_index idx;
+ int idx;
- if (FONT_OBJECT_P (font))
+ CHECK_FONT (font);
+ CHECK_SYMBOL (key);
+
+ idx = get_font_prop_index (key);
+ if (idx >= FONT_WEIGHT_INDEX && idx <= FONT_WIDTH_INDEX)
+ return font_style_symbolic (font, idx, 0);
+ if (idx >= 0 && idx < FONT_EXTRA_INDEX)
+ return AREF (font, idx);
+ return Fcdr (Fassq (key, AREF (font, FONT_EXTRA_INDEX)));
+}
+
+#ifdef HAVE_WINDOW_SYSTEM
+
+DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, 2, 0,
+ doc: /* Return a plist of face attributes generated by FONT.
+FONT is a font name, a font-spec, a font-entity, or a font-object.
+The return value is a list of the form
+
+\(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH)
+
+where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values
+compatible with `set-face-attribute'. Some of these key-attribute pairs
+may be omitted from the list if they are not specified by FONT.
+
+The optional argument FRAME specifies the frame that the face attributes
+are to be displayed on. If omitted, the selected frame is used. */)
+ (font, frame)
+ Lisp_Object font, frame;
+{
+ struct frame *f;
+ Lisp_Object plist[10];
+ Lisp_Object val;
+ int n = 0;
+
+ if (NILP (frame))
+ frame = selected_frame;
+ CHECK_LIVE_FRAME (frame);
+ f = XFRAME (frame);
+
+ if (STRINGP (font))
{
- struct font *fontp = XSAVE_VALUE (font)->pointer;
+ int fontset = fs_query_fontset (font, 0);
+ Lisp_Object name = font;
+ if (fontset >= 0)
+ font = fontset_ascii (fontset);
+ font = font_spec_from_name (name);
+ if (! FONTP (font))
+ signal_error ("Invalid font name", name);
+ }
+ else if (! FONTP (font))
+ signal_error ("Invalid font object", font);
- if (EQ (key, QCotf))
- {
- if (fontp->driver->otf_capability)
- return fontp->driver->otf_capability (fontp);
- else
- return Qnil;
- }
- font = fontp->entity;
+ val = AREF (font, FONT_FAMILY_INDEX);
+ if (! NILP (val))
+ {
+ plist[n++] = QCfamily;
+ plist[n++] = SYMBOL_NAME (val);
}
- else
- CHECK_FONT (font);
- idx = get_font_prop_index (key, 0);
- if (idx < FONT_EXTRA_INDEX)
- return AREF (font, idx);
- if (FONT_ENTITY_P (font))
- return Qnil;
- return Fcdr (Fassoc (key, AREF (font, FONT_EXTRA_INDEX)));
+
+ val = AREF (font, FONT_SIZE_INDEX);
+ if (INTEGERP (val))
+ {
+ Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
+ int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : f->resy;
+ plist[n++] = QCheight;
+ plist[n++] = make_number (PIXEL_TO_POINT (XINT (val) * 10, dpi));
+ }
+ else if (FLOATP (val))
+ {
+ plist[n++] = QCheight;
+ plist[n++] = make_number (10 * (int) XFLOAT_DATA (val));
+ }
+
+ val = FONT_WEIGHT_FOR_FACE (font);
+ if (! NILP (val))
+ {
+ plist[n++] = QCweight;
+ plist[n++] = val;
+ }
+
+ val = FONT_SLANT_FOR_FACE (font);
+ if (! NILP (val))
+ {
+ plist[n++] = QCslant;
+ plist[n++] = val;
+ }
+
+ val = FONT_WIDTH_FOR_FACE (font);
+ if (! NILP (val))
+ {
+ plist[n++] = QCwidth;
+ plist[n++] = val;
+ }
+
+ return Flist (n, plist);
}
+#endif
DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0,
doc: /* Set one property of FONT-SPEC: give property PROP value VAL. */)
(font_spec, prop, val)
Lisp_Object font_spec, prop, val;
{
- enum font_property_index idx;
- Lisp_Object extra, slot;
+ int idx;
CHECK_FONT_SPEC (font_spec);
- idx = get_font_prop_index (prop, 0);
- if (idx < FONT_EXTRA_INDEX)
- return ASET (font_spec, idx, val);
- extra = AREF (font_spec, FONT_EXTRA_INDEX);
- slot = Fassoc (extra, prop);
- if (NILP (slot))
- extra = Fcons (Fcons (prop, val), extra);
+ idx = get_font_prop_index (prop);
+ if (idx >= 0 && idx < FONT_EXTRA_INDEX)
+ ASET (font_spec, idx, font_prop_validate (idx, Qnil, val));
else
- Fsetcdr (slot, val);
+ font_put_extra (font_spec, prop, font_prop_validate (0, prop, val));
return val;
}
Optional 3rd argument NUM, if non-nil, limits the number of returned fonts.
Optional 4th argument PREFER, if non-nil, is a font-spec to
control the order of the returned list. Fonts are sorted by
-how they are close to PREFER. */)
+how close they are to PREFER. */)
(font_spec, frame, num, prefer)
Lisp_Object font_spec, frame, num, prefer;
{
if (NILP (frame))
frame = selected_frame;
CHECK_LIVE_FRAME (frame);
- CHECK_VALIDATE_FONT_SPEC (font_spec);
+ CHECK_FONT_SPEC (font_spec);
if (! NILP (num))
{
CHECK_NUMBER (num);
return Qnil;
}
if (! NILP (prefer))
- CHECK_FONT (prefer);
+ CHECK_FONT_SPEC (prefer);
vec = font_list_entities (frame, font_spec);
len = ASIZE (vec);
return Fcons (AREF (vec, 0), Qnil);
if (! NILP (prefer))
- vec = font_sort_entites (vec, prefer, frame, font_spec);
+ vec = font_sort_entites (vec, prefer, frame, 0);
list = tail = Fcons (AREF (vec, 0), Qnil);
if (n == 0 || n > len)
return list;
}
-DEFUN ("list-families", Flist_families, Slist_families, 0, 1, 0,
+DEFUN ("font-family-list", Ffont_family_list, Sfont_family_list, 0, 1, 0,
doc: /* List available font families on the current frame.
-Optional argument FRAME specifies the target frame. */)
+Optional argument FRAME, if non-nil, specifies the target frame. */)
(frame)
Lisp_Object frame;
{
return val;
}
-DEFUN ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 1, 0,
+DEFUN ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 2, 0,
doc: /* Return XLFD name of FONT.
FONT is a font-spec, font-entity, or font-object.
-If the name is too long for XLFD (maximum 255 chars), return nil. */)
- (font)
- Lisp_Object font;
+If the name is too long for XLFD (maximum 255 chars), return nil.
+If the 2nd optional arg FOLD-WILDCARDS is non-nil,
+the consecutive wildcards are folded to one. */)
+ (font, fold_wildcards)
+ Lisp_Object font, fold_wildcards;
{
char name[256];
int pixel_size = 0;
- if (FONT_SPEC_P (font))
- CHECK_VALIDATE_FONT_SPEC (font);
- else if (FONT_ENTITY_P (font))
- CHECK_FONT (font);
- else
+ CHECK_FONT (font);
+
+ if (FONT_OBJECT_P (font))
{
- struct font *fontp;
+ Lisp_Object font_name = AREF (font, FONT_NAME_INDEX);
- CHECK_FONT_GET_OBJECT (font, fontp);
- font = fontp->entity;
- pixel_size = fontp->pixel_size;
+ if (STRINGP (font_name)
+ && SDATA (font_name)[0] == '-')
+ {
+ if (NILP (fold_wildcards))
+ return font_name;
+ strcpy (name, (char *) SDATA (font_name));
+ goto done;
+ }
+ pixel_size = XFONT_OBJECT (font)->pixel_size;
}
-
if (font_unparse_xlfd (font, pixel_size, name, 256) < 0)
return Qnil;
+ done:
+ if (! NILP (fold_wildcards))
+ {
+ char *p0 = name, *p1;
+
+ while ((p1 = strstr (p0, "-*-*")))
+ {
+ strcpy (p1, p1 + 2);
+ p0 = p1;
+ }
+ }
+
return build_string (name);
}
while (! NILP (val)
&& ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
val = XCDR (val);
- xassert (! NILP (val));
+ font_assert (! NILP (val));
val = XCDR (XCAR (val));
if (XINT (XCAR (val)) == 0)
{
return Qnil;
}
-DEFUN ("internal-set-font-style-table", Finternal_set_font_style_table,
- Sinternal_set_font_style_table, 2, 2, 0,
- doc: /* Set font style table for PROP to TABLE.
-PROP must be `:weight', `:slant', or `:width'.
-TABLE must be an alist of symbols vs the corresponding numeric values
-sorted by numeric values. */)
- (prop, table)
- Lisp_Object prop, table;
-{
- int table_index;
- int numeric;
- Lisp_Object tail, val;
-
- CHECK_SYMBOL (prop);
- table_index = (EQ (prop, QCweight) ? 0
- : EQ (prop, QCslant) ? 1
- : EQ (prop, QCwidth) ? 2
- : 3);
- if (table_index >= ASIZE (font_style_table))
- error ("Invalid font style property: %s", SDATA (SYMBOL_NAME (prop)));
- table = Fcopy_sequence (table);
- numeric = -1;
- for (tail = table; CONSP (tail); tail = XCDR (tail))
- {
- prop = Fcar (XCAR (tail));
- val = Fcdr (XCAR (tail));
- CHECK_SYMBOL (prop);
- CHECK_NATNUM (val);
- if (numeric > XINT (val))
- error ("Numeric values not sorted for %s", SDATA (SYMBOL_NAME (prop)));
- else if (numeric == XINT (val))
- error ("Duplicate numeric values for %s", SDATA (SYMBOL_NAME (prop)));
- numeric = XINT (val);
- XSETCAR (tail, Fcons (prop, val));
- }
- ASET (font_style_table, table_index, table);
- return Qnil;
-}
-
-/* The following three functions are still expremental. */
-
-DEFUN ("font-make-gstring", Ffont_make_gstring, Sfont_make_gstring, 2, 2, 0,
- doc: /* Return a newly created g-string for FONT-OBJECT with NUM glyphs.
-FONT-OBJECT may be nil if it is not yet known.
-
-G-string is sequence of glyphs of a specific font,
-and is a vector of this form:
- [ HEADER GLYPH ... ]
-HEADER is a vector of this form:
- [FONT-OBJECT WIDTH LBEARING RBEARING ASCENT DESCENT]
-where
- FONT-OBJECT is a font-object for all glyphs in the g-string,
- WIDTH thry DESCENT are the metrics (in pixels) of the whole G-string.
-GLYPH is a vector of this form:
- [ FROM-IDX TO-IDX C CODE WIDTH LBEARING RBEARING ASCENT DESCENT
- [ [X-OFF Y-OFF WADJUST] | nil] ]
-where
- FROM-IDX and TO-IDX are used internally and should not be touched.
- C is the character of the glyph.
- CODE is the glyph-code of C in FONT-OBJECT.
- WIDTH thry DESCENT are the metrics (in pixels) of the glyph.
- X-OFF and Y-OFF are offests to the base position for the glyph.
- WADJUST is the adjustment to the normal width of the glyph. */)
- (font_object, num)
- Lisp_Object font_object, num;
-{
- Lisp_Object gstring, g;
- int len;
- int i;
-
- if (! NILP (font_object))
- CHECK_FONT_OBJECT (font_object);
- CHECK_NATNUM (num);
-
- len = XINT (num) + 1;
- gstring = Fmake_vector (make_number (len), Qnil);
- g = Fmake_vector (make_number (6), Qnil);
- ASET (g, 0, font_object);
- ASET (gstring, 0, g);
- for (i = 1; i < len; i++)
- ASET (gstring, i, Fmake_vector (make_number (10), Qnil));
- return gstring;
-}
-
-DEFUN ("font-fill-gstring", Ffont_fill_gstring, Sfont_fill_gstring, 4, 5, 0,
- doc: /* Fill in glyph-string GSTRING by characters for FONT-OBJECT.
-START and END specify the region to extract characters.
-If optional 5rd argument OBJECT is non-nil, it is a buffer or a string from
-where to extract characters.
-FONT-OBJECT may be nil if GSTRING already already contains one. */)
- (gstring, font_object, start, end, object)
- Lisp_Object gstring, font_object, start, end, object;
+\f
+void
+font_fill_lglyph_metrics (glyph, font_object)
+ Lisp_Object glyph, font_object;
{
- int len, i, c;
+ struct font *font = XFONT_OBJECT (font_object);
unsigned code;
- struct font *font;
-
- CHECK_VECTOR (gstring);
- if (NILP (font_object))
- font_object = LGSTRING_FONT (gstring);
- CHECK_FONT_GET_OBJECT (font_object, font);
-
- if (STRINGP (object))
- {
- const unsigned char *p;
+ /* ecode used in LGLYPH_SET_CODE to avoid compiler warnings. */
+ EMACS_INT ecode = font->driver->encode_char (font, LGLYPH_CHAR (glyph));
+ struct font_metrics metrics;
- CHECK_NATNUM (start);
- CHECK_NATNUM (end);
- if (XINT (start) > XINT (end)
- || XINT (end) > ASIZE (object)
- || XINT (end) - XINT (start) > LGSTRING_LENGTH (gstring))
- args_out_of_range_3 (object, start, end);
+ LGLYPH_SET_CODE (glyph, ecode);
+ code = ecode;
+ font->driver->text_extents (font, &code, 1, &metrics);
+ LGLYPH_SET_LBEARING (glyph, metrics.lbearing);
+ LGLYPH_SET_RBEARING (glyph, metrics.rbearing);
+ LGLYPH_SET_WIDTH (glyph, metrics.width);
+ LGLYPH_SET_ASCENT (glyph, metrics.ascent);
+ LGLYPH_SET_DESCENT (glyph, metrics.descent);
+}
- len = XINT (end) - XINT (start);
- p = SDATA (object) + string_char_to_byte (object, XINT (start));
- for (i = 0; i < len; i++)
- {
- Lisp_Object g = LGSTRING_GLYPH (gstring, i);
- /* Shut up GCC warning in comparison with
- MOST_POSITIVE_FIXNUM below. */
- EMACS_INT cod;
-
- c = STRING_CHAR_ADVANCE (p);
- cod = code = font->driver->encode_char (font, c);
- if (cod > MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
- break;
- LGLYPH_SET_FROM (g, i);
- LGLYPH_SET_TO (g, i);
- LGLYPH_SET_CHAR (g, c);
- LGLYPH_SET_CODE (g, code);
- }
- }
- else
- {
- int pos, pos_byte;
- if (! NILP (object))
- Fset_buffer (object);
- validate_region (&start, &end);
- if (XINT (end) - XINT (start) > LGSTRING_LENGTH (gstring))
- args_out_of_range (start, end);
- len = XINT (end) - XINT (start);
- pos = XINT (start);
- pos_byte = CHAR_TO_BYTE (pos);
- for (i = 0; i < len; i++)
- {
- Lisp_Object g = LGSTRING_GLYPH (gstring, i);
- /* Shut up GCC warning in comparison with
- MOST_POSITIVE_FIXNUM below. */
- EMACS_INT cod;
-
- FETCH_CHAR_ADVANCE (c, pos, pos_byte);
- cod = code = font->driver->encode_char (font, c);
- if (cod > MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
- break;
- LGLYPH_SET_FROM (g, i);
- LGLYPH_SET_TO (g, i);
- LGLYPH_SET_CHAR (g, c);
- LGLYPH_SET_CODE (g, code);
- }
- }
- for (; i < LGSTRING_LENGTH (gstring); i++)
- LGSTRING_SET_GLYPH (gstring, i, Qnil);
- return Qnil;
-}
+DEFUN ("font-shape-gstring", Ffont_shape_gstring, Sfont_shape_gstring, 1, 1, 0,
+ doc: /* Shape the glyph-string GSTRING.
+Shaping means substituting glyphs and/or adjusting positions of glyphs
+to get the correct visual image of character sequences set in the
+header of the glyph-string.
-DEFUN ("font-shape-text", Ffont_shape_text, Sfont_shape_text, 3, 4, 0,
- doc: /* Shape text between FROM and TO by FONT-OBJECT.
-If optional 4th argument STRING is non-nil, it is a string to shape,
-and FROM and TO are indices to the string.
-The value is the end position of the text that can be shaped by
-FONT-OBJECT. */)
- (from, to, font_object, string)
- Lisp_Object from, to, font_object, string;
+If the shaping was successful, the value is GSTRING itself or a newly
+created glyph-string. Otherwise, the value is nil. */)
+ (gstring)
+ Lisp_Object gstring;
{
struct font *font;
- struct font_metrics metrics;
- EMACS_INT start, end;
- Lisp_Object gstring, n;
- int len, i, j;
-
- if (! FONT_OBJECT_P (font_object))
- return Qnil;
- CHECK_FONT_GET_OBJECT (font_object, font);
+ Lisp_Object font_object, n, glyph;
+ int i, j, from, to;
+
+ if (! composition_gstring_p (gstring))
+ signal_error ("Invalid glyph-string: ", gstring);
+ if (! NILP (LGSTRING_ID (gstring)))
+ return gstring;
+ font_object = LGSTRING_FONT (gstring);
+ CHECK_FONT_OBJECT (font_object);
+ font = XFONT_OBJECT (font_object);
if (! font->driver->shape)
return Qnil;
- if (NILP (string))
- {
- validate_region (&from, &to);
- start = XFASTINT (from);
- end = XFASTINT (to);
- modify_region (current_buffer, start, end, 0);
- }
- else
- {
- CHECK_STRING (string);
- start = XINT (from);
- end = XINT (to);
- if (start < 0 || start > end || end > SCHARS (string))
- args_out_of_range_3 (string, from, to);
- }
-
- len = end - start;
- gstring = Ffont_make_gstring (font_object, make_number (len));
- Ffont_fill_gstring (gstring, font_object, from, to, string);
-
/* Try at most three times with larger gstring each time. */
for (i = 0; i < 3; i++)
{
- Lisp_Object args[2];
-
n = font->driver->shape (gstring);
if (INTEGERP (n))
break;
- args[0] = gstring;
- args[1] = Fmake_vector (make_number (len), Qnil);
- gstring = Fvconcat (2, args);
+ gstring = larger_vector (gstring,
+ ASIZE (gstring) + LGSTRING_GLYPH_LEN (gstring),
+ Qnil);
}
- if (! INTEGERP (n) || XINT (n) == 0)
+ if (i == 3 || XINT (n) == 0)
return Qnil;
- len = XINT (n);
-
- for (i = 0; i < len;)
- {
- Lisp_Object gstr;
- Lisp_Object g = LGSTRING_GLYPH (gstring, i);
- EMACS_INT this_from = LGLYPH_FROM (g);
- EMACS_INT this_to = LGLYPH_TO (g) + 1;
- int j, k;
- int need_composition = 0;
-
- metrics.lbearing = LGLYPH_LBEARING (g);
- metrics.rbearing = LGLYPH_RBEARING (g);
- metrics.ascent = LGLYPH_ASCENT (g);
- metrics.descent = LGLYPH_DESCENT (g);
- if (NILP (LGLYPH_ADJUSTMENT (g)))
+
+ glyph = LGSTRING_GLYPH (gstring, 0);
+ from = LGLYPH_FROM (glyph);
+ to = LGLYPH_TO (glyph);
+ for (i = 1, j = 0; i < LGSTRING_GLYPH_LEN (gstring); i++)
+ {
+ Lisp_Object this = LGSTRING_GLYPH (gstring, i);
+
+ if (NILP (this))
+ break;
+ if (NILP (LGLYPH_ADJUSTMENT (this)))
{
- metrics.width = LGLYPH_WIDTH (g);
- if (LGLYPH_CHAR (g) == 0 || metrics.width == 0)
- need_composition = 1;
+ if (j < i - 1)
+ for (; j < i; j++)
+ {
+ glyph = LGSTRING_GLYPH (gstring, j);
+ LGLYPH_SET_FROM (glyph, from);
+ LGLYPH_SET_TO (glyph, to);
+ }
+ from = LGLYPH_FROM (this);
+ to = LGLYPH_TO (this);
+ j = i;
}
else
{
- metrics.width = LGLYPH_WADJUST (g);
- metrics.lbearing += LGLYPH_XOFF (g);
- metrics.rbearing += LGLYPH_XOFF (g);
- metrics.ascent -= LGLYPH_YOFF (g);
- metrics.descent += LGLYPH_YOFF (g);
- need_composition = 1;
- }
- for (j = i + 1; j < len; j++)
- {
- int x;
-
- g = LGSTRING_GLYPH (gstring, j);
- if (this_from != LGLYPH_FROM (g))
- break;
- need_composition = 1;
- x = metrics.width + LGLYPH_LBEARING (g) + LGLYPH_XOFF (g);
- if (metrics.lbearing > x)
- metrics.lbearing = x;
- x = metrics.width + LGLYPH_RBEARING (g) + LGLYPH_XOFF (g);
- if (metrics.rbearing < x)
- metrics.rbearing = x;
- x = LGLYPH_ASCENT (g) - LGLYPH_YOFF (g);
- if (metrics.ascent < x)
- metrics.ascent = x;
- x = LGLYPH_DESCENT (g) - LGLYPH_YOFF (g);
- if (metrics.descent < x)
- metrics.descent = x;
- if (NILP (LGLYPH_ADJUSTMENT (g)))
- metrics.width += LGLYPH_WIDTH (g);
- else
- metrics.width += LGLYPH_WADJUST (g);
- }
-
- if (need_composition)
- {
- gstr = Ffont_make_gstring (font_object, make_number (j - i));
- LGSTRING_SET_WIDTH (gstr, metrics.width);
- LGSTRING_SET_LBEARING (gstr, metrics.lbearing);
- LGSTRING_SET_RBEARING (gstr, metrics.rbearing);
- LGSTRING_SET_ASCENT (gstr, metrics.ascent);
- LGSTRING_SET_DESCENT (gstr, metrics.descent);
- for (k = i; i < j; i++)
- {
- Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-
- LGLYPH_SET_FROM (g, LGLYPH_FROM (g) - this_from);
- LGLYPH_SET_TO (g, LGLYPH_TO (g) - this_from);
- LGSTRING_SET_GLYPH (gstr, i - k, LGSTRING_GLYPH (gstring, i));
- }
- from = make_number (start + this_from);
- to = make_number (start + this_to);
- if (NILP (string))
- Fcompose_region_internal (from, to, gstr, Qnil);
- else
- Fcompose_string_internal (string, from, to, gstr, Qnil);
+ if (from > LGLYPH_FROM (this))
+ from = LGLYPH_FROM (this);
+ if (to < LGLYPH_TO (this))
+ to = LGLYPH_TO (this);
}
- else
- i = j;
}
-
- return to;
+ if (j < i - 1)
+ for (; j < i; j++)
+ {
+ glyph = LGSTRING_GLYPH (gstring, j);
+ LGLYPH_SET_FROM (glyph, from);
+ LGLYPH_SET_TO (glyph, to);
+ }
+ return composition_gstring_put_cache (gstring, XINT (n));
}
+#if 0
+
DEFUN ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0,
doc: /* Apply OpenType features on glyph-string GSTRING-IN.
OTF-FEATURES specifies which features to apply in this format:
int len, num;
check_otf_features (otf_features);
- CHECK_FONT_GET_OBJECT (font_object, font);
+ CHECK_FONT_OBJECT (font_object);
+ font = XFONT_OBJECT (font_object);
if (! font->driver->otf_drive)
error ("Font backend %s can't drive OpenType GSUB table",
SDATA (SYMBOL_NAME (font->driver->type)));
OTF-FEATURES specifies which features of the font FONT-OBJECT to apply
in this format:
(SCRIPT LANGSYS FEATURE ...)
-See the documentation of `font-otf-gsub' for more detail.
+See the documentation of `font-drive-otf' for more detail.
The value is a list of cons cells of the format (GLYPH-ID . CHARACTER),
where GLYPH-ID is a glyph index of the font, and CHARACTER is a
}
return Fnreverse (alternates);
}
-
+#endif /* 0 */
#ifdef FONT_DEBUG
int isize;
CHECK_FONT_ENTITY (font_entity);
- if (NILP (size))
- size = AREF (font_entity, FONT_SIZE_INDEX);
- CHECK_NUMBER (size);
if (NILP (frame))
frame = selected_frame;
CHECK_LIVE_FRAME (frame);
- isize = XINT (size);
- if (isize == 0)
- isize = 120;
- if (isize < 0)
- isize = POINT_TO_PIXEL (- isize, XFRAME (frame)->resy);
-
+ if (NILP (size))
+ isize = XINT (AREF (font_entity, FONT_SIZE_INDEX));
+ else
+ {
+ CHECK_NUMBER_OR_FLOAT (size);
+ if (FLOATP (size))
+ isize = POINT_TO_PIXEL (- isize, XFRAME (frame)->resy);
+ else
+ isize = XINT (size);
+ if (isize == 0)
+ isize = 120;
+ }
return font_open_entity (XFRAME (frame), font_entity, isize);
}
PIXEL-SIZE is a pixel size by which the font is opened.
-SIZE is a maximum advance width of the font in pixel.
+SIZE is a maximum advance width of the font in pixels.
ASCENT, DESCENT, SPACE-WIDTH, AVERAGE-WIDTH are metrics of the font in
-pixel.
+pixels.
CAPABILITY is a list whose first element is a symbol representing the
font format \(x, opentype, truetype, type1, pcf, or bdf) and the
-remaining elements describes a detail of the font capability.
+remaining elements describe the details of the font capability.
If the font is OpenType font, the form of the list is
\(opentype GSUB GPOS)
CHECK_FONT_GET_OBJECT (font_object, font);
val = Fmake_vector (make_number (9), Qnil);
- if (font->font.full_name)
- ASET (val, 0, make_unibyte_string (font->font.full_name,
- strlen (font->font.full_name)));
- if (font->file_name)
- ASET (val, 1, make_unibyte_string (font->file_name,
- strlen (font->file_name)));
+ ASET (val, 0, AREF (font_object, FONT_NAME_INDEX));
+ ASET (val, 1, AREF (font_object, FONT_FILE_INDEX));
ASET (val, 2, make_number (font->pixel_size));
- ASET (val, 3, make_number (font->font.size));
+ ASET (val, 3, make_number (font->max_width));
ASET (val, 4, make_number (font->ascent));
ASET (val, 5, make_number (font->descent));
- ASET (val, 6, make_number (font->font.space_width));
- ASET (val, 7, make_number (font->font.average_width));
+ ASET (val, 6, make_number (font->space_width));
+ ASET (val, 7, make_number (font->average_width));
if (font->driver->otf_capability)
ASET (val, 8, Fcons (Qopentype, font->driver->otf_capability (font)));
- else
- ASET (val, 8, Fcons (font->format, Qnil));
return val;
}
}
DEFUN ("font-match-p", Ffont_match_p, Sfont_match_p, 2, 2, 0,
- doc: /* Return t iff font-spec SPEC matches with FONT.
+ doc: /* Return t if and only if font-spec SPEC matches with FONT.
FONT is a font-spec, font-entity, or font-object. */)
(spec, font)
Lisp_Object spec, font;
{
CHECK_FONT_SPEC (spec);
- if (FONT_OBJECT_P (font))
- font = ((struct font *) XSAVE_VALUE (font)->pointer)->entity;
- else if (! FONT_ENTITY_P (font))
- CHECK_FONT_SPEC (font);
+ CHECK_FONT (font);
return (font_match_p (spec, font) ? Qt : Qnil);
}
}
else
{
- EMACS_INT len;
- unsigned char *str;
-
CHECK_NUMBER (position);
CHECK_STRING (string);
pos = XINT (position);
#endif /* FONT_DEBUG */
+#ifdef HAVE_WINDOW_SYSTEM
+
+DEFUN ("font-info", Ffont_info, Sfont_info, 1, 2, 0,
+ doc: /* Return information about a font named NAME on frame FRAME.
+If FRAME is omitted or nil, use the selected frame.
+The returned value is a vector of OPENED-NAME, FULL-NAME, CHARSET, SIZE,
+ HEIGHT, BASELINE-OFFSET, RELATIVE-COMPOSE, and DEFAULT-ASCENT,
+where
+ OPENED-NAME is the name used for opening the font,
+ FULL-NAME is the full name of the font,
+ SIZE is the maximum bound width of the font,
+ HEIGHT is the height of the font,
+ BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
+ RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
+ how to compose characters.
+If the named font is not yet loaded, return nil. */)
+ (name, frame)
+ Lisp_Object name, frame;
+{
+ FRAME_PTR f;
+ struct font *font;
+ Lisp_Object info;
+ Lisp_Object font_object;
+
+ (*check_window_system_func) ();
+
+ if (! FONTP (name))
+ CHECK_STRING (name);
+ if (NILP (frame))
+ frame = selected_frame;
+ CHECK_LIVE_FRAME (frame);
+ f = XFRAME (frame);
+
+ if (STRINGP (name))
+ {
+ int fontset = fs_query_fontset (name, 0);
+
+ if (fontset >= 0)
+ name = fontset_ascii (fontset);
+ font_object = font_open_by_name (f, (char *) SDATA (name));
+ }
+ else if (FONT_OBJECT_P (name))
+ font_object = name;
+ else if (FONT_ENTITY_P (name))
+ font_object = font_open_entity (f, name, 0);
+ else
+ {
+ struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+ Lisp_Object entity = font_matching_entity (f, face->lface, name);
+
+ font_object = ! NILP (entity) ? font_open_entity (f, entity, 0) : Qnil;
+ }
+ if (NILP (font_object))
+ return Qnil;
+ font = XFONT_OBJECT (font_object);
+
+ info = Fmake_vector (make_number (7), Qnil);
+ XVECTOR (info)->contents[0] = AREF (font_object, FONT_NAME_INDEX);
+ XVECTOR (info)->contents[1] = AREF (font_object, FONT_NAME_INDEX);
+ XVECTOR (info)->contents[2] = make_number (font->pixel_size);
+ XVECTOR (info)->contents[3] = make_number (font->height);
+ XVECTOR (info)->contents[4] = make_number (font->baseline_offset);
+ XVECTOR (info)->contents[5] = make_number (font->relative_compose);
+ XVECTOR (info)->contents[6] = make_number (font->default_ascent);
+
+#if 0
+ /* As font_object is still in FONT_OBJLIST of the entity, we can't
+ close it now. Perhaps, we should manage font-objects
+ by `reference-count'. */
+ font_close_object (f, font_object);
+#endif
+ return info;
+}
+#endif
+
\f
+#define BUILD_STYLE_TABLE(TBL) \
+ build_style_table ((TBL), sizeof TBL / sizeof (struct table_entry))
+
+static Lisp_Object
+build_style_table (entry, nelement)
+ struct table_entry *entry;
+ int nelement;
+{
+ int i, j;
+ Lisp_Object table, elt;
+
+ table = Fmake_vector (make_number (nelement), Qnil);
+ for (i = 0; i < nelement; i++)
+ {
+ for (j = 0; entry[i].names[j]; j++);
+ elt = Fmake_vector (make_number (j + 1), Qnil);
+ ASET (elt, 0, make_number (entry[i].numeric));
+ for (j = 0; entry[i].names[j]; j++)
+ ASET (elt, j + 1, intern (entry[i].names[j]));
+ ASET (table, i, elt);
+ }
+ return table;
+}
+
+static Lisp_Object Vfont_log;
+static int font_log_env_checked;
+
+/* The deferred font-log data of the form [ACTION ARG RESULT].
+ If ACTION is not nil, that is added to the log when font_add_log is
+ called next time. At that time, ACTION is set back to nil. */
+static Lisp_Object Vfont_log_deferred;
+
+/* Prepend the font-related logging data in Vfont_log if it is not
+ `t'. ACTION describes a kind of font-related action (e.g. listing,
+ opening), ARG is the argument for the action, and RESULT is the
+ result of the action. */
+void
+font_add_log (action, arg, result)
+ char *action;
+ Lisp_Object arg, result;
+{
+ Lisp_Object tail, val;
+ int i;
+
+ if (! font_log_env_checked)
+ {
+ Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt;
+ font_log_env_checked = 1;
+ }
+ if (EQ (Vfont_log, Qt))
+ return;
+ if (STRINGP (AREF (Vfont_log_deferred, 0)))
+ {
+ char *str = (char *) SDATA (AREF (Vfont_log_deferred, 0));
+
+ ASET (Vfont_log_deferred, 0, Qnil);
+ font_add_log (str, AREF (Vfont_log_deferred, 1),
+ AREF (Vfont_log_deferred, 2));
+ }
+
+ if (FONTP (arg))
+ {
+ Lisp_Object tail, elt;
+ Lisp_Object equalstr = build_string ("=");
+
+ val = Ffont_xlfd_name (arg, Qt);
+ for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail);
+ tail = XCDR (tail))
+ {
+ elt = XCAR (tail);
+ if (EQ (XCAR (elt), QCscript))
+ val = concat3 (val, SYMBOL_NAME (QCscript),
+ concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+ else if (EQ (XCAR (elt), QClang))
+ val = concat3 (val, SYMBOL_NAME (QClang),
+ concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+ else if (EQ (XCAR (elt), QCotf) && CONSP (XCDR (elt)))
+ val = concat3 (val, SYMBOL_NAME (QCotf),
+ concat2 (equalstr,
+ SYMBOL_NAME (XCAR (XCDR (elt)))));
+ }
+ arg = val;
+ }
+ if (FONTP (result))
+ {
+ val = Ffont_xlfd_name (result, Qt);
+ if (! FONT_SPEC_P (result))
+ val = concat3 (SYMBOL_NAME (AREF (result, FONT_TYPE_INDEX)),
+ build_string (":"), val);
+ result = val;
+ }
+ else if (CONSP (result))
+ {
+ result = Fcopy_sequence (result);
+ for (tail = result; CONSP (tail); tail = XCDR (tail))
+ {
+ val = XCAR (tail);
+ if (FONTP (val))
+ val = Ffont_xlfd_name (val, Qt);
+ XSETCAR (tail, val);
+ }
+ }
+ else if (VECTORP (result))
+ {
+ result = Fcopy_sequence (result);
+ for (i = 0; i < ASIZE (result); i++)
+ {
+ val = AREF (result, i);
+ if (FONTP (val))
+ val = Ffont_xlfd_name (val, Qt);
+ ASET (result, i, val);
+ }
+ }
+ Vfont_log = Fcons (list3 (intern (action), arg, result), Vfont_log);
+}
+
+/* Record a font-related logging data to be added to Vfont_log when
+ font_add_log is called next time. ACTION, ARG, RESULT are the same
+ as font_add_log. */
+
+void
+font_deferred_log (action, arg, result)
+ char *action;
+ Lisp_Object arg, result;
+{
+ ASET (Vfont_log_deferred, 0, build_string (action));
+ ASET (Vfont_log_deferred, 1, arg);
+ ASET (Vfont_log_deferred, 2, result);
+}
+
extern void syms_of_ftfont P_ (());
extern void syms_of_xfont P_ (());
extern void syms_of_xftfont P_ (());
extern void syms_of_bdffont P_ (());
extern void syms_of_w32font P_ (());
extern void syms_of_atmfont P_ (());
+extern void syms_of_nsfont P_ (());
void
syms_of_font ()
{
- sort_shift_bits[FONT_SLANT_INDEX] = 0;
- sort_shift_bits[FONT_WEIGHT_INDEX] = 7;
- sort_shift_bits[FONT_SIZE_INDEX] = 14;
- sort_shift_bits[FONT_WIDTH_INDEX] = 21;
- sort_shift_bits[FONT_ADSTYLE_INDEX] = 28;
- sort_shift_bits[FONT_FOUNDRY_INDEX] = 29;
- sort_shift_bits[FONT_FAMILY_INDEX] = 30;
- sort_shift_bits[FONT_REGISTRY_INDEX] = 31;
- /* Note that sort_shift_bits[FONT_TYPE_INDEX] is never used. */
-
- staticpro (&font_style_table);
- font_style_table = Fmake_vector (make_number (3), Qnil);
-
- staticpro (&font_family_alist);
- font_family_alist = Qnil;
+ sort_shift_bits[FONT_TYPE_INDEX] = 0;
+ sort_shift_bits[FONT_SLANT_INDEX] = 2;
+ sort_shift_bits[FONT_WEIGHT_INDEX] = 9;
+ sort_shift_bits[FONT_SIZE_INDEX] = 16;
+ sort_shift_bits[FONT_WIDTH_INDEX] = 23;
+ /* Note that the other elements in sort_shift_bits are not used. */
staticpro (&font_charset_alist);
font_charset_alist = Qnil;
+ DEFSYM (Qfont_spec, "font-spec");
+ DEFSYM (Qfont_entity, "font-entity");
+ DEFSYM (Qfont_object, "font-object");
+
DEFSYM (Qopentype, "opentype");
+ DEFSYM (Qascii_0, "ascii-0");
DEFSYM (Qiso8859_1, "iso8859-1");
DEFSYM (Qiso10646_1, "iso10646-1");
DEFSYM (Qunicode_bmp, "unicode-bmp");
DEFSYM (Qunicode_sip, "unicode-sip");
+ DEFSYM (QCf, "Cf");
+
DEFSYM (QCotf, ":otf");
- DEFSYM (QClanguage, ":language");
+ DEFSYM (QClang, ":lang");
DEFSYM (QCscript, ":script");
DEFSYM (QCantialias, ":antialias");
DEFSYM (QCspacing, ":spacing");
DEFSYM (QCdpi, ":dpi");
DEFSYM (QCscalable, ":scalable");
- DEFSYM (QCextra, ":extra");
+ DEFSYM (QCavgwidth, ":avgwidth");
+ DEFSYM (QCfont_entity, ":font-entity");
+ DEFSYM (QCfc_unknown_spec, ":fc-unknown-spec");
DEFSYM (Qc, "c");
DEFSYM (Qm, "m");
DEFSYM (Qp, "p");
DEFSYM (Qd, "d");
- staticpro (&null_string);
- null_string = build_string ("");
staticpro (&null_vector);
null_vector = Fmake_vector (make_number (0), Qnil);
staticpro (&scratch_font_prefer);
scratch_font_prefer = Ffont_spec (0, NULL);
+ staticpro (&Vfont_log_deferred);
+ Vfont_log_deferred = Fmake_vector (make_number (3), Qnil);
+
+#if 0
#ifdef HAVE_LIBOTF
staticpro (&otf_list);
otf_list = Qnil;
-#endif
+#endif /* HAVE_LIBOTF */
+#endif /* 0 */
defsubr (&Sfontp);
defsubr (&Sfont_spec);
defsubr (&Sfont_get);
+#ifdef HAVE_WINDOW_SYSTEM
+ defsubr (&Sfont_face_attributes);
+#endif
defsubr (&Sfont_put);
defsubr (&Slist_fonts);
- defsubr (&Slist_families);
+ defsubr (&Sfont_family_list);
defsubr (&Sfind_font);
defsubr (&Sfont_xlfd_name);
defsubr (&Sclear_font_cache);
- defsubr (&Sinternal_set_font_style_table);
- defsubr (&Sfont_make_gstring);
- defsubr (&Sfont_fill_gstring);
- defsubr (&Sfont_shape_text);
+ defsubr (&Sfont_shape_gstring);
+#if 0
defsubr (&Sfont_drive_otf);
defsubr (&Sfont_otf_alternates);
+#endif /* 0 */
#ifdef FONT_DEBUG
defsubr (&Sopen_font);
defsubr (&Sdraw_string);
#endif
#endif /* FONT_DEBUG */
+#ifdef HAVE_WINDOW_SYSTEM
+ defsubr (&Sfont_info);
+#endif
-#ifdef USE_FONT_BACKEND
- if (enable_font_backend)
- {
+ DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,
+ doc: /*
+Alist of fontname patterns vs the corresponding encoding and repertory info.
+Each element looks like (REGEXP . (ENCODING . REPERTORY)),
+where ENCODING is a charset or a char-table,
+and REPERTORY is a charset, a char-table, or nil.
+
+If ENCODING and REPERTORY are the same, the element can have the form
+\(REGEXP . ENCODING).
+
+ENCODING is for converting a character to a glyph code of the font.
+If ENCODING is a charset, encoding a character by the charset gives
+the corresponding glyph code. If ENCODING is a char-table, looking up
+the table by a character gives the corresponding glyph code.
+
+REPERTORY specifies a repertory of characters supported by the font.
+If REPERTORY is a charset, all characters beloging to the charset are
+supported. If REPERTORY is a char-table, all characters who have a
+non-nil value in the table are supported. If REPERTORY is nil, Emacs
+gets the repertory information by an opened font and ENCODING. */);
+ Vfont_encoding_alist = Qnil;
+
+ DEFVAR_LISP_NOPRO ("font-weight-table", &Vfont_weight_table,
+ doc: /* Vector of valid font weight values.
+Each element has the form:
+ [NUMERIC-VALUE SYMBOLIC-NAME ALIAS-NAME ...]
+NUMERIC-VALUE is an integer, and SYMBOLIC-NAME and ALIAS-NAME are symbols. */);
+ Vfont_weight_table = BUILD_STYLE_TABLE (weight_table);
+
+ DEFVAR_LISP_NOPRO ("font-slant-table", &Vfont_slant_table,
+ doc: /* Vector of font slant symbols vs the corresponding numeric values.
+See `font-weight-table' for the format of the vector. */);
+ Vfont_slant_table = BUILD_STYLE_TABLE (slant_table);
+
+ DEFVAR_LISP_NOPRO ("font-width-table", &Vfont_width_table,
+ doc: /* Alist of font width symbols vs the corresponding numeric values.
+See `font-weight-table' for the format of the vector. */);
+ Vfont_width_table = BUILD_STYLE_TABLE (width_table);
+
+ staticpro (&font_style_table);
+ font_style_table = Fmake_vector (make_number (3), Qnil);
+ ASET (font_style_table, 0, Vfont_weight_table);
+ ASET (font_style_table, 1, Vfont_slant_table);
+ ASET (font_style_table, 2, Vfont_width_table);
+
+ DEFVAR_LISP ("font-log", &Vfont_log, doc: /*
+*Logging list of font related actions and results.
+The value t means to suppress the logging.
+The initial value is set to nil if the environment variable
+EMACS_FONT_LOG is set. Otherwise, it is set to t. */);
+ Vfont_log = Qnil;
+
+#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_FREETYPE
- syms_of_ftfont ();
+ syms_of_ftfont ();
#ifdef HAVE_X_WINDOWS
- syms_of_xfont ();
- syms_of_ftxfont ();
+ syms_of_xfont ();
+ syms_of_ftxfont ();
#ifdef HAVE_XFT
- syms_of_xftfont ();
+ syms_of_xftfont ();
#endif /* HAVE_XFT */
#endif /* HAVE_X_WINDOWS */
#else /* not HAVE_FREETYPE */
#ifdef HAVE_X_WINDOWS
- syms_of_xfont ();
+ syms_of_xfont ();
#endif /* HAVE_X_WINDOWS */
#endif /* not HAVE_FREETYPE */
#ifdef HAVE_BDFFONT
- syms_of_bdffont ();
+ syms_of_bdffont ();
#endif /* HAVE_BDFFONT */
#ifdef WINDOWSNT
- syms_of_w32font ();
+ syms_of_w32font ();
#endif /* WINDOWSNT */
-#ifdef MAC_OS
- syms_of_atmfont ();
-#endif /* MAC_OS */
- }
-#endif /* USE_FONT_BACKEND */
+#ifdef HAVE_NS
+ syms_of_nsfont ();
+#endif /* HAVE_NS */
+#endif /* HAVE_WINDOW_SYSTEM */
}
/* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846
HCoop / bpt / emacs.git / blobdiff