fcft: use fcft instead of local copy of font.c/font.h

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "subprojects/tllist"]
 	path = subprojects/tllist
 	url = https://codeberg.org/dnkl/tllist.git
+[submodule "subprojects/fcft"]
+	path = subprojects/fcft
+	url = https://codeberg.org/dnkl/fcft.git

config.h

@@ -3,8 +3,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include <tllist.h>
+
 #include "terminal.h"
-#include "tllist.h"
 
 struct config {
     char *term;

main.c

@@ -10,13 +10,14 @@
 
 #include <sys/sysinfo.h>
 
+#include <fcft.h>
+
 #define LOG_MODULE "main"
 #define LOG_ENABLE_DBG 0
 #include "log.h"
 
 #include "config.h"
 #include "fdm.h"
-#include "font.h"
 #include "server.h"
 #include "shm.h"
 #include "terminal.h"

meson.build

@@ -69,6 +69,13 @@ else
   tllist = dependency('tllist')
 endif
 
+fcft_proj = subproject('fcft')
+if fcft_proj.found()
+  fcft = fcft_proj.get_variable('fcft')
+else
+  fcft = dependency('fcft')
+endif
+
 executable(
   'foot',
   'async.c', 'async.h',
@@ -77,7 +84,6 @@ executable(
   'commands.c', 'commands.h',
   'csi.c', 'csi.h',
   'fdm.c', 'fdm.h',
-  'font.c', 'font.h',
   'grid.c', 'grid.h',
   'input.c', 'input.h',
   'log.c', 'log.h',
@@ -95,7 +101,7 @@ executable(
   'wayland.c', 'wayland.h',
   wl_proto_src + wl_proto_headers, version,
   dependencies: [threads, math, freetype, fontconfig, pixman, wayland_client, wayland_cursor, xkb,
-                tllist],
+                tllist, fcft],
   install: true)
 
 executable(

render.c

@@ -10,12 +10,13 @@
 #include <wayland-cursor.h>
 #include <xdg-shell.h>
 
+#include <fcft.h>
+
 #define LOG_MODULE "render"
 #define LOG_ENABLE_DBG 0
 #include "log.h"
 #include "shm.h"
 #include "grid.h"
-#include "font.h"
 
 #define min(x, y) ((x) < (y) ? (x) : (y))
 #define max(x, y) ((x) > (y) ? (x) : (y))

subprojects/fcft

@@ -0,0 +1 @@
+Subproject commit 6377db4464f9a411c17b681f4a41c36950f1a232

terminal.h

@@ -8,10 +8,11 @@
 #include <threads.h>
 #include <semaphore.h>
 
+#include <tllist.h>
+#include <fcft.h>
+
 //#include "config.h"
 #include "fdm.h"
-#include "font.h"
-#include "tllist.h"
 #include "wayland.h"
 
 #define likely(c) __builtin_expect(!!(c), 1)

wayland.h

@@ -9,8 +9,9 @@
 #include <primary-selection-unstable-v1.h>
 #include <xkbcommon/xkbcommon.h>
 
+#include <tllist.h>
+
 #include "fdm.h"
-#include "tllist.h"
 
 struct monitor {
     struct wayland *wayl;