diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-01 17:55:50 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-01 17:55:50 +0000 |
| commit | d9fc1e0d8aaf580649aef2f900948e2e053fb9df (patch) | |
| tree | f3aebec4807e101387eb07451451d13d2a925357 /config.c | |
| parent | config: add unit test for config_clone() (diff) | |
| parent | config: rename at-most-2 (value for grapheme-width-method) to double-width (diff) | |
Merge branch 'max-grapheme-width-is-2'
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -2255,6 +2255,15 @@ parse_section_tweak( LOG_WARN("tweak: grapheme shaping"); } + else if (strcmp(key, "grapheme-width-method") == 0) { + if (strcmp(value, "double-width") == 0) + conf->tweak.grapheme_width_method = GRAPHEME_WIDTH_DOUBLE; + else if (strcmp(value, "wcswidth") == 0) + conf->tweak.grapheme_width_method = GRAPHEME_WIDTH_WCSWIDTH; + + LOG_WARN("%s:%d [tweak]: grapheme-width-method=%s", path, lineno, value); + } + else if (strcmp(key, "render-timer") == 0) { if (strcmp(value, "none") == 0) { conf->tweak.render_timer_osd = false; @@ -2823,6 +2832,7 @@ config_load(struct config *conf, const char *conf_path, .fcft_filter = FCFT_SCALING_FILTER_LANCZOS3, .allow_overflowing_double_width_glyphs = true, .grapheme_shaping = false, + .grapheme_width_method = GRAPHEME_WIDTH_DOUBLE, .delayed_render_lower_ns = 500000, /* 0.5ms */ .delayed_render_upper_ns = 16666666 / 2, /* half a frame period (60Hz) */ .max_shm_pool_size = 512 * 1024 * 1024, |
