aboutsummaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-08 17:17:29 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-08 17:41:00 +0000
commiteb6737ca2593f457368ae16e920911cdd70a2e33 (patch)
treef8dbf85542613c15d50439255d99db4e3d90ef25 /config.h
parentchangelog: move deprecation section up first, change most ‘footrc’ -> ‘foot.ini’ (diff)
Add -W,--window-size-chars, and foot.ini:initial-window-size-chars
* Add -W,--window-size-chars command line option * Add initial-window-size-chars foot.ini option * Add -w,--window-size-pixels command line option * Add initial-window-size-pixels foot.ini option * Deprecate -g,--geometry command line option in favor of -w,--window-size-pixels * Deprecate geometry option in foot.ini in favor of initial-window-size-pixels
Diffstat (limited to 'config.h')
-rw-r--r--config.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/config.h b/config.h
index bffb4776..782314e6 100644
--- a/config.h
+++ b/config.h
@@ -9,6 +9,8 @@
#include "user-notification.h"
#include "wayland.h"
+enum conf_size_type {CONF_SIZE_PX, CONF_SIZE_CELLS};
+
struct config_font {
char *pattern;
double pt_size;
@@ -52,10 +54,24 @@ struct config {
char *title;
char *app_id;
bool login_shell;
- unsigned width;
- unsigned height;
+
+ struct {
+ enum conf_size_type type;
+ union {
+ struct {
+ unsigned width;
+ unsigned height;
+ } px;
+ struct {
+ unsigned width;
+ unsigned height;
+ } cells;
+ };
+ } size;
+
unsigned pad_x;
unsigned pad_y;
+
enum { STARTUP_WINDOWED, STARTUP_MAXIMIZED, STARTUP_FULLSCREEN } startup_mode;
tll(struct config_font) fonts;
@@ -156,7 +172,9 @@ struct config {
user_notifications_t notifications;
};
-bool config_load(struct config *conf, const char *path, bool errors_are_fatal);
+bool config_load(
+ struct config *conf, const char *path,
+ user_notifications_t *initial_user_notifications, bool errors_are_fatal);
void config_free(struct config conf);
struct config_font config_font_parse(const char *pattern);