pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

font: add commented out code to calculate underline/strikeout metrics

Browse source 
This is just to sync the font implementation in yambar with my other
projects. Underlines and strikouts aren't (yet) used in yambar.
This commit is contained in:
Daniel Eklöf 2019-09-29 13:07:06 +02:00
parent 3cbdc13f39
commit e5fb7f32b4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
font.c
View file

@ -4,9 +4,12 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <wchar.h> #include <wchar.h>
//#include <math.h>
#include <assert.h> #include <assert.h>
#include <threads.h> #include <threads.h>
//#include <freetype/tttables.h>
#define LOG_MODULE "font" #define LOG_MODULE "font"
#define LOG_ENABLE_DBG 0 #define LOG_ENABLE_DBG 0
#include "log.h" #include "log.h"
@ -101,6 +104,46 @@ font_destroy_no_free(struct font *font)
return true; return true;
} }
/* Not used in yambar */
#if 0
static void
underline_strikeout_metrics(struct font *font)
{
FT_Face ft_face = font->face;
double x_scale = ft_face->size->metrics.x_scale / 65526.;
double height = ft_face->size->metrics.height / 64;
double descent = ft_face->size->metrics.descender / 64;
LOG_DBG("ft: x-scale: %f, height: %f, descent: %f",
x_scale, height, descent);
font->underline.position = round(ft_face->underline_position * x_scale / 64.);
font->underline.thickness = ceil(ft_face->underline_thickness * x_scale / 64.);
if (font->underline.position == 0.) {
font->underline.position = round(descent / 2.);
font->underline.thickness = fabs(round(descent / 5.));
}
LOG_DBG("underline: pos=%d, thick=%d",
font->underline.position, font->underline.thickness);
TT_OS2 *os2 = FT_Get_Sfnt_Table(ft_face, ft_sfnt_os2);
if (os2 != NULL) {
font->strikeout.position = round(os2->yStrikeoutPosition * x_scale / 64.);
font->strikeout.thickness = ceil(os2->yStrikeoutSize * x_scale / 64.);
}
if (font->strikeout.position == 0.) {
font->strikeout.position = round(height / 2. + descent);
font->strikeout.thickness = font->underline.thickness;
}
LOG_DBG("strikeout: pos=%d, thick=%d",
font->strikeout.position, font->strikeout.thickness);
}
#endif
static bool static bool
from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx,
struct font *font, bool is_fallback) struct font *font, bool is_fallback)
@ -256,6 +299,8 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx,
font->cache = calloc(glyph_cache_size, sizeof(font->cache[0])); font->cache = calloc(glyph_cache_size, sizeof(font->cache[0]));
} }
/* Not used in yambar */
/* underline_strikeout_metrics(font); */
return true; return true;
} }