diff options
| author | Phil Jones <philj56@gmail.com> | 2022-06-25 15:59:42 +0100 |
|---|---|---|
| committer | Phil Jones <philj56@gmail.com> | 2022-06-25 15:59:42 +0100 |
| commit | 335573a628ed6ff20640c881935e0648a4819c1a (patch) | |
| tree | b8a8056e877b97797c95814830b154e612591ea4 /src/entry_backend | |
| parent | a6c20eb3713fc5e4b2c8f4075762b899bf9c1857 (diff) | |
Add option to disable font hinting.
Also improve text on non-hidpi screens.
Diffstat (limited to 'src/entry_backend')
| -rw-r--r-- | src/entry_backend/harfbuzz.c | 23 | ||||
| -rw-r--r-- | src/entry_backend/harfbuzz.h | 3 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/entry_backend/harfbuzz.c b/src/entry_backend/harfbuzz.c index f0a04e0..58f4ca6 100644 --- a/src/entry_backend/harfbuzz.c +++ b/src/entry_backend/harfbuzz.c @@ -109,6 +109,7 @@ void entry_backend_harfbuzz_init( uint32_t *height) { cairo_t *cr = entry->cairo[0].cr; + uint32_t font_size = floor(entry->font_size * PT_TO_DPI); /* Setup FreeType. */ log_debug("Creating FreeType library.\n"); @@ -122,7 +123,9 @@ void entry_backend_harfbuzz_init( log_debug("Loading FreeType font.\n"); err = FT_New_Face( - entry->harfbuzz.ft_library, entry->font_name, 0, + entry->harfbuzz.ft_library, + entry->font_name, + 0, &entry->harfbuzz.ft_face); if (err) { log_error("Error loading font: %s\n", get_ft_error_string(err)); @@ -130,10 +133,10 @@ void entry_backend_harfbuzz_init( } err = FT_Set_Char_Size( entry->harfbuzz.ft_face, - entry->font_size * 64, - entry->font_size * 64, - 96, - 96); + font_size * 64, + font_size * 64, + 0, + 0); if (err) { log_error("Error setting font size: %s\n", get_ft_error_string(err)); @@ -146,15 +149,19 @@ void entry_backend_harfbuzz_init( struct color color = entry->foreground_color; cairo_set_source_rgba(cr, color.r, color.g, color.b, color.a); cairo_set_font_face(cr, entry->harfbuzz.cairo_face); - cairo_set_font_size(cr, entry->font_size * PT_TO_DPI); + cairo_set_font_size(cr, font_size); cairo_font_options_t *opts = cairo_font_options_create(); - //cairo_font_options_set_hint_style(opts, CAIRO_HINT_STYLE_NONE); + if (entry->harfbuzz.disable_hinting) { + cairo_font_options_set_hint_style(opts, CAIRO_HINT_STYLE_NONE); + } else { + cairo_font_options_set_hint_metrics(opts, CAIRO_HINT_METRICS_ON); + } cairo_set_font_options(cr, opts); /* We also need to set up the font for our other Cairo context. */ cairo_set_font_face(entry->cairo[1].cr, entry->harfbuzz.cairo_face); - cairo_set_font_size(entry->cairo[1].cr, entry->font_size * PT_TO_DPI); + cairo_set_font_size(entry->cairo[1].cr, font_size); cairo_set_font_options(entry->cairo[1].cr, opts); cairo_font_options_destroy(opts); diff --git a/src/entry_backend/harfbuzz.h b/src/entry_backend/harfbuzz.h index 8404032..68bb443 100644 --- a/src/entry_backend/harfbuzz.h +++ b/src/entry_backend/harfbuzz.h @@ -1,6 +1,7 @@ #ifndef ENTRY_BACKEND_HARFBUZZ_H #define ENTRY_BACKEND_HARFBUZZ_H +#include <stdbool.h> #include <cairo/cairo-ft.h> #include <ft2build.h> #include FT_FREETYPE_H @@ -16,6 +17,8 @@ struct entry_backend_harfbuzz { hb_font_t *hb_font; hb_buffer_t *hb_buffer; + + bool disable_hinting; }; void entry_backend_harfbuzz_init(struct entry *entry, uint32_t *width, uint32_t *height); |