diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-18 15:57:11 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-18 15:57:11 +0000 |
| commit | 4d82e048606d325771fbfcd930060532aab4c940 (patch) | |
| tree | 568a446c4e669d508fe0cc4fae3847e34b5f1c9f /config.c | |
| parent | meson/pkgbuild: bump version to 1.8.1 (diff) | |
| parent | changelog: remove entries that are no longer relevant (diff) | |
Merge branch 'master' into releases/1.8
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -643,6 +643,9 @@ parse_section_main(const char *key, const char *value, struct config *conf, conf->title = xstrdup(value); } + else if (strcmp(key, "locked-title") == 0) + conf->locked_title = str_to_bool(value); + else if (strcmp(key, "app-id") == 0) { free(conf->app_id); conf->app_id = xstrdup(value); @@ -2210,16 +2213,10 @@ parse_section_tweak( return false; } - else if (strcmp(key, "allow-overflowing-double-width-glyphs") == 0) { - conf->tweak.allow_overflowing_double_width_glyphs = str_to_bool(value); - if (!conf->tweak.allow_overflowing_double_width_glyphs) - LOG_WARN("tweak: disabled overflowing double-width glyphs"); - } - - else if (strcmp(key, "pua-double-width") == 0) { - conf->tweak.pua_double_width = str_to_bool(value); - if (conf->tweak.pua_double_width) - LOG_WARN("tweak: PUA double width glyphs enabled"); + else if (strcmp(key, "overflowing-glyphs") == 0) { + conf->tweak.overflowing_glyphs = str_to_bool(value); + if (!conf->tweak.overflowing_glyphs) + LOG_WARN("tweak: disabled overflowing glyphs"); } else if (strcmp(key, "damage-whole-window") == 0) { @@ -2830,7 +2827,7 @@ config_load(struct config *conf, const char *conf_path, .tweak = { .fcft_filter = FCFT_SCALING_FILTER_LANCZOS3, - .allow_overflowing_double_width_glyphs = true, + .overflowing_glyphs = true, .grapheme_shaping = false, .grapheme_width_method = GRAPHEME_WIDTH_DOUBLE, .delayed_render_lower_ns = 500000, /* 0.5ms */ @@ -2841,7 +2838,6 @@ config_load(struct config *conf, const char *conf_path, .damage_whole_window = false, .box_drawing_base_thickness = 0.04, .box_drawing_solid_shades = true, - .pua_double_width = false, }, .notifications = tll_init(), |
