From f413648183c90e454ba42aa3f1c8794f1d4fa729 Mon Sep 17 00:00:00 2001
From: Fabian Kirchner <kirchner@posteo.de>
Date: Mon, 12 Aug 2024 13:47:35 +0200
Subject: fix: fix placement of font's baseline

---
 app/Main.hs | 4 +++-
 app/Ui.hs   | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index b8fa0e2..7d499d8 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -147,7 +147,9 @@ createWindow args = do
       wspac = args.spacing
       wleft = wspac
   fnt <- X.xftFontOpen dpy scr "IosevkaTerm Nerd Font:size=14"
-  wheight <- X.xftfont_height fnt
+  ascent <- X.xftfont_ascent fnt
+  descent <- X.xftfont_descent fnt
+  let wheight = ascent + descent
   cmap <- X.createColormap dpy root vis X.allocNone
   win <- X.allocaSetWindowAttributes $ \attr -> do
     X.set_colormap attr cmap
diff --git a/app/Ui.hs b/app/Ui.hs
index 808c3c1..34fa101 100644
--- a/app/Ui.hs
+++ b/app/Ui.hs
@@ -97,12 +97,13 @@ layOut env@Env {..} (Ui' cs) = do
 extents :: Env -> C -> IO Rect
 extents Env {..} (C {..}) = do
   glyphInfo <- X.xftTextExtents dpy fnt string
+  ascent <- X.xftfont_ascent fnt
   pure
     ( Rect
-        { top = 0,
-          left = 0,
+        { top = X.xglyphinfo_y glyphInfo,
+          left = X.xglyphinfo_x glyphInfo,
           width = X.xglyphinfo_xOff glyphInfo,
-          height = X.xglyphinfo_height glyphInfo
+          height = ascent
         }
     )
 
-- 
cgit v1.2.3