diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 12:43:51 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 12:43:51 +0000 |
| commit | fd9c28464db8e3f334819ec9d773bf31ed37c088 (patch) | |
| tree | fad92ce613f2dda24cef9f096026578391e905ab | |
| parent | meson: tllist: try subproject first, then fallback to system dependency (diff) | |
fcft: use fcft instead of local copy of font.c/font.h
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | render.c | 3 | ||||
| m--------- | subprojects/fcft | 0 | ||||
| -rw-r--r-- | terminal.h | 5 | ||||
| -rw-r--r-- | wayland.h | 3 |
8 files changed, 22 insertions, 8 deletions
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 @@ -3,8 +3,9 @@ #include <stdint.h> #include <stdbool.h> +#include <tllist.h> + #include "terminal.h" -#include "tllist.h" struct config { char *term; @@ -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" 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( @@ -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)) diff --git a/subprojects/fcft b/subprojects/fcft new file mode 160000 +Subproject 6377db4464f9a411c17b681f4a41c36950f1a23 @@ -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) @@ -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; |
