diff options
author | 2016-02-27 16:18:50 -0500 | |
---|---|---|
committer | 2016-02-27 16:18:50 -0500 | |
commit | 3453910c3e887be900c69394b738e34d9d8ba095 (patch) | |
tree | 28e0d8d72557ac57a2f9aed5c94818c8ba20e97f /include/config.h | |
parent | Set pointer pos before focusing view under it (diff) | |
parent | Free config before exiting sway. (diff) | |
download | sway-3453910c3e887be900c69394b738e34d9d8ba095.tar.gz sway-3453910c3e887be900c69394b738e34d9d8ba095.tar.zst sway-3453910c3e887be900c69394b738e34d9d8ba095.zip |
Merge pull request #492 from mikkeloscar/swaybar-multi-output
Display single swaybar on multiple outputs
Diffstat (limited to 'include/config.h')
-rw-r--r-- | include/config.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/config.h b/include/config.h index 655d0a9c..d77872ee 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -125,6 +125,7 @@ struct bar_config { | |||
125 | bool strip_workspace_numbers; | 125 | bool strip_workspace_numbers; |
126 | bool binding_mode_indicator; | 126 | bool binding_mode_indicator; |
127 | bool verbose; | 127 | bool verbose; |
128 | pid_t pid; | ||
128 | struct { | 129 | struct { |
129 | char background[10]; | 130 | char background[10]; |
130 | char statusline[10]; | 131 | char statusline[10]; |
@@ -192,6 +193,10 @@ bool load_config(const char *file); | |||
192 | */ | 193 | */ |
193 | bool read_config(FILE *file, bool is_active); | 194 | bool read_config(FILE *file, bool is_active); |
194 | /** | 195 | /** |
196 | * Free config struct | ||
197 | */ | ||
198 | void free_config(struct sway_config *config); | ||
199 | /** | ||
195 | * Does variable replacement for a string based on the config's currently loaded variables. | 200 | * Does variable replacement for a string based on the config's currently loaded variables. |
196 | */ | 201 | */ |
197 | char *do_var_replacement(char *str); | 202 | char *do_var_replacement(char *str); |
@@ -226,8 +231,7 @@ int sway_mouse_binding_cmp_qsort(const void *a, const void *b); | |||
226 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); | 231 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); |
227 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); | 232 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); |
228 | 233 | ||
229 | void load_swaybars(swayc_t *output, int output_idx); | 234 | void load_swaybars(); |
230 | void terminate_swaybars(list_t *pids); | ||
231 | void terminate_swaybg(pid_t pid); | 235 | void terminate_swaybg(pid_t pid); |
232 | 236 | ||
233 | /** | 237 | /** |