alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

calibration_matrix: expect 6 individual values

Browse source 
Example usage from command line:

    swaymsg input type:touch calibration_matrix -- -1 0 1 0 -1 1
This commit is contained in:
Sergei Dolgov 2019-06-22 14:54:55 +02:00 committed by Simon Ser
parent a5c6816095
commit c9cb5ced7f
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/commands/input/calibration_matrix.c
View file

@ -10,7 +10,7 @@
struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) { struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "calibration_matrix", EXPECTED_EQUAL_TO, 1))) { if ((error = checkarg(argc, "calibration_matrix", EXPECTED_EQUAL_TO, 6))) {
return error; return error;
} }
struct input_config *ic = config->handler_context.input_config; struct input_config *ic = config->handler_context.input_config;
@ -18,14 +18,9 @@ struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "No input device defined."); return cmd_results_new(CMD_FAILURE, "No input device defined.");
} }
list_t *split = split_string(argv[0], " ");
if (split->length != 6) {
return cmd_results_new(CMD_FAILURE, "calibration_matrix should be a space-separated list of length 6");
}
float parsed[6]; float parsed[6];
for (int i = 0; i < split->length; ++i) { for (int i = 0; i < argc; ++i) {
char *item = split->items[i]; char *item = argv[i];
float x = parse_float(item); float x = parse_float(item);
if (isnan(x)) { if (isnan(x)) {
return cmd_results_new(CMD_FAILURE, "calibration_matrix: unable to parse float: %s", item); return cmd_results_new(CMD_FAILURE, "calibration_matrix: unable to parse float: %s", item);