mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: move structs and enums used by config from terminal.h -> config.h

Browse source
This commit is contained in:
Daniel Eklöf 2022-02-07 19:35:52 +01:00
parent cbae14f0c5
commit d04bc6ab10
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config.h
View file

@ -4,11 +4,11 @@
#include <stdbool.h> #include <stdbool.h>
#include <uchar.h> #include <uchar.h>
#include <xkbcommon/xkbcommon.h>
#include <tllist.h> #include <tllist.h>
#include <fcft/fcft.h>
#include "terminal.h"
#include "user-notification.h" #include "user-notification.h"
#include "wayland.h"
#define DEFINE_LIST(type) \ #define DEFINE_LIST(type) \
type##_list { \ type##_list { \
@ -16,6 +16,14 @@
type *arr; \ 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}; enum conf_size_type {CONF_SIZE_PX, CONF_SIZE_CELLS};
struct config_font { struct config_font {

1
server.h
View file

@ -2,6 +2,7 @@
#include "fdm.h" #include "fdm.h"
#include "config.h" #include "config.h"
#include "reaper.h"
#include "wayland.h" #include "wayland.h"
struct server; struct server;

10
terminal.h
View file

@ -14,7 +14,7 @@
#include <tllist.h> #include <tllist.h>
#include <fcft/fcft.h> #include <fcft/fcft.h>
//#include "config.h" #include "config.h"
#include "composed.h" #include "composed.h"
#include "debug.h" #include "debug.h"
#include "fdm.h" #include "fdm.h"
@ -248,8 +248,6 @@ enum mouse_reporting {
MOUSE_SGR_PIXELS, /* ?1016h */ MOUSE_SGR_PIXELS, /* ?1016h */
}; };
enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BEAM };
enum selection_kind { enum selection_kind {
SELECTION_NONE, SELECTION_NONE,
SELECTION_CHAR_WISE, SELECTION_CHAR_WISE,
@ -299,12 +297,6 @@ struct url {
}; };
typedef tll(struct url) url_list_t; 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 terminal {
struct fdm *fdm; struct fdm *fdm;
struct reaper *reaper; struct reaper *reaper;

1
wayland.h
View file

@ -23,6 +23,7 @@
#include <fcft/fcft.h> #include <fcft/fcft.h>
#include <tllist.h> #include <tllist.h>
#include "config.h"
#include "fdm.h" #include "fdm.h"
/* Forward declarations */ /* Forward declarations */