diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-07 18:35:52 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-09 16:51:04 +0000 |
| commit | d04bc6ab10345f842cc05cb98959ad8b5db569f0 (patch) | |
| tree | 6f922ea30712fe931ddccb6b5ee5fdc49773aa03 | |
| parent | foot.ini: add modeline so vim uses # comments instead of ; (diff) | |
config: move structs and enums used by config from terminal.h -> config.h
| -rw-r--r-- | config.h | 12 | ||||
| -rw-r--r-- | server.h | 1 | ||||
| -rw-r--r-- | terminal.h | 10 | ||||
| -rw-r--r-- | wayland.h | 1 |
4 files changed, 13 insertions, 11 deletions
@@ -4,11 +4,11 @@ #include <stdbool.h> #include <uchar.h> +#include <xkbcommon/xkbcommon.h> #include <tllist.h> +#include <fcft/fcft.h> -#include "terminal.h" #include "user-notification.h" -#include "wayland.h" #define DEFINE_LIST(type) \ type##_list { \ @@ -16,6 +16,14 @@ type *arr; \ } +/* If px != 0 then px is valid, otherwise pt is valid */ +struct pt_or_px { + int16_t px; + float pt; +}; + +enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BEAM }; + enum conf_size_type {CONF_SIZE_PX, CONF_SIZE_CELLS}; struct config_font { @@ -2,6 +2,7 @@ #include "fdm.h" #include "config.h" +#include "reaper.h" #include "wayland.h" struct server; @@ -14,7 +14,7 @@ #include <tllist.h> #include <fcft/fcft.h> -//#include "config.h" +#include "config.h" #include "composed.h" #include "debug.h" #include "fdm.h" @@ -248,8 +248,6 @@ enum mouse_reporting { MOUSE_SGR_PIXELS, /* ?1016h */ }; -enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BEAM }; - enum selection_kind { SELECTION_NONE, SELECTION_CHAR_WISE, @@ -299,12 +297,6 @@ struct url { }; typedef tll(struct url) url_list_t; -/* If px != 0 then px is valid, otherwise pt is valid */ -struct pt_or_px { - int16_t px; - float pt; -}; - struct terminal { struct fdm *fdm; struct reaper *reaper; @@ -23,6 +23,7 @@ #include <fcft/fcft.h> #include <tllist.h> +#include "config.h" #include "fdm.h" /* Forward declarations */ |
