diff options
-rw-r--r-- | sway/commands/input/accel_profile.c | 1 | ||||
-rw-r--r-- | sway/commands/input/click_method.c | 1 | ||||
-rw-r--r-- | sway/commands/input/drag_lock.c | 1 | ||||
-rw-r--r-- | sway/commands/input/dwt.c | 1 | ||||
-rw-r--r-- | sway/commands/input/events.c | 1 | ||||
-rw-r--r-- | sway/commands/input/left_handed.c | 1 | ||||
-rw-r--r-- | sway/commands/input/map_from_region.c | 8 | ||||
-rw-r--r-- | sway/commands/input/middle_emulation.c | 1 | ||||
-rw-r--r-- | sway/commands/input/natural_scroll.c | 1 | ||||
-rw-r--r-- | sway/commands/input/pointer_accel.c | 1 | ||||
-rw-r--r-- | sway/commands/input/repeat_delay.c | 1 | ||||
-rw-r--r-- | sway/commands/input/repeat_rate.c | 1 | ||||
-rw-r--r-- | sway/commands/input/scroll_method.c | 1 | ||||
-rw-r--r-- | sway/commands/input/tap.c | 1 |
14 files changed, 21 insertions, 0 deletions
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c index 37d6e133..a4108ec3 100644 --- a/sway/commands/input/accel_profile.c +++ b/sway/commands/input/accel_profile.c | |||
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "flat") == 0) { | 23 | } else if (strcasecmp(argv[0], "flat") == 0) { |
24 | new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT; | 24 | new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT; |
25 | } else { | 25 | } else { |
26 | free_input_config(new_config); | ||
26 | return cmd_results_new(CMD_INVALID, "accel_profile", | 27 | return cmd_results_new(CMD_INVALID, "accel_profile", |
27 | "Expected 'accel_profile <adaptive|flat>'"); | 28 | "Expected 'accel_profile <adaptive|flat>'"); |
28 | } | 29 | } |
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c index 8f1f0aa7..5d0d8cc2 100644 --- a/sway/commands/input/click_method.c +++ b/sway/commands/input/click_method.c | |||
@@ -26,6 +26,7 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) { | |||
26 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { | 26 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { |
27 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; | 27 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; |
28 | } else { | 28 | } else { |
29 | free_input_config(new_config); | ||
29 | return cmd_results_new(CMD_INVALID, "click_method", | 30 | return cmd_results_new(CMD_INVALID, "click_method", |
30 | "Expected 'click_method <none|button_areas|clickfinger'"); | 31 | "Expected 'click_method <none|button_areas|clickfinger'"); |
31 | } | 32 | } |
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c index 8273a7d4..9e32816f 100644 --- a/sway/commands/input/drag_lock.c +++ b/sway/commands/input/drag_lock.c | |||
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "disabled") == 0) { | 23 | } else if (strcasecmp(argv[0], "disabled") == 0) { |
24 | new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED; | 24 | new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED; |
25 | } else { | 25 | } else { |
26 | free_input_config(new_config); | ||
26 | return cmd_results_new(CMD_INVALID, "drag_lock", | 27 | return cmd_results_new(CMD_INVALID, "drag_lock", |
27 | "Expected 'drag_lock <enabled|disabled>'"); | 28 | "Expected 'drag_lock <enabled|disabled>'"); |
28 | } | 29 | } |
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c index 995a2f47..73937507 100644 --- a/sway/commands/input/dwt.c +++ b/sway/commands/input/dwt.c | |||
@@ -22,6 +22,7 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) { | |||
22 | } else if (strcasecmp(argv[0], "disabled") == 0) { | 22 | } else if (strcasecmp(argv[0], "disabled") == 0) { |
23 | new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED; | 23 | new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED; |
24 | } else { | 24 | } else { |
25 | free_input_config(new_config); | ||
25 | return cmd_results_new(CMD_INVALID, "dwt", | 26 | return cmd_results_new(CMD_INVALID, "dwt", |
26 | "Expected 'dwt <enabled|disabled>'"); | 27 | "Expected 'dwt <enabled|disabled>'"); |
27 | } | 28 | } |
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index 2217f5ce..e2ccdc94 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c | |||
@@ -29,6 +29,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { | |||
29 | new_config->send_events = | 29 | new_config->send_events = |
30 | LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; | 30 | LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; |
31 | } else { | 31 | } else { |
32 | free_input_config(new_config); | ||
32 | return cmd_results_new(CMD_INVALID, "events", | 33 | return cmd_results_new(CMD_INVALID, "events", |
33 | "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); | 34 | "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); |
34 | } | 35 | } |
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c index 94b8e03e..769ce98c 100644 --- a/sway/commands/input/left_handed.c +++ b/sway/commands/input/left_handed.c | |||
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "disabled") == 0) { | 23 | } else if (strcasecmp(argv[0], "disabled") == 0) { |
24 | new_config->left_handed = 0; | 24 | new_config->left_handed = 0; |
25 | } else { | 25 | } else { |
26 | free_input_config(new_config); | ||
26 | return cmd_results_new(CMD_INVALID, "left_handed", | 27 | return cmd_results_new(CMD_INVALID, "left_handed", |
27 | "Expected 'left_handed <enabled|disabled>'"); | 28 | "Expected 'left_handed <enabled|disabled>'"); |
28 | } | 29 | } |
diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c index 80bb856d..40f04214 100644 --- a/sway/commands/input/map_from_region.c +++ b/sway/commands/input/map_from_region.c | |||
@@ -54,20 +54,28 @@ struct cmd_results *input_cmd_map_from_region(int argc, char **argv) { | |||
54 | bool mm1, mm2; | 54 | bool mm1, mm2; |
55 | if (!parse_coords(argv[0], &new_config->mapped_from_region->x1, | 55 | if (!parse_coords(argv[0], &new_config->mapped_from_region->x1, |
56 | &new_config->mapped_from_region->y1, &mm1)) { | 56 | &new_config->mapped_from_region->y1, &mm1)) { |
57 | free(new_config->mapped_from_region); | ||
58 | free_input_config(new_config); | ||
57 | return cmd_results_new(CMD_FAILURE, "map_from_region", | 59 | return cmd_results_new(CMD_FAILURE, "map_from_region", |
58 | "Invalid top-left coordinates"); | 60 | "Invalid top-left coordinates"); |
59 | } | 61 | } |
60 | if (!parse_coords(argv[1], &new_config->mapped_from_region->x2, | 62 | if (!parse_coords(argv[1], &new_config->mapped_from_region->x2, |
61 | &new_config->mapped_from_region->y2, &mm2)) { | 63 | &new_config->mapped_from_region->y2, &mm2)) { |
64 | free(new_config->mapped_from_region); | ||
65 | free_input_config(new_config); | ||
62 | return cmd_results_new(CMD_FAILURE, "map_from_region", | 66 | return cmd_results_new(CMD_FAILURE, "map_from_region", |
63 | "Invalid bottom-right coordinates"); | 67 | "Invalid bottom-right coordinates"); |
64 | } | 68 | } |
65 | if (new_config->mapped_from_region->x1 > new_config->mapped_from_region->x2 || | 69 | if (new_config->mapped_from_region->x1 > new_config->mapped_from_region->x2 || |
66 | new_config->mapped_from_region->y1 > new_config->mapped_from_region->y2) { | 70 | new_config->mapped_from_region->y1 > new_config->mapped_from_region->y2) { |
71 | free(new_config->mapped_from_region); | ||
72 | free_input_config(new_config); | ||
67 | return cmd_results_new(CMD_FAILURE, "map_from_region", | 73 | return cmd_results_new(CMD_FAILURE, "map_from_region", |
68 | "Invalid rectangle"); | 74 | "Invalid rectangle"); |
69 | } | 75 | } |
70 | if (mm1 != mm2) { | 76 | if (mm1 != mm2) { |
77 | free(new_config->mapped_from_region); | ||
78 | free_input_config(new_config); | ||
71 | return cmd_results_new(CMD_FAILURE, "map_from_region", | 79 | return cmd_results_new(CMD_FAILURE, "map_from_region", |
72 | "Both coordinates must be in the same unit"); | 80 | "Both coordinates must be in the same unit"); |
73 | } | 81 | } |
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c index a551fd51..7ca01629 100644 --- a/sway/commands/input/middle_emulation.c +++ b/sway/commands/input/middle_emulation.c | |||
@@ -24,6 +24,7 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) { | |||
24 | new_config->middle_emulation = | 24 | new_config->middle_emulation = |
25 | LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED; | 25 | LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED; |
26 | } else { | 26 | } else { |
27 | free_input_config(new_config); | ||
27 | return cmd_results_new(CMD_INVALID, "middle_emulation", | 28 | return cmd_results_new(CMD_INVALID, "middle_emulation", |
28 | "Expected 'middle_emulation <enabled|disabled>'"); | 29 | "Expected 'middle_emulation <enabled|disabled>'"); |
29 | } | 30 | } |
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c index c4e19b78..55236790 100644 --- a/sway/commands/input/natural_scroll.c +++ b/sway/commands/input/natural_scroll.c | |||
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "disabled") == 0) { | 23 | } else if (strcasecmp(argv[0], "disabled") == 0) { |
24 | new_config->natural_scroll = 0; | 24 | new_config->natural_scroll = 0; |
25 | } else { | 25 | } else { |
26 | free_input_config(new_config); | ||
26 | return cmd_results_new(CMD_INVALID, "natural_scroll", | 27 | return cmd_results_new(CMD_INVALID, "natural_scroll", |
27 | "Expected 'natural_scroll <enabled|disabled>'"); | 28 | "Expected 'natural_scroll <enabled|disabled>'"); |
28 | } | 29 | } |
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c index 171063aa..8bbd0724 100644 --- a/sway/commands/input/pointer_accel.c +++ b/sway/commands/input/pointer_accel.c | |||
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) { | |||
20 | 20 | ||
21 | float pointer_accel = atof(argv[0]); | 21 | float pointer_accel = atof(argv[0]); |
22 | if (pointer_accel < -1 || pointer_accel > 1) { | 22 | if (pointer_accel < -1 || pointer_accel > 1) { |
23 | free_input_config(new_config); | ||
23 | return cmd_results_new(CMD_INVALID, "pointer_accel", | 24 | return cmd_results_new(CMD_INVALID, "pointer_accel", |
24 | "Input out of range [-1, 1]"); | 25 | "Input out of range [-1, 1]"); |
25 | } | 26 | } |
diff --git a/sway/commands/input/repeat_delay.c b/sway/commands/input/repeat_delay.c index ce265841..c9ddbf0e 100644 --- a/sway/commands/input/repeat_delay.c +++ b/sway/commands/input/repeat_delay.c | |||
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) { | |||
20 | 20 | ||
21 | int repeat_delay = atoi(argv[0]); | 21 | int repeat_delay = atoi(argv[0]); |
22 | if (repeat_delay < 0) { | 22 | if (repeat_delay < 0) { |
23 | free_input_config(new_config); | ||
23 | return cmd_results_new(CMD_INVALID, "repeat_delay", | 24 | return cmd_results_new(CMD_INVALID, "repeat_delay", |
24 | "Repeat delay cannot be negative"); | 25 | "Repeat delay cannot be negative"); |
25 | } | 26 | } |
diff --git a/sway/commands/input/repeat_rate.c b/sway/commands/input/repeat_rate.c index f2ea2e69..56878176 100644 --- a/sway/commands/input/repeat_rate.c +++ b/sway/commands/input/repeat_rate.c | |||
@@ -20,6 +20,7 @@ struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) { | |||
20 | 20 | ||
21 | int repeat_rate = atoi(argv[0]); | 21 | int repeat_rate = atoi(argv[0]); |
22 | if (repeat_rate < 0) { | 22 | if (repeat_rate < 0) { |
23 | free_input_config(new_config); | ||
23 | return cmd_results_new(CMD_INVALID, "repeat_rate", | 24 | return cmd_results_new(CMD_INVALID, "repeat_rate", |
24 | "Repeat rate cannot be negative"); | 25 | "Repeat rate cannot be negative"); |
25 | } | 26 | } |
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c index 0a1c57ac..4c6ac6b6 100644 --- a/sway/commands/input/scroll_method.c +++ b/sway/commands/input/scroll_method.c | |||
@@ -27,6 +27,7 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) { | |||
27 | } else if (strcasecmp(argv[0], "on_button_down") == 0) { | 27 | } else if (strcasecmp(argv[0], "on_button_down") == 0) { |
28 | new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; | 28 | new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; |
29 | } else { | 29 | } else { |
30 | free_input_config(new_config); | ||
30 | return cmd_results_new(CMD_INVALID, "scroll_method", | 31 | return cmd_results_new(CMD_INVALID, "scroll_method", |
31 | "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); | 32 | "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); |
32 | } | 33 | } |
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c index e7f03058..7d027d5d 100644 --- a/sway/commands/input/tap.c +++ b/sway/commands/input/tap.c | |||
@@ -23,6 +23,7 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "disabled") == 0) { | 23 | } else if (strcasecmp(argv[0], "disabled") == 0) { |
24 | new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED; | 24 | new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED; |
25 | } else { | 25 | } else { |
26 | free_input_config(new_config); | ||
26 | return cmd_results_new(CMD_INVALID, "tap", | 27 | return cmd_results_new(CMD_INVALID, "tap", |
27 | "Expected 'tap <enabled|disabled>'"); | 28 | "Expected 'tap <enabled|disabled>'"); |
28 | } | 29 | } |