From a0518fa8de152264dec0ad1d4dcd5339ad51b5b2 Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Mon, 5 Jun 2023 20:36:56 +0200
Subject: [PATCH] - [GUI] fixed setting of font for normal text in the gemtext
 window, the configurations directive was ignored before this patch.

---
 etc/gui.conf                             |  8 +++---
 src/gui/client/client-configuration.lisp | 33 +++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/etc/gui.conf b/etc/gui.conf
index a775357..6b0c12c 100644
--- a/etc/gui.conf
+++ b/etc/gui.conf
@@ -16,7 +16,7 @@ gemini.main-window.background       = #f4ecd8
 
 # the font name
 
-gemini.main-window.text.font        = Sans
+gemini.main-window.text.font        = "Sans"
 
 # positive number units in point, negatine units in pixel
 
@@ -45,7 +45,7 @@ gemini.link.foreground              = #5b4636
 
 gemini.link.background              = #f4ecd8
 
-gemini.link.font                    = Sans
+gemini.link.font                    = "Sans"
 
 gemini.link.size                    = 11
 
@@ -93,7 +93,7 @@ gemini.h1.foreground                = #5b4636
 
 gemini.h1.background                = #f4ecd8
 
-gemini.h1.font                      = Sans
+gemini.h1.font                      = "Sans"
 
 gemini.h1.size                      = 20
 
@@ -113,7 +113,7 @@ gemini.h2.foreground                = #5b4636
 
 gemini.h2.background                = #f4ecd8
 
-gemini.h2.font                      = Sans
+gemini.h2.font                      = "Sans"
 
 gemini.h2.size                      = 15
 
diff --git a/src/gui/client/client-configuration.lisp b/src/gui/client/client-configuration.lisp
index 8e129c7..ef6430f 100644
--- a/src/gui/client/client-configuration.lisp
+++ b/src/gui/client/client-configuration.lisp
@@ -121,7 +121,38 @@
     `(defun ,(misc:format-fn-symbol t "gemini-~a-font-configuration" no-plus) ()
        (font-configuration ,key))))
 
-(gen-font-configuration +key-text+)
+(defun gemini-text-font-configuration ()
+  (format t "key ~a~%"
+          (access:accesses *client-configuration*
+                           swconf:+key-gemini+
+                           swconf:+key-main-window+
+                           +key-text+
+                           +key-font+))
+  (gui-goodies:make-font (access:accesses *client-configuration*
+                                          swconf:+key-gemini+
+                                          swconf:+key-main-window+
+                                          +key-text+
+                                          +key-font+)
+                         (access:accesses *client-configuration*
+                                          swconf:+key-gemini+
+                                          swconf:+key-main-window+
+                                          +key-text+
+                                          +key-size+)
+                         (access:accesses *client-configuration*
+                                          swconf:+key-gemini+
+                                          swconf:+key-main-window+
+                                          +key-text+
+                                          +key-weight+)
+                         (access:accesses *client-configuration*
+                                          swconf:+key-gemini+
+                                          swconf:+key-main-window+
+                                          +key-text+
+                                          +key-slant+)
+                         (not (swconf:false-value-p (access:accesses *client-configuration*
+                                                                     swconf:+key-gemini+
+                                                                     swconf:+key-main-window+
+                                                                     +key-text+
+                                                                     +key-underline+)))))
 
 (defun font-text-bold ()
   (gui-goodies:make-font (access:accesses *client-configuration*