diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/common.h | 60 | ||||
| -rw-r--r-- | src/config-ini.c | 1 | ||||
| -rw-r--r-- | src/config-ini.h | 45 | ||||
| -rw-r--r-- | src/options.c | 2 | ||||
| -rw-r--r-- | src/options.h | 63 | ||||
| -rw-r--r-- | src/redshift.c | 2 |
7 files changed, 61 insertions, 116 deletions
diff --git a/src/Makefile b/src/Makefile index 7d7e9d6..25c1568 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,9 +24,7 @@ OBJ =\ HDR =\ common.h\ - solar.h\ - options.h\ - config-ini.h + solar.h PACKAGE_STRING = redshift-ng 1.13 diff --git a/src/common.h b/src/common.h index 0e0fd3b..746238d 100644 --- a/src/common.h +++ b/src/common.h @@ -111,6 +111,49 @@ struct transition_scheme { struct color_setting night; }; +struct config_ini_setting { + struct config_ini_setting *next; + char *name; + char *value; +}; + +struct config_ini_section { + struct config_ini_section *next; + char *name; + struct config_ini_setting *settings; +}; + +struct config_ini_state { + struct config_ini_section *sections; +}; + + +struct options { + /* Path to config file */ + char *config_filepath; + + struct transition_scheme scheme; + enum program_mode mode; + int verbose; + + /* Temperature to set in manual mode. */ + int temp_set; + /* Whether to fade between large skips in color temperature. */ + int use_fade; + /* Whether to preserve gamma ramps if supported by gamma method. */ + int preserve_gamma; + + /* Selected gamma method. */ + const struct gamma_method *method; + /* Arguments for gamma method. */ + char *method_args; + + /* Selected location provider. */ + const struct location_provider *provider; + /* Arguments for location provider. */ + char *provider_args; +}; + /* Gamma adjustment method */ typedef struct gamma_state GAMMA_STATE; @@ -180,6 +223,23 @@ LIST_RAMPS_STOP_VALUE_TYPES(X, ;); #undef X +int config_ini_init(struct config_ini_state *state, const char *filepath); +void config_ini_free(struct config_ini_state *state); +struct config_ini_section *config_ini_get_section(struct config_ini_state *state, const char *name); + + +void options_init(struct options *options); +void options_parse_args( + struct options *options, int argc, char *argv[], + const struct gamma_method *gamma_methods, + const struct location_provider *location_providers); +void options_parse_config_file( + struct options *options, struct config_ini_state *config_state, + const struct gamma_method *gamma_methods, + const struct location_provider *location_providers); +void options_set_defaults(struct options *options); + + void hooks_signal_period_change(enum period prev_period, enum period period); diff --git a/src/config-ini.c b/src/config-ini.c index b8566b9..2041db5 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -17,7 +17,6 @@ Copyright (c) 2010-2018 Jon Lund Steffensen <jonlst@gmail.com> */ #include "common.h" -#include "config-ini.h" #define MAX_CONFIG_PATH 4096 #define MAX_LINE_LENGTH 512 diff --git a/src/config-ini.h b/src/config-ini.h deleted file mode 100644 index b50bf71..0000000 --- a/src/config-ini.h +++ /dev/null @@ -1,45 +0,0 @@ -/* config-ini.h -- INI config file parser header - This file is part of Redshift. - - Redshift is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Redshift is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Redshift. If not, see <http://www.gnu.org/licenses/>. - - Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com> -*/ - -#ifndef REDSHIFT_CONFIG_INI_H -#define REDSHIFT_CONFIG_INI_H - -struct config_ini_setting { - struct config_ini_setting *next; - char *name; - char *value; -}; - -struct config_ini_section { - struct config_ini_section *next; - char *name; - struct config_ini_setting *settings; -}; - -struct config_ini_state { - struct config_ini_section *sections; -}; - - -int config_ini_init(struct config_ini_state *state, const char *filepath); -void config_ini_free(struct config_ini_state *state); - -struct config_ini_section *config_ini_get_section(struct config_ini_state *state, const char *name); - -#endif /* ! REDSHIFT_CONFIG_INI_H */ diff --git a/src/options.c b/src/options.c index dc38e2a..bbc6435 100644 --- a/src/options.c +++ b/src/options.c @@ -17,8 +17,6 @@ Copyright (c) 2017 Jon Lund Steffensen <jonlst@gmail.com> */ #include "common.h" -#include "config-ini.h" -#include "options.h" #include "solar.h" /* Angular elevation of the sun at which the color temperature diff --git a/src/options.h b/src/options.h deleted file mode 100644 index 2978672..0000000 --- a/src/options.h +++ /dev/null @@ -1,63 +0,0 @@ -/* options.h -- Program options header - This file is part of Redshift. - - Redshift is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Redshift is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Redshift. If not, see <http://www.gnu.org/licenses/>. - - Copyright (c) 2017 Jon Lund Steffensen <jonlst@gmail.com> -*/ - -#ifndef REDSHIFT_OPTIONS_H -#define REDSHIFT_OPTIONS_H - -#include "common.h" - -struct options { - /* Path to config file */ - char *config_filepath; - - struct transition_scheme scheme; - enum program_mode mode; - int verbose; - - /* Temperature to set in manual mode. */ - int temp_set; - /* Whether to fade between large skips in color temperature. */ - int use_fade; - /* Whether to preserve gamma ramps if supported by gamma method. */ - int preserve_gamma; - - /* Selected gamma method. */ - const struct gamma_method *method; - /* Arguments for gamma method. */ - char *method_args; - - /* Selected location provider. */ - const struct location_provider *provider; - /* Arguments for location provider. */ - char *provider_args; -}; - - -void options_init(struct options *options); -void options_parse_args( - struct options *options, int argc, char *argv[], - const struct gamma_method *gamma_methods, - const struct location_provider *location_providers); -void options_parse_config_file( - struct options *options, struct config_ini_state *config_state, - const struct gamma_method *gamma_methods, - const struct location_provider *location_providers); -void options_set_defaults(struct options *options); - -#endif /* ! REDSHIFT_OPTIONS_H */ diff --git a/src/redshift.c b/src/redshift.c index 92066e1..b60236c 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -17,9 +17,7 @@ Copyright (c) 2009-2017 Jon Lund Steffensen <jonlst@gmail.com> */ #include "common.h" -#include "config-ini.h" #include "solar.h" -#include "options.h" /* poll.h is not available on Windows but there is no Windows location provider using polling. On Windows, we just define some stubs to make things compile. |