From 11f89cf7a9a7375b74a239311e394db3c952fbd9 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 24 Mar 2025 16:34:15 +0100 Subject: Add support for specifying hook file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/common.h | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'src/common.h') diff --git a/src/common.h b/src/common.h index f5be542..61e5c79 100644 --- a/src/common.h +++ b/src/common.h @@ -737,6 +737,14 @@ struct setting_time { time_t value; /**< Setting value */ }; +/** + * `char *` valued setting with setting source + */ +struct setting_str { + enum setting_source source; /**< Setting source */ + char *value; /**< Setting value */ +}; + /** * Intermediate settings representation of colour settings * (for a non-transitional period) with settings sources @@ -806,6 +814,14 @@ struct settings { */ int until_death; + /** + * The path to the hook file or hook directory, `NULL` + * if unspecified (search default paths) + * + * This represents the "hook" setting and "-H" option + */ + struct setting_str hook_file; + /** * Whether the program should preserve preapplied * colour calibrations @@ -1183,6 +1199,12 @@ extern int use_fade; */ extern int verbose; +/** + * The path to the hook file or hook directory, `NULL` + * if unspecified (search default paths) + */ +extern char *hook_file; + /* backend-direct.c */ @@ -1357,11 +1379,14 @@ LIST_RAMPS_STOP_VALUE_TYPES(X, ;); /** * Load the configuration file * - * @param state Output parameter for the configurations - * @param path The path to the configuration file, or `NULL` if the - * application should look for it in the default paths - */ -void config_ini_init(struct config_ini_state *state, const char *path); + * @param state Output parameter for the configurations + * @param path The path to the configuration file, or `NULL` if the + * application should look for it in the default paths + * @param pathbuf_out Output parameter for the memory allocated for the + * return value + * @return The path to the loaded configuration file, `NULL` if none + */ +const char *config_ini_init(struct config_ini_state *state, const char *path, char **pathbuf_out); /** * Deallocate the settings loaded -- cgit v1.2.3-70-g09d2