mirror of
https://github.com/swaywm/sway.git
synced 2025-11-17 06:59:48 -05:00
Implement support for input wildcard
This commit is contained in:
parent
4a4f07ac25
commit
baeb28ea62
29 changed files with 183 additions and 266 deletions
|
|
@ -38,50 +38,44 @@ struct cmd_results *input_cmd_map_from_region(int argc, char **argv) {
|
|||
if ((error = checkarg(argc, "map_from_region", EXPECTED_EQUAL_TO, 2))) {
|
||||
return error;
|
||||
}
|
||||
struct input_config *current_input_config =
|
||||
config->handler_context.input_config;
|
||||
if (!current_input_config) {
|
||||
struct input_config *ic = config->handler_context.input_config;
|
||||
if (!ic) {
|
||||
return cmd_results_new(CMD_FAILURE, "map_from_region",
|
||||
"No input device defined");
|
||||
}
|
||||
|
||||
struct input_config *new_config =
|
||||
new_input_config(current_input_config->identifier);
|
||||
|
||||
new_config->mapped_from_region =
|
||||
ic->mapped_from_region =
|
||||
calloc(1, sizeof(struct input_config_mapped_from_region));
|
||||
|
||||
bool mm1, mm2;
|
||||
if (!parse_coords(argv[0], &new_config->mapped_from_region->x1,
|
||||
&new_config->mapped_from_region->y1, &mm1)) {
|
||||
free(new_config->mapped_from_region);
|
||||
free_input_config(new_config);
|
||||
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, "map_from_region",
|
||||
"Invalid top-left coordinates");
|
||||
}
|
||||
if (!parse_coords(argv[1], &new_config->mapped_from_region->x2,
|
||||
&new_config->mapped_from_region->y2, &mm2)) {
|
||||
free(new_config->mapped_from_region);
|
||||
free_input_config(new_config);
|
||||
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, "map_from_region",
|
||||
"Invalid bottom-right coordinates");
|
||||
}
|
||||
if (new_config->mapped_from_region->x1 > new_config->mapped_from_region->x2 ||
|
||||
new_config->mapped_from_region->y1 > new_config->mapped_from_region->y2) {
|
||||
free(new_config->mapped_from_region);
|
||||
free_input_config(new_config);
|
||||
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, "map_from_region",
|
||||
"Invalid rectangle");
|
||||
}
|
||||
if (mm1 != mm2) {
|
||||
free(new_config->mapped_from_region);
|
||||
free_input_config(new_config);
|
||||
free(ic->mapped_from_region);
|
||||
ic->mapped_from_region = NULL;
|
||||
return cmd_results_new(CMD_FAILURE, "map_from_region",
|
||||
"Both coordinates must be in the same unit");
|
||||
}
|
||||
new_config->mapped_from_region->mm = mm1;
|
||||
|
||||
apply_input_config(new_config);
|
||||
ic->mapped_from_region->mm = mm1;
|
||||
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue