aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-19 15:45:21 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-19 15:45:21 +0000
commit9029478e8c73915f6abb2eabe3f06411aa2537c8 (patch)
treebc2ecd1f5d102cd232a8009a0859d7a20b8ccd03
parentrender: don't 're-calculate fg unnecessarily (diff)
font: tentative support for BGR, V-RGB and V-BGR
-rw-r--r--font.c29
-rw-r--r--font.h1
2 files changed, 23 insertions, 7 deletions
diff --git a/font.c b/font.c
index 816b7e37..692e82d5 100644
--- a/font.c
+++ b/font.c
@@ -125,9 +125,9 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li
load_flags |= FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING | FT_LOAD_TARGET_NORMAL;
else if (fc_hinting && fc_hintstyle == FC_HINT_SLIGHT)
load_flags |= FT_LOAD_DEFAULT | FT_LOAD_TARGET_LIGHT;
- else if (fc_rgba == FC_RGBA_RGB)
+ else if (fc_rgba == FC_RGBA_RGB || fc_rgba == FC_RGBA_BGR)
load_flags |= FT_LOAD_DEFAULT | FT_LOAD_TARGET_LCD;
- else if (fc_rgba == FC_RGBA_VRGB)
+ else if (fc_rgba == FC_RGBA_VRGB || fc_rgba == FC_RGBA_VBGR)
load_flags |= FT_LOAD_DEFAULT | FT_LOAD_TARGET_LCD_V;
else
load_flags |= FT_LOAD_DEFAULT | FT_LOAD_TARGET_NORMAL;
@@ -144,9 +144,9 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li
if (!fc_antialias)
render_flags |= FT_RENDER_MODE_MONO;
else {
- if (fc_rgba == FC_RGBA_RGB)
+ if (fc_rgba == FC_RGBA_RGB || fc_rgba == FC_RGBA_BGR)
render_flags |= FT_RENDER_MODE_LCD;
- else if (fc_rgba == FC_RGBA_VRGB)
+ else if (fc_rgba == FC_RGBA_VRGB || fc_rgba == FC_RGBA_VBGR)
render_flags |= FT_RENDER_MODE_LCD_V;
else
render_flags |= FT_RENDER_MODE_NORMAL;
@@ -171,6 +171,7 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li
font->render_flags = render_flags;
font->is_fallback = is_fallback;
font->pixel_size_fixup = scalable ? pixel_fixup : 1.;
+ font->bgr = fc_rgba == FC_RGBA_BGR || fc_rgba == FC_RGBA_VBGR;
font->fc_idx = font_idx;
if (!is_fallback) {
@@ -279,7 +280,7 @@ hash_index(wchar_t wc)
}
static bool
-glyph_for_wchar(struct font *font, wchar_t wc, struct glyph *glyph)
+glyph_for_wchar(const struct font *font, wchar_t wc, struct glyph *glyph)
{
/*
* LCD filter is per library instance. Thus we need to re-set it
@@ -428,9 +429,9 @@ glyph_for_wchar(struct font *font, wchar_t wc, struct glyph *glyph)
case FT_PIXEL_MODE_LCD:
for (size_t r = 0; r < bitmap->rows; r++) {
for (size_t c = 0; c < bitmap->width; c += 3) {
- unsigned char _r = bitmap->buffer[r * bitmap->pitch + c + 0];
+ unsigned char _r = bitmap->buffer[r * bitmap->pitch + c + (font->bgr ? 2 : 0)];
unsigned char _g = bitmap->buffer[r * bitmap->pitch + c + 1];
- unsigned char _b = bitmap->buffer[r * bitmap->pitch + c + 2];
+ unsigned char _b = bitmap->buffer[r * bitmap->pitch + c + (font->bgr ? 0 : 2)];
uint32_t *p = (uint32_t *)&data[r * stride + 4 * (c / 3)];
*p = _r << 16 | _g << 8 | _b;
@@ -438,6 +439,20 @@ glyph_for_wchar(struct font *font, wchar_t wc, struct glyph *glyph)
}
break;
+ case FT_PIXEL_MODE_LCD_V:
+ /* Unverified */
+ for (size_t r = 0; r < bitmap->rows; r += 3) {
+ for (size_t c = 0; c < bitmap->width; c++) {
+ unsigned char _r = bitmap->buffer[(r + (font->bgr ? 2 : 0)) * bitmap->pitch + c];
+ unsigned char _g = bitmap->buffer[(r + 1) * bitmap->pitch + c];
+ unsigned char _b = bitmap->buffer[(r + (font->bgr ? 0 : 2)) * bitmap->pitch + c];
+
+ uint32_t *p = (uint32_t *)&data[r / 3 * stride + 4 * c];
+ *p = _r << 16 | _g << 8 | _b;
+ }
+ }
+ break;
+
default:
abort();
break;
diff --git a/font.h b/font.h
index 97c3ec5f..594ae6ec 100644
--- a/font.h
+++ b/font.h
@@ -39,6 +39,7 @@ struct font {
int render_flags;
FT_LcdFilter lcd_filter;
double pixel_size_fixup; /* Scale factor - should only be used with ARGB32 glyphs */
+ bool bgr; /* True for FC_RGBA_BGR and FC_RGBA_VBGR */
struct {
int position;