koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i3bar: free output data structures

Browse Source
This commit is contained in:
Orestis Floros
2017-09-26 14:50:26 +03:00
parent a05663c59e
commit 54c79e4b2f
5 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
i3bar/src/outputs.c
View File

@ -173,6 +173,12 @@ static int outputs_start_map_cb(void *params_) {
return 1;
}
static void clear_output(i3_output *output) {
FREE(output->name);
FREE(output->workspaces);
FREE(output->trayclients);
}
/*
* We hit the end of a map (rect or a new output)
*
@ -199,9 +205,7 @@ static int outputs_end_map_cb(void *params_) {
if (!handle_output) {
DLOG("Ignoring output \"%s\", not configured to handle it.\n",
params->outputs_walk->name);
FREE(params->outputs_walk->name);
FREE(params->outputs_walk->workspaces);
FREE(params->outputs_walk->trayclients);
clear_output(params->outputs_walk);
FREE(params->outputs_walk);
FREE(params->cur_key);
return 1;
@ -217,6 +221,9 @@ static int outputs_end_map_cb(void *params_) {
target->primary = params->outputs_walk->primary;
target->ws = params->outputs_walk->ws;
target->rect = params->outputs_walk->rect;
clear_output(params->outputs_walk);
FREE(params->outputs_walk);
}
return 1;
}
@ -260,7 +267,6 @@ void init_outputs(void) {
*/
void parse_outputs_json(char *json) {
struct outputs_json_params params;
params.outputs_walk = NULL;
params.cur_key = NULL;
params.json = json;
@ -286,6 +292,27 @@ void parse_outputs_json(char *json) {
yajl_free(handle);
}
/*
* free() all outputs data structures.
*
*/
void free_outputs(void) {
free_workspaces();
i3_output *outputs_walk;
if (outputs == NULL) {
return;
}
SLIST_FOREACH(outputs_walk, outputs, slist) {
destroy_window(outputs_walk);
if (outputs_walk->trayclients != NULL && !TAILQ_EMPTY(outputs_walk->trayclients)) {
FREE_TAILQ(outputs_walk->trayclients, trayclient);
}
clear_output(outputs_walk);
}
FREE_SLIST(outputs, i3_output);
}
/*
* Returns the output with the given name
*