mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-30 03:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Free bar configs on reload and exit

Browse source
This commit is contained in:
Drew DeVault 2018-03-31 00:35:06 -04:00
parent 0441d12479
commit 18173fb5ad
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sway/config.c
View file

@ -57,38 +57,41 @@ static void free_mode(struct sway_mode *mode) {
void free_config(struct sway_config *config) { void free_config(struct sway_config *config) {
config_clear_handler_context(config); config_clear_handler_context(config);
int i;
if (!config) { if (!config) {
return; return;
} }
// TODO: handle all currently unhandled lists as we add implementations // TODO: handle all currently unhandled lists as we add implementations
if (config->symbols) { if (config->symbols) {
for (i = 0; i < config->symbols->length; i++) { for (int i = 0; i < config->symbols->length; ++i) {
free_sway_variable(config->symbols->items[i]); free_sway_variable(config->symbols->items[i]);
} }
list_free(config->symbols); list_free(config->symbols);
} }
if (config->modes) { if (config->modes) {
for (i = 0; i < config->modes->length; i++) { for (int i = 0; i < config->modes->length; ++i) {
free_mode(config->modes->items[i]); free_mode(config->modes->items[i]);
} }
list_free(config->modes); list_free(config->modes);
} }
if (config->bars) {
for (int i = 0; i < config->bars->length; ++i) {
free_bar_config(config->bars->items[i]);
}
list_free(config->bars); list_free(config->bars);
}
list_free(config->cmd_queue); list_free(config->cmd_queue);
list_free(config->workspace_outputs); list_free(config->workspace_outputs);
list_free(config->pid_workspaces); list_free(config->pid_workspaces);
list_free(config->output_configs); list_free(config->output_configs);
if (config->input_configs) { if (config->input_configs) {
for (i = 0; i < config->input_configs->length; i++) { for (int i = 0; i < config->input_configs->length; i++) {
free_input_config(config->input_configs->items[i]); free_input_config(config->input_configs->items[i]);
} }
list_free(config->input_configs); list_free(config->input_configs);
} }
if (config->seat_configs) { if (config->seat_configs) {
for (i = 0; i < config->seat_configs->length; i++) { for (int i = 0; i < config->seat_configs->length; i++) {
free_seat_config(config->seat_configs->items[i]); free_seat_config(config->seat_configs->items[i]);
} }
list_free(config->seat_configs); list_free(config->seat_configs);

2
sway/config/bar.c
View file

@ -16,6 +16,7 @@
#include "log.h" #include "log.h"
static void terminate_swaybar(pid_t pid) { static void terminate_swaybar(pid_t pid) {
wlr_log(L_DEBUG, "Terminating swaybar %d", pid);
int ret = kill(pid, SIGTERM); int ret = kill(pid, SIGTERM);
if (ret != 0) { if (ret != 0) {
wlr_log_errno(L_ERROR, "Unable to terminate swaybar %d", pid); wlr_log_errno(L_ERROR, "Unable to terminate swaybar %d", pid);
@ -185,6 +186,7 @@ void invoke_swaybar(struct bar_config *bar) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
exit(1); exit(1);
} }
wlr_log(L_DEBUG, "Spawned swaybar %d", bar->pid);
close(filedes[0]); close(filedes[0]);
ssize_t len; ssize_t len;
if (read(filedes[1], &len, sizeof(int)) == sizeof(int)) { if (read(filedes[1], &len, sizeof(int)) == sizeof(int)) {