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

swaynag: call swaynag_destroy on clean exit

Browse source 
And fix the fallout of the swaynag_destroy having evolved without
being tested:
* wl_display_disconnect was called too early
* `button_close` and `swaynag.details.button_details` needed to be
  heap allocated, since they are added to swaynag.buttons, and all
  entries of swaynag.buttons are freed in swaynag_destroy
* To keep things simpler, disconnect the lifetime of the 'Toggle details'
  button text config setting from the button itself.
This commit is contained in:
Manuel Stoeckl 2023-01-08 09:21:30 -05:00 committed by Simon Zeni
parent 2f2cdd60de
commit 5e73acb431
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/swaynag/swaynag.h
View file

@ -58,6 +58,7 @@ struct swaynag_button {
struct swaynag_details { struct swaynag_details {
bool visible; bool visible;
char *message; char *message;
char *details_text;
int x; int x;
int y; int y;
@ -67,7 +68,7 @@ struct swaynag_details {
int offset; int offset;
int visible_lines; int visible_lines;
int total_lines; int total_lines;
struct swaynag_button button_details; struct swaynag_button *button_details;
struct swaynag_button button_up; struct swaynag_button button_up;
struct swaynag_button button_down; struct swaynag_button button_down;
}; };

4
swaynag/config.c
View file

@ -243,8 +243,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
break; break;
case 'L': // Detailed Button Text case 'L': // Detailed Button Text
if (swaynag) { if (swaynag) {
free(swaynag->details.button_details.text); free(swaynag->details.details_text);
swaynag->details.button_details.text = strdup(optarg); swaynag->details.details_text = strdup(optarg);
} }
break; break;
case 'm': // Message case 'm': // Message

21
swaynag/main.c
View file

@ -29,10 +29,12 @@ int main(int argc, char **argv) {
wl_list_init(&swaynag.outputs); wl_list_init(&swaynag.outputs);
wl_list_init(&swaynag.seats); wl_list_init(&swaynag.seats);
struct swaynag_button button_close = { 0 }; struct swaynag_button *button_close = calloc(1, sizeof(struct swaynag_button));
button_close.text = strdup("X"); button_close->text = strdup("X");
button_close.type = SWAYNAG_ACTION_DISMISS; button_close->type = SWAYNAG_ACTION_DISMISS;
list_add(swaynag.buttons, &button_close); list_add(swaynag.buttons, button_close);
swaynag.details.details_text = strdup("Toggle details");
char *config_path = NULL; char *config_path = NULL;
bool debug = false; bool debug = false;
@ -54,8 +56,6 @@ int main(int argc, char **argv) {
} }
} }
swaynag.details.button_details.text = strdup("Toggle details");
swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND;
if (argc > 1) { if (argc > 1) {
struct swaynag_type *type_args = swaynag_type_new("<args>"); struct swaynag_type *type_args = swaynag_type_new("<args>");
@ -88,10 +88,11 @@ int main(int argc, char **argv) {
swaynag_type_merge(type, swaynag_type_get(types, "<args>")); swaynag_type_merge(type, swaynag_type_get(types, "<args>"));
swaynag.type = type; swaynag.type = type;
swaynag_types_free(types);
if (swaynag.details.message) { if (swaynag.details.message) {
list_add(swaynag.buttons, &swaynag.details.button_details); swaynag.details.button_details = calloc(1, sizeof(struct swaynag_button));
swaynag.details.button_details->text = strdup(swaynag.details.details_text);
swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND;
list_add(swaynag.buttons, swaynag.details.button_details);
} }
sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output); sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output);
@ -111,11 +112,9 @@ int main(int argc, char **argv) {
swaynag_setup(&swaynag); swaynag_setup(&swaynag);
swaynag_run(&swaynag); swaynag_run(&swaynag);
return status;
cleanup: cleanup:
swaynag_types_free(types); swaynag_types_free(types);
free(swaynag.details.button_details.text);
swaynag_destroy(&swaynag); swaynag_destroy(&swaynag);
return status; return status;
} }

9
swaynag/swaynag.c
View file

@ -483,10 +483,6 @@ void swaynag_run(struct swaynag *swaynag) {
&& wl_display_dispatch(swaynag->display) != -1) { && wl_display_dispatch(swaynag->display) != -1) {
// This is intentionally left blank // This is intentionally left blank
} }
if (swaynag->display) {
wl_display_disconnect(swaynag->display);
}
} }
void swaynag_destroy(struct swaynag *swaynag) { void swaynag_destroy(struct swaynag *swaynag) {
@ -501,6 +497,7 @@ void swaynag_destroy(struct swaynag *swaynag) {
} }
list_free(swaynag->buttons); list_free(swaynag->buttons);
free(swaynag->details.message); free(swaynag->details.message);
free(swaynag->details.details_text);
free(swaynag->details.button_up.text); free(swaynag->details.button_up.text);
free(swaynag->details.button_down.text); free(swaynag->details.button_down.text);
@ -541,4 +538,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
if (swaynag->shm) { if (swaynag->shm) {
wl_shm_destroy(swaynag->shm); wl_shm_destroy(swaynag->shm);
} }
if (swaynag->display) {
wl_display_disconnect(swaynag->display);
}
} }