mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-25 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/tablet: add tool_mode option to set tablet tools as relative input

Browse source 
Closes #4139.
This commit is contained in:
Tudor Brindus 2020-06-19 14:11:57 -04:00 • committed by Simon Ser
parent 136add4e12
commit ed247c031c
10 changed files with 149 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/config/input.c
View file

@ -40,6 +40,7 @@ struct input_config *new_input_config(const char* identifier) {
input->xkb_numlock = INT_MIN;
input->xkb_capslock = INT_MIN;
input->xkb_file_is_set = false;
input->tools = create_list();
return input;
}
@ -153,6 +154,22 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
memcpy(dst->calibration_matrix.matrix, src->calibration_matrix.matrix,
sizeof(src->calibration_matrix.matrix));
}
for (int i = 0; i < src->tools->length; i++) {
struct input_config_tool *src_tool = src->tools->items[i];
for (int j = 0; j < dst->tools->length; j++) {
struct input_config_tool *dst_tool = dst->tools->items[j];
if (src_tool->type == dst_tool->type) {
dst_tool->mode = src_tool->mode;
goto tool_merge_outer;
}
}
struct input_config_tool *dst_tool = malloc(sizeof(*dst_tool));
memcpy(dst_tool, src_tool, sizeof(*dst_tool));
list_add(dst->tools, dst_tool);
tool_merge_outer:;
}
}
static bool validate_xkb_merge(struct input_config *dest,
@ -358,6 +375,7 @@ void free_input_config(struct input_config *ic) {
free(ic->mapped_from_region);
free(ic->mapped_to_output);
free(ic->mapped_to_region);
list_free_items_and_destroy(ic->tools);
free(ic);
}