diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-15 00:35:18 +0100 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-15 01:05:00 +0100 |
commit | 0513322c033d0d2c9c7aafaa95590c4d9320fcc8 (patch) | |
tree | fb469ff34a1ba6c5fffc242464acd10f5235ebca /include | |
parent | Merge pull request #321 from gpyh/bar_cmds (diff) | |
download | sway-0513322c033d0d2c9c7aafaa95590c4d9320fcc8.tar.gz sway-0513322c033d0d2c9c7aafaa95590c4d9320fcc8.tar.zst sway-0513322c033d0d2c9c7aafaa95590c4d9320fcc8.zip |
Move default bar config to bar creation.
Get rid of `config->bar` and define the default bar config options when
a bar is initialized.
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index 0fc8202c..5bb7107a 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -125,7 +125,6 @@ struct sway_config { | |||
125 | list_t *output_configs; | 125 | list_t *output_configs; |
126 | list_t *criteria; | 126 | list_t *criteria; |
127 | struct sway_mode *current_mode; | 127 | struct sway_mode *current_mode; |
128 | struct bar_config bar; | ||
129 | struct bar_config *current_bar; | 128 | struct bar_config *current_bar; |
130 | uint32_t floating_mod; | 129 | uint32_t floating_mod; |
131 | uint32_t dragging_key; | 130 | uint32_t dragging_key; |
@@ -177,6 +176,11 @@ int sway_mouse_binding_cmp_buttons(const void *a, const void *b); | |||
177 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); | 176 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); |
178 | 177 | ||
179 | /** | 178 | /** |
179 | * Allocate and initialize default bar configuration. | ||
180 | */ | ||
181 | struct bar_config *default_bar_config(void); | ||
182 | |||
183 | /** | ||
180 | * Global config singleton. | 184 | * Global config singleton. |
181 | */ | 185 | */ |
182 | extern struct sway_config *config; | 186 | extern struct sway_config *config; |