mirror of
https://github.com/NickHu/sway
synced 2024-12-27 21:58:11 +01:00
3dd2f4a67f
When using the `map_from_region` for pen tables, we will usually make
the available area as big as possible while maintaining the proportions
with the screen.
As most of the tablets uses a 16:10 ratios while the most popular screen
ratios is still 16:9, the argument for most people should be `0x0 1x0.9`
to have the maximum effective area.
However, the argument above won't work because the current code will
treat `0x...` as a hexadecimal number, instead of setting both `x` and
`y` to `0`.
This fix allows the use of the following syntax:
```
input type:tablet_tool {
map_from_region 0x0 1x0.9
}
```
87 lines
2.2 KiB
C
87 lines
2.2 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include "log.h"
|
|
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/input/input-manager.h"
|
|
|
|
static bool parse_coords(const char *str, double *x, double *y, bool *mm) {
|
|
*mm = false;
|
|
|
|
char *end;
|
|
|
|
// Check for "0x" prefix to avoid strtod treating the string as hex
|
|
if (str[0] == '0' && str[1] == 'x') {
|
|
if (strlen(str) < 3) {
|
|
return false;
|
|
}
|
|
*x = 0;
|
|
end = (char *)str + 2;
|
|
} else {
|
|
*x = strtod(str, &end);
|
|
if (end[0] != 'x') {
|
|
return false;
|
|
}
|
|
++end;
|
|
}
|
|
|
|
*y = strtod(end, &end);
|
|
if (end[0] == 'm') {
|
|
// Expect mm
|
|
if (end[1] != 'm') {
|
|
return false;
|
|
}
|
|
*mm = true;
|
|
end = &end[2];
|
|
}
|
|
if (end[0] != '\0') {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
struct cmd_results *input_cmd_map_from_region(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "map_from_region", EXPECTED_EQUAL_TO, 2))) {
|
|
return error;
|
|
}
|
|
struct input_config *ic = config->handler_context.input_config;
|
|
if (!ic) {
|
|
return cmd_results_new(CMD_FAILURE, "No input device defined");
|
|
}
|
|
|
|
ic->mapped_from_region =
|
|
calloc(1, sizeof(struct input_config_mapped_from_region));
|
|
|
|
bool mm1, mm2;
|
|
if (!parse_coords(argv[0], &ic->mapped_from_region->x1,
|
|
&ic->mapped_from_region->y1, &mm1)) {
|
|
free(ic->mapped_from_region);
|
|
ic->mapped_from_region = NULL;
|
|
return cmd_results_new(CMD_FAILURE, "Invalid top-left coordinates");
|
|
}
|
|
if (!parse_coords(argv[1], &ic->mapped_from_region->x2,
|
|
&ic->mapped_from_region->y2, &mm2)) {
|
|
free(ic->mapped_from_region);
|
|
ic->mapped_from_region = NULL;
|
|
return cmd_results_new(CMD_FAILURE, "Invalid bottom-right coordinates");
|
|
}
|
|
if (ic->mapped_from_region->x1 > ic->mapped_from_region->x2 ||
|
|
ic->mapped_from_region->y1 > ic->mapped_from_region->y2) {
|
|
free(ic->mapped_from_region);
|
|
ic->mapped_from_region = NULL;
|
|
return cmd_results_new(CMD_FAILURE, "Invalid rectangle");
|
|
}
|
|
if (mm1 != mm2) {
|
|
free(ic->mapped_from_region);
|
|
ic->mapped_from_region = NULL;
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Both coordinates must be in the same unit");
|
|
}
|
|
ic->mapped_from_region->mm = mm1;
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|