diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-12-18 18:13:40 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-12-18 18:13:40 -0500 |
commit | 6555aad7f9234547681aeffd3fa67182cee4c193 (patch) | |
tree | 683793bfcd1cd3a5a53fa27883abde31d71ac09c /include | |
parent | Merge pull request #357 from sce/fix_swaybar_crashes (diff) | |
parent | Terminate children when freeing output container (diff) | |
download | sway-6555aad7f9234547681aeffd3fa67182cee4c193.tar.gz sway-6555aad7f9234547681aeffd3fa67182cee4c193.tar.zst sway-6555aad7f9234547681aeffd3fa67182cee4c193.zip |
Merge pull request #358 from mikkeloscar/reload-swaybg-swaybar
Reload swaybar/swaybg on config reload.
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 4 | ||||
-rw-r--r-- | include/container.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index 32562908..b89ad553 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -184,6 +184,10 @@ int sway_mouse_binding_cmp(const void *a, const void *b); | |||
184 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); | 184 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); |
185 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); | 185 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); |
186 | 186 | ||
187 | void load_swaybars(swayc_t *output, int output_idx); | ||
188 | void terminate_swaybars(list_t *pids); | ||
189 | void terminate_swaybg(pid_t pid); | ||
190 | |||
187 | /** | 191 | /** |
188 | * Allocate and initialize default bar configuration. | 192 | * Allocate and initialize default bar configuration. |
189 | */ | 193 | */ |
diff --git a/include/container.h b/include/container.h index 9a67a689..d76160de 100644 --- a/include/container.h +++ b/include/container.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #ifndef _SWAY_CONTAINER_H | 1 | #ifndef _SWAY_CONTAINER_H |
2 | #define _SWAY_CONTAINER_H | 2 | #define _SWAY_CONTAINER_H |
3 | #include <sys/types.h> | ||
3 | #include <wlc/wlc.h> | 4 | #include <wlc/wlc.h> |
4 | typedef struct sway_container swayc_t; | 5 | typedef struct sway_container swayc_t; |
5 | 6 | ||
@@ -81,6 +82,11 @@ struct sway_container { | |||
81 | char *class; | 82 | char *class; |
82 | char *app_id; | 83 | char *app_id; |
83 | 84 | ||
85 | // Used by output containers to keep track of swaybar/swaybg child | ||
86 | // processes. | ||
87 | list_t *bar_pids; | ||
88 | pid_t bg_pid; | ||
89 | |||
84 | int gaps; | 90 | int gaps; |
85 | 91 | ||
86 | list_t *children; | 92 | list_t *children; |