diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-10-21 18:24:07 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-10-21 18:24:07 -0400 |
commit | 3e2579b22cb76e098e78aec62c3c40a4bde0e394 (patch) | |
tree | add4f0b2a97d46fc8ddbd34d61656b3474592083 /include/config.h | |
parent | Merge pull request #196 from sce/catch_empty_command (diff) | |
parent | commands: Allow changing resolution outside config load. (diff) | |
download | sway-3e2579b22cb76e098e78aec62c3c40a4bde0e394.tar.gz sway-3e2579b22cb76e098e78aec62c3c40a4bde0e394.tar.zst sway-3e2579b22cb76e098e78aec62c3c40a4bde0e394.zip |
Merge pull request #197 from sce/configure_outputs_during_reload_
Configure outputs during reload
Diffstat (limited to 'include/config.h')
-rw-r--r-- | include/config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index 676218c8..2a8e36fa 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <xkbcommon/xkbcommon.h> | 6 | #include <xkbcommon/xkbcommon.h> |
7 | #include "list.h" | 7 | #include "list.h" |
8 | #include "layout.h" | 8 | #include "layout.h" |
9 | #include "container.h" | ||
9 | 10 | ||
10 | struct sway_variable { | 11 | struct sway_variable { |
11 | char *name; | 12 | char *name; |
@@ -62,6 +63,8 @@ struct sway_config { | |||
62 | bool load_config(const char *file); | 63 | bool load_config(const char *file); |
63 | bool read_config(FILE *file, bool is_active); | 64 | bool read_config(FILE *file, bool is_active); |
64 | char *do_var_replacement(char *str); | 65 | char *do_var_replacement(char *str); |
66 | // Setup output container by applying given config | ||
67 | void apply_output_config(struct output_config *oc, swayc_t *output); | ||
65 | 68 | ||
66 | extern struct sway_config *config; | 69 | extern struct sway_config *config; |
67 | 70 | ||