summaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/bar.c1
-rw-r--r--sway/config/input.c4
-rw-r--r--sway/config/output.c1
3 files changed, 6 insertions, 0 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 94405a92..7009d0a0 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -46,6 +46,7 @@ void free_bar_config(struct bar_config *bar) {
46 free(bar->position); 46 free(bar->position);
47 free(bar->hidden_state); 47 free(bar->hidden_state);
48 free(bar->status_command); 48 free(bar->status_command);
49 free(bar->swaybar_command);
49 free(bar->font); 50 free(bar->font);
50 free(bar->separator_symbol); 51 free(bar->separator_symbol);
51 for (int i = 0; i < bar->bindings->length; i++) { 52 for (int i = 0; i < bar->bindings->length; i++) {
diff --git a/sway/config/input.c b/sway/config/input.c
index 794d5194..d5d2d90b 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -29,6 +29,7 @@ struct input_config *new_input_config(const char* identifier) {
29 input->natural_scroll = INT_MIN; 29 input->natural_scroll = INT_MIN;
30 input->accel_profile = INT_MIN; 30 input->accel_profile = INT_MIN;
31 input->pointer_accel = FLT_MIN; 31 input->pointer_accel = FLT_MIN;
32 input->scroll_factor = FLT_MIN;
32 input->scroll_button = INT_MIN; 33 input->scroll_button = INT_MIN;
33 input->scroll_method = INT_MIN; 34 input->scroll_method = INT_MIN;
34 input->left_handed = INT_MIN; 35 input->left_handed = INT_MIN;
@@ -68,6 +69,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
68 if (src->pointer_accel != FLT_MIN) { 69 if (src->pointer_accel != FLT_MIN) {
69 dst->pointer_accel = src->pointer_accel; 70 dst->pointer_accel = src->pointer_accel;
70 } 71 }
72 if (src->scroll_factor != FLT_MIN) {
73 dst->scroll_factor = src->scroll_factor;
74 }
71 if (src->repeat_delay != INT_MIN) { 75 if (src->repeat_delay != INT_MIN) {
72 dst->repeat_delay = src->repeat_delay; 76 dst->repeat_delay = src->repeat_delay;
73 } 77 }
diff --git a/sway/config/output.c b/sway/config/output.c
index 2b041353..07543e3c 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -326,6 +326,7 @@ void free_output_config(struct output_config *oc) {
326 free(oc->name); 326 free(oc->name);
327 free(oc->background); 327 free(oc->background);
328 free(oc->background_option); 328 free(oc->background_option);
329 free(oc->background_fallback);
329 free(oc); 330 free(oc);
330} 331}
331 332