diff --git a/.gitmodules b/.gitmodules index 1649f01b..a4a614b8 100644 --- a/.gitmodules +++ b/.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 diff --git a/config.h b/config.h index 34373969..0db130ad 100644 --- a/config.h +++ b/config.h @@ -3,8 +3,9 @@ #include #include +#include + #include "terminal.h" -#include "tllist.h" struct config { char *term; diff --git a/main.c b/main.c index d41a49e5..7ec6e945 100644 --- a/main.c +++ b/main.c @@ -10,13 +10,14 @@ #include +#include + #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" diff --git a/meson.build b/meson.build index f97cd609..fe33d497 100644 --- a/meson.build +++ b/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( diff --git a/render.c b/render.c index b90b27e8..438c105a 100644 --- a/render.c +++ b/render.c @@ -10,12 +10,13 @@ #include #include +#include + #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)) diff --git a/subprojects/fcft b/subprojects/fcft new file mode 160000 index 00000000..6377db44 --- /dev/null +++ b/subprojects/fcft @@ -0,0 +1 @@ +Subproject commit 6377db4464f9a411c17b681f4a41c36950f1a232 diff --git a/terminal.h b/terminal.h index bec33790..a75a5467 100644 --- a/terminal.h +++ b/terminal.h @@ -8,10 +8,11 @@ #include #include +#include +#include + //#include "config.h" #include "fdm.h" -#include "font.h" -#include "tllist.h" #include "wayland.h" #define likely(c) __builtin_expect(!!(c), 1) diff --git a/wayland.h b/wayland.h index fb681dd6..36c58b49 100644 --- a/wayland.h +++ b/wayland.h @@ -9,8 +9,9 @@ #include #include +#include + #include "fdm.h" -#include "tllist.h" struct monitor { struct wayland *wayl;