mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-21 05:33:56 -04: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

12
sway/input/cursor.c
View file

@ -567,14 +567,14 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
ic->mapped_from_region, &x, &y);
}
switch (tool->tablet_v2_tool->wlr_tool->type) {
case WLR_TABLET_TOOL_TYPE_LENS:
case WLR_TABLET_TOOL_TYPE_MOUSE:
wlr_cursor_move(cursor->cursor, input_device->wlr_device, dx, dy);
break;
default:
switch (tool->mode) {
case SWAY_TABLET_TOOL_MODE_ABSOLUTE:
wlr_cursor_warp_absolute(cursor->cursor, input_device->wlr_device,
change_x ? x : NAN, change_y ? y : NAN);
break;
case SWAY_TABLET_TOOL_MODE_RELATIVE:
wlr_cursor_move(cursor->cursor, input_device->wlr_device, dx, dy);
break;
}
double sx, sy;

23
sway/input/tablet.c
View file

@ -140,6 +140,29 @@ void sway_tablet_tool_configure(struct sway_tablet *tablet,
return;
}
switch (wlr_tool->type) {
case WLR_TABLET_TOOL_TYPE_LENS:
case WLR_TABLET_TOOL_TYPE_MOUSE:
tool->mode = SWAY_TABLET_TOOL_MODE_RELATIVE;
break;
default:
tool->mode = SWAY_TABLET_TOOL_MODE_ABSOLUTE;
struct input_config *ic = input_device_get_config(
tablet->seat_device->input_device);
if (!ic) {
break;
}
for (int i = 0; i < ic->tools->length; i++) {
struct input_config_tool *tool_config = ic->tools->items[i];
if (tool_config->type == wlr_tool->type) {
tool->mode = tool_config->mode;
break;
}
}
}
tool->seat = tablet->seat_device->sway_seat;
tool->tablet = tablet;
tool->tablet_v2_tool =