diff options
author | 2019-06-22 14:54:55 +0200 | |
---|---|---|
committer | 2019-07-05 18:41:56 +0300 | |
commit | c9cb5ced7f7597afeb73fd5b661a98462f170d11 (patch) | |
tree | cf2bc4d47657f680571375d12e5d02a0387f641c /sway | |
parent | calibration_matrix: add the current matrix to the IPC description for libinpu... (diff) | |
download | sway-c9cb5ced7f7597afeb73fd5b661a98462f170d11.tar.gz sway-c9cb5ced7f7597afeb73fd5b661a98462f170d11.tar.zst sway-c9cb5ced7f7597afeb73fd5b661a98462f170d11.zip |
calibration_matrix: expect 6 individual values
Example usage from command line:
swaymsg input type:touch calibration_matrix -- -1 0 1 0 -1 1
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/input/calibration_matrix.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sway/commands/input/calibration_matrix.c b/sway/commands/input/calibration_matrix.c index 9ac2bd7f..38749fbb 100644 --- a/sway/commands/input/calibration_matrix.c +++ b/sway/commands/input/calibration_matrix.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) { | 11 | struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) { |
12 | struct cmd_results *error = NULL; | 12 | struct cmd_results *error = NULL; |
13 | if ((error = checkarg(argc, "calibration_matrix", EXPECTED_EQUAL_TO, 1))) { | 13 | if ((error = checkarg(argc, "calibration_matrix", EXPECTED_EQUAL_TO, 6))) { |
14 | return error; | 14 | return error; |
15 | } | 15 | } |
16 | struct input_config *ic = config->handler_context.input_config; | 16 | struct input_config *ic = config->handler_context.input_config; |
@@ -18,14 +18,9 @@ struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) { | |||
18 | return cmd_results_new(CMD_FAILURE, "No input device defined."); | 18 | return cmd_results_new(CMD_FAILURE, "No input device defined."); |
19 | } | 19 | } |
20 | 20 | ||
21 | list_t *split = split_string(argv[0], " "); | ||
22 | if (split->length != 6) { | ||
23 | return cmd_results_new(CMD_FAILURE, "calibration_matrix should be a space-separated list of length 6"); | ||
24 | } | ||
25 | |||
26 | float parsed[6]; | 21 | float parsed[6]; |
27 | for (int i = 0; i < split->length; ++i) { | 22 | for (int i = 0; i < argc; ++i) { |
28 | char *item = split->items[i]; | 23 | char *item = argv[i]; |
29 | float x = parse_float(item); | 24 | float x = parse_float(item); |
30 | if (isnan(x)) { | 25 | if (isnan(x)) { |
31 | return cmd_results_new(CMD_FAILURE, "calibration_matrix: unable to parse float: %s", item); | 26 | return cmd_results_new(CMD_FAILURE, "calibration_matrix: unable to parse float: %s", item); |