From f9c9dd24329fe4a2f6d350e693b1d7a7bae33b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Thu, 7 Jan 2021 11:16:02 +0100
Subject: [PATCH] config: add line-height, letter-spacing,
 {horizontal,vertical}-letter-offset

---
 config.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 config.h |  8 ++++++++
 2 files changed, 56 insertions(+)

diff --git a/config.c b/config.c
index 0e106584..6af8803b 100644
--- a/config.c
+++ b/config.c
@@ -555,6 +555,50 @@ parse_section_main(const char *key, const char *value, struct config *conf,
         free(copy);
     }
 
+    else if (strcmp(key, "line-height") == 0) {
+        unsigned long height;
+        if (!str_to_ulong(value, 10, &height)) {
+            LOG_AND_NOTIFY_ERR(
+                "%s:%d: [default]: line-height: expected an integer, got '%s'",
+                path, lineno, value);
+            return false;
+        }
+        conf->line_height = height;
+    }
+
+    else if (strcmp(key, "letter-spacing") == 0) {
+        unsigned long spacing;
+        if (!str_to_ulong(value, 10, &spacing)) {
+            LOG_AND_NOTIFY_ERR(
+                "%s:%d: [default]: letter-spacing: expected an integer, got '%s'",
+                path, lineno, value);
+            return false;
+        }
+        conf->letter_spacing = spacing;
+    }
+
+    else if (strcmp(key, "horizontal-letter-offset") == 0) {
+        unsigned long offset;
+        if (!str_to_ulong(value, 10, &offset)) {
+            LOG_AND_NOTIFY_ERR(
+                "%s:%d: [default]: horizontal-letter-offset: "
+                "expected an integer, got '%s'", path, lineno, value);
+            return false;
+        }
+        conf->horizontal_letter_offset = offset;
+    }
+
+    else if (strcmp(key, "vertical-letter-offset") == 0) {
+        unsigned long offset;
+        if (!str_to_ulong(value, 10, &offset)) {
+            LOG_AND_NOTIFY_ERR(
+                "%s:%d: [default]: horizontal-letter-offset: "
+                "expected an integer, got '%s'", path, lineno, value);
+            return false;
+        }
+        conf->vertical_letter_offset = offset;
+    }
+
     else if (strcmp(key, "dpi-aware") == 0) {
         if (strcmp(value, "auto") == 0)
             conf->dpi_aware = DPI_AWARE_AUTO;
@@ -1979,6 +2023,10 @@ config_load(struct config *conf, const char *conf_path,
         .bell_action = BELL_ACTION_NONE,
         .startup_mode = STARTUP_WINDOWED,
         .fonts = {tll_init(), tll_init(), tll_init(), tll_init()},
+        .line_height = -1,
+        .letter_spacing = -1,
+        .horizontal_letter_offset = 0,
+        .vertical_letter_offset = 0,
         .dpi_aware = DPI_AWARE_AUTO, /* DPI-aware when scaling-factor == 1 */
         .scrollback = {
             .lines = 1000,
diff --git a/config.h b/config.h
index 21b79230..9b33b37f 100644
--- a/config.h
+++ b/config.h
@@ -84,6 +84,14 @@ struct config {
     enum {DPI_AWARE_AUTO, DPI_AWARE_YES, DPI_AWARE_NO} dpi_aware;
     config_font_list_t fonts[4];
 
+    /* Custom font metrics (-1 = use real font metrics) */
+    int16_t line_height;
+    int16_t letter_spacing;
+
+    /* Adjusted letter x/y offsets */
+    int16_t horizontal_letter_offset;
+    int16_t vertical_letter_offset;
+
     struct {
         int lines;