diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-09 16:52:37 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-09 16:52:37 +0000 |
| commit | ee840a308aeb3a5ce00137da35dacebe2d9892ad (patch) | |
| tree | 7b100acca663f7ff28f7c431e8c755610957000f /config.h | |
| parent | foot.ini: add modeline so vim uses # comments instead of ; (diff) | |
| parent | config: rename csd.color.close -> quit (diff) | |
Merge branch 'refactor-key-bindings'
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 31 |
1 files changed, 24 insertions, 7 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 { @@ -36,12 +44,21 @@ struct argv { char **args; }; -struct config_binding_pipe { - struct argv argv; +enum binding_aux_type { + BINDING_AUX_NONE, + BINDING_AUX_PIPE, +}; + +struct binding_aux { + enum binding_aux_type type; bool master_copy; + + union { + struct argv pipe; + }; }; -enum config_key_binding_type { +enum key_binding_type { KEY_BINDING, MOUSE_BINDING, }; @@ -62,7 +79,7 @@ struct config_key_binding { } m; }; - struct config_binding_pipe pipe; + struct binding_aux aux; /* For error messages in collision handling */ const char *path; @@ -245,7 +262,7 @@ struct config { uint32_t buttons; uint32_t minimize; uint32_t maximize; - uint32_t close; + uint32_t quit; /* ‘close’ collides with #define in epoll-shim */ uint32_t border; } color; |
