aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-12-15 10:10:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-12-17 09:59:17 +0000
commitf6ca8c90e11d9b1ecdfe8a5bf69b1b793376a91c (patch)
treec8a6e83c143f6d973b9cdc4c3498901089ba263b /terminal.c
parentmain: Graceful fallback if user has configured an invalid locale (diff)
config: add ‘font-size-adjustment=N[px|%]’ option
This patch adds a new config option, font-size-adjustment. It lets you configure how much the font size should be incremented/decremented when zooming in or out (ctrl-+, ctrl+-). Values can be specified in points, pixels or percent. Closes #1188
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c85
1 files changed, 68 insertions, 17 deletions
diff --git a/terminal.c b/terminal.c
index 1914a229..78ce4bc3 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2035,29 +2035,70 @@ term_reset(struct terminal *term, bool hard)
}
static bool
-term_font_size_adjust(struct terminal *term, double amount)
+term_font_size_adjust_by_points(struct terminal *term, float amount)
{
const struct config *conf = term->conf;
+ const float dpi = term->font_is_sized_by_dpi ? term->font_dpi : 96.;
+
+ for (size_t i = 0; i < 4; i++) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+
+ for (size_t j = 0; j < font_list->count; j++) {
+ struct config_font *font = &term->font_sizes[i][j];
+ float old_pt_size = font->pt_size;
+ if (font->px_size > 0)
+ old_pt_size = font->px_size * 72. / dpi;
+
+ font->pt_size = fmaxf(old_pt_size + amount, 0.);
+ font->px_size = -1;
+ }
+ }
+
+ return reload_fonts(term);
+}
+
+static bool
+term_font_size_adjust_by_pixels(struct terminal *term, int amount)
+{
+ const struct config *conf = term->conf;
const float dpi = term->font_is_sized_by_dpi ? term->font_dpi : 96.;
for (size_t i = 0; i < 4; i++) {
const struct config_font_list *font_list = &conf->fonts[i];
for (size_t j = 0; j < font_list->count; j++) {
- float old_pt_size = term->font_sizes[i][j].pt_size;
+ struct config_font *font = &term->font_sizes[i][j];
+ int old_px_size = font->px_size;
- /*
- * To ensure primary and user-configured fallback fonts are
- * resizes by the same amount, convert pixel sizes to point
- * sizes, and to the adjustment on point sizes only.
- */
+ if (font->px_size <= 0)
+ old_px_size = font->pt_size * dpi / 72.;
- if (term->font_sizes[i][j].px_size > 0)
- old_pt_size = term->font_sizes[i][j].px_size * 72. / dpi;
+ font->px_size = max(old_px_size + amount, 1);
+ }
+ }
- term->font_sizes[i][j].pt_size = fmaxf(old_pt_size + amount, 0.);
- term->font_sizes[i][j].px_size = -1;
+ return reload_fonts(term);
+}
+
+static bool
+term_font_size_adjust_by_percent(struct terminal *term, bool increment, float percent)
+{
+ const struct config *conf = term->conf;
+ const float multiplier = increment
+ ? 1. + percent
+ : 1. / (1. + percent);
+
+ for (size_t i = 0; i < 4; i++) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+
+ for (size_t j = 0; j < font_list->count; j++) {
+ struct config_font *font = &term->font_sizes[i][j];
+
+ if (font->px_size > 0)
+ font->px_size = max(font->px_size * multiplier, 1);
+ else
+ font->pt_size = fmax(font->pt_size * multiplier, 0);
}
}
@@ -2067,19 +2108,29 @@ term_font_size_adjust(struct terminal *term, double amount)
bool
term_font_size_increase(struct terminal *term)
{
- if (!term_font_size_adjust(term, 0.5))
- return false;
+ const struct config *conf = term->conf;
+ const struct font_size_adjustment *inc_dec = &conf->font_size_adjustment;
- return true;
+ if (inc_dec->percent > 0.)
+ return term_font_size_adjust_by_percent(term, true, inc_dec->percent);
+ else if (inc_dec->pt_or_px.px > 0)
+ return term_font_size_adjust_by_pixels(term, inc_dec->pt_or_px.px);
+ else
+ return term_font_size_adjust_by_points(term, inc_dec->pt_or_px.pt);
}
bool
term_font_size_decrease(struct terminal *term)
{
- if (!term_font_size_adjust(term, -0.5))
- return false;
+ const struct config *conf = term->conf;
+ const struct font_size_adjustment *inc_dec = &conf->font_size_adjustment;
- return true;
+ if (inc_dec->percent > 0.)
+ return term_font_size_adjust_by_percent(term, false, inc_dec->percent);
+ else if (inc_dec->pt_or_px.px > 0)
+ return term_font_size_adjust_by_pixels(term, -inc_dec->pt_or_px.px);
+ else
+ return term_font_size_adjust_by_points(term, -inc_dec->pt_or_px.pt);
}
bool