diff options
author | Half-Shot <half-shot@molrams.com> | 2015-08-20 21:32:08 +0100 |
---|---|---|
committer | Half-Shot <half-shot@molrams.com> | 2015-08-20 21:32:08 +0100 |
commit | 5a9ba261bca4ca709ec7a14d2019b55d9ce06994 (patch) | |
tree | fe1a924cf8055b2b722566db6ab98295dcf08ce7 /include/config.h | |
parent | Basic left right move command implemented. (diff) | |
parent | Merge pull request #104 from minus7/ipc-get-messages (diff) | |
download | sway-5a9ba261bca4ca709ec7a14d2019b55d9ce06994.tar.gz sway-5a9ba261bca4ca709ec7a14d2019b55d9ce06994.tar.zst sway-5a9ba261bca4ca709ec7a14d2019b55d9ce06994.zip |
Merge branch 'master' of https://github.com/SirCmpwn/sway
Diffstat (limited to 'include/config.h')
-rw-r--r-- | include/config.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index 9243bf35..c23c3509 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -41,9 +41,12 @@ struct sway_config { | |||
41 | bool active; | 41 | bool active; |
42 | bool failed; | 42 | bool failed; |
43 | bool reloading; | 43 | bool reloading; |
44 | |||
45 | int gaps_inner; | ||
46 | int gaps_outer; | ||
44 | }; | 47 | }; |
45 | 48 | ||
46 | bool load_config(void); | 49 | bool load_config(const char *file); |
47 | bool read_config(FILE *file, bool is_active); | 50 | bool read_config(FILE *file, bool is_active); |
48 | char *do_var_replacement(struct sway_config *config, char *str); | 51 | char *do_var_replacement(struct sway_config *config, char *str); |
49 | 52 | ||