procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve style and comments in font-related sources

Browse source 
* src/w32font.c (fill_in_logfont): Stylistic changes.
* src/font.h (font_property_index, font_select_entity):
Add/improve comments.
This commit is contained in:
Eli Zaretskii 2021-11-13 16:37:39 +02:00
parent 42d4e24ff3
commit a56dd60d2f
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/font.c
View file

@ -3151,8 +3151,9 @@ font_clear_prop (Lisp_Object *attrs, enum font_property_index prop)
attrs[LFACE_FONT_INDEX] = font;
}
/* Select a font from ENTITIES (list of font-entity vectors) that
supports C and is the best match for ATTRS and PIXEL_SIZE. */
/* Select a font from ENTITIES (list of one or more font-entity
vectors) that supports the character C (if non-negative) and is the
best match for ATTRS and PIXEL_SIZE. */
static Lisp_Object
font_select_entity (struct frame *f, Lisp_Object entities,
@ -3162,6 +3163,7 @@ font_select_entity (struct frame *f, Lisp_Object entities,
Lisp_Object prefer;
int i;
/* If we have a single candidate, return it if it supports C. */
if (NILP (XCDR (entities))
&& ASIZE (XCAR (entities)) == 1)
{
@ -3171,7 +3173,10 @@ font_select_entity (struct frame *f, Lisp_Object entities,
return Qnil;
}
/* Sort fonts by properties specified in ATTRS. */
/* If we have several candidates, find the best match by sorting
them by properties specified in ATTRS. Style attributes (weight,
slant, width, and size) are taken from the font spec in ATTRS (if
that is non-nil), or from ATTRS, or left as nil. */
prefer = scratch_font_prefer;
for (i = FONT_WEIGHT_INDEX; i <= FONT_SIZE_INDEX; i++)
@ -3208,6 +3213,8 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
int i, j, k, l;
USE_SAFE_ALLOCA;
/* Registry specification alternatives: from the most specific to
the least specific and finally an unspecified one. */
registry[0] = AREF (spec, FONT_REGISTRY_INDEX);
if (NILP (registry[0]))
{
@ -3244,6 +3251,9 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
pixel_size = 1;
}
ASET (work, FONT_SIZE_INDEX, Qnil);
/* Foundry specification alternatives: from the most specific to the
least specific and finally an unspecified one. */
foundry[0] = AREF (work, FONT_FOUNDRY_INDEX);
if (! NILP (foundry[0]))
foundry[1] = zero_vector;
@ -3257,6 +3267,8 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
else
foundry[0] = Qnil, foundry[1] = zero_vector;
/* Additional style specification alternatives: from the most
specific to the least specific and finally an unspecified one. */
adstyle[0] = AREF (work, FONT_ADSTYLE_INDEX);
if (! NILP (adstyle[0]))
adstyle[1] = zero_vector;
@ -3277,6 +3289,8 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
adstyle[0] = Qnil, adstyle[1] = zero_vector;
/* Family specification alternatives: from the most specific to
the least specific and finally an unspecified one. */
val = AREF (work, FONT_FAMILY_INDEX);
if (NILP (val) && STRINGP (attrs[LFACE_FAMILY_INDEX]))
{
@ -3316,6 +3330,8 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
}
}
/* Now look up suitable fonts, from the most specific spec to the
least specific spec. Accept the first one that matches. */
for (i = 0; SYMBOLP (family[i]); i++)
{
ASET (work, FONT_FAMILY_INDEX, family[i]);
@ -3328,9 +3344,12 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
for (l = 0; SYMBOLP (adstyle[l]); l++)
{
ASET (work, FONT_ADSTYLE_INDEX, adstyle[l]);
/* Produce the list of candidates for the spec in WORK. */
entities = font_list_entities (f, work);
if (! NILP (entities))
{
/* If there are several candidates, select the
best match for PIXEL_SIZE and attributes in ATTRS. */
val = font_select_entity (f, entities,
attrs, pixel_size, c);
if (! NILP (val))

7
src/font.h
View file

@ -69,9 +69,10 @@ INLINE_HEADER_BEGIN
enum font_property_index
{
/* FONT-TYPE is a symbol indicating a font backend; currently `x'
and `xft' are available on X, `uniscribe' and `gdi' on
Windows, and `ns' under Cocoa / GNUstep. */
/* FONT-TYPE is a symbol indicating a font backend; currently `x',
`xft', `xfthb', `ftrc', and `ftcrhb' are available on X;
`harfbuzz', `uniscribe', and `gdi' on Windows, and `ns' under
Cocoa / GNUstep. */
FONT_TYPE_INDEX,
/* FONT-FOUNDRY is a foundry name (symbol). */

8
src/w32font.c
View file

@ -2019,13 +2019,9 @@ fill_in_logfont (struct frame *f, LOGFONT *logfont, Lisp_Object font_spec)
tmp = AREF (font_spec, FONT_DPI_INDEX);
if (FIXNUMP (tmp))
{
dpi = XFIXNUM (tmp);
}
dpi = XFIXNUM (tmp);
else if (FLOATP (tmp))
{
dpi = (int) (XFLOAT_DATA (tmp) + 0.5);
}
dpi = (int) (XFLOAT_DATA (tmp) + 0.5);
/* Height */
tmp = AREF (font_spec, FONT_SIZE_INDEX);