From eb6737ca2593f457368ae16e920911cdd70a2e33 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 8 Sep 2020 19:17:29 +0200 Subject: 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 --- config.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'config.h') 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); -- cgit v1.3