/* font.c -- "Font" primitives.
- Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- Copyright (C) 2006, 2007, 2008, 2009
+ Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
+#include <setjmp.h>
#include "lisp.h"
#include "buffer.h"
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;
+ const char *names[5];
};
/* Table of weight numeric values and their names. This table must be
sorted by numeric values in ascending order. */
-static struct table_entry weight_table[] =
+static const struct table_entry weight_table[] =
{
{ 0, { "thin" }},
{ 20, { "ultra-light", "ultralight" }},
/* Table of slant numeric values and their names. This table must be
sorted by numeric values in ascending order. */
-static struct table_entry slant_table[] =
+static const struct table_entry slant_table[] =
{
{ 0, { "reverse-oblique", "ro" }},
{ 10, { "reverse-italic", "ri" }},
/* 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[] =
+static const struct table_entry width_table[] =
{
{ 50, { "ultra-condensed", "ultracondensed" }},
{ 63, { "extra-condensed", "extracondensed" }},
characters; used in xfont.c and ftfont.c. */
Lisp_Object Qja, Qko;
+Lisp_Object QCuser_spec;
+
Lisp_Object Vfont_encoding_alist;
/* Alist of font registry symbol and the corresponding charsets
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));
+ = Fcopy_alist (AREF (entity, FONT_EXTRA_INDEX));
}
if (size > 0)
font->props[FONT_SIZE_INDEX] = make_number (pixelsize);
{
Lisp_Object prev = Qnil;
- if (NILP (val))
- return val;
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));
+ ASET (font, FONT_EXTRA_INDEX, Fcons (Fcons (prop, val), extra));
else
- XSETCDR (prev, Fcons (Fcons (prop, val), extra));
+ XSETCDR (prev, Fcons (Fcons (prop, val), extra));
+
return val;
}
XSETCDR (slot, val);
if (family_end)
{
+ Lisp_Object extra_props = Qnil;
+
/* A fontconfig name with size and/or property data. */
if (family_end > name)
{
if (prop >= FONT_FOUNDRY_INDEX
&& prop < FONT_EXTRA_INDEX)
- ASET (font, prop, font_prop_validate (prop, Qnil, val));
+ ASET (font, prop, font_prop_validate (prop, Qnil, val));
else
- Ffont_put (font, key, val);
+ {
+ extra_props = nconc2 (extra_props,
+ Fcons (Fcons (key, val), Qnil));
+ }
}
p = q;
}
}
+
+ if (! NILP (extra_props))
+ {
+ struct font_driver_list *driver_list = font_driver_list;
+ for ( ; driver_list; driver_list = driver_list->next)
+ if (driver_list->driver->filter_properties)
+ (*driver_list->driver->filter_properties) (font, extra_props);
+ }
+
}
else
{
{
int font_driver_preference = 0;
Lisp_Object current_font_driver;
-
+
if (best_only)
vec = XCAR (tail);
len = ASIZE (vec);
/* Return a list of vectors of font-entities matching with SPEC on
- FRAME. The elements of the list are in the same of order of
- font-drivers. */
+ FRAME. Each elements in the list is a vector of entities from the
+ same font-driver. */
Lisp_Object
font_list_entities (frame, spec)
else if (CONSP (Vface_font_rescale_alist))
scaled_pixel_size = pixel_size * font_rescale_ratio (entity);
- for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist);
- objlist = XCDR (objlist))
- 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);
if (! driver_list)
return Qnil;
+ for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist);
+ objlist = XCDR (objlist))
+ {
+ Lisp_Object fn = XCAR (objlist);
+ if (! NILP (AREF (fn, FONT_TYPE_INDEX))
+ && XFONT_OBJECT (fn)->pixel_size == pixel_size)
+ {
+ if (driver_list->driver->cached_font_ok == NULL
+ || driver_list->driver->cached_font_ok (f, fn, entity))
+ return fn;
+ }
+ }
+
font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
- ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
+ if (!NILP (font_object))
+ ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
FONT_ADD_LOG ("open", entity, font_object);
if (NILP (font_object))
return Qnil;
if (font_parse_name ((char *) SDATA (font_name), spec) == -1)
return Qnil;
font_put_extra (spec, QCname, font_name);
+ font_put_extra (spec, QCuser_spec, font_name);
return spec;
}
if (! FONTP (font))
return;
+
if (! NILP (Ffont_get (font, QCname)))
{
font = Fcopy_font_spec (font);
val = font_select_entity (frame, entities,
attrs, pixel_size, c);
if (! NILP (val))
- return val;
+ return val;
}
}
}
FRAME_PTR f;
Lisp_Object *attrs, spec;
{
- Lisp_Object entity;
+ Lisp_Object entity, name;
entity = font_find_for_lface (f, attrs, spec, -1);
if (NILP (entity))
if (NILP (entity))
return Qnil;
}
- return font_open_for_lface (f, entity, attrs, spec);
+ /* Don't loose the original name that was put in initially. We need
+ it to re-apply the font when font parameters (like hinting or dpi) have
+ changed. */
+ entity = font_open_for_lface (f, entity, attrs, spec);
+ if (!NILP (entity))
+ {
+ name = Ffont_get (spec, QCuser_spec);
+ if (STRINGP (name)) font_put_extra (entity, QCuser_spec, name);
+ }
+ return entity;
}
char *name;
{
Lisp_Object args[2];
- Lisp_Object spec;
+ Lisp_Object spec, ret;
args[0] = QCname;
args[1] = make_unibyte_string (name, strlen (name));
spec = Ffont_spec (2, args);
- return font_open_by_spec (f, spec);
+ ret = font_open_by_spec (f, spec);
+ /* Do not loose name originally put in. */
+ if (!NILP (ret))
+ font_put_extra (ret, QCuser_spec, args[1]);
+
+ return ret;
}
EMACS_INT pos_byte = string_char_to_byte (string, pos);
str = SDATA (string) + pos_byte;
- c = STRING_CHAR (str, 0);
+ c = STRING_CHAR (str);
}
else
c = SDATA (string)[pos];
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));
+ extra = Fcopy_alist (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 (driver_list->on)
{
Lisp_Object cache = driver_list->driver->get_cache (f);
- Lisp_Object val;
+ Lisp_Object val, tmp;
val = XCDR (cache);
while (! NILP (val)
&& ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
val = XCDR (val);
font_assert (! NILP (val));
- val = XCDR (XCAR (val));
- if (XINT (XCAR (val)) == 0)
+ tmp = XCDR (XCAR (val));
+ if (XINT (XCAR (tmp)) == 0)
{
font_clear_cache (f, XCAR (val), driver_list->driver);
XSETCDR (cache, XCDR (val));
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 (elt, j + 1, intern_c_string (entry[i].names[j]));
ASET (table, i, elt);
}
return table;
DEFSYM (Qja, "ja");
DEFSYM (Qko, "ko");
+ DEFSYM (QCuser_spec, "user-spec");
+
staticpro (&null_vector);
null_vector = Fmake_vector (make_number (0), Qnil);
HCoop / bpt / emacs.git / blobdiff