diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-09-27 16:24:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 16:24:35 -0500 |
commit | 19f3804548a37582f65cb4279545564dad0ec0d1 (patch) | |
tree | 33519d6c5868ddfac8da284a16baaa6917b83d1c /rootston | |
parent | 5e9959daaaa86394917144c9928c734fbf533f04 (diff) | |
parent | 3e494efc5c55dbc419aa3f05e0520a97806bc9e9 (diff) |
Merge pull request #1266 from Ongy/xdc_tablet_fix
Fix tablet_tool tilt and send proximity_out
Diffstat (limited to 'rootston')
-rw-r--r-- | rootston/seat.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index e3336fde..c41c32ed 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -178,9 +178,18 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) { roots_tool->tablet_v2_tool, event->distance); } + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X) { + roots_tool->tilt_x = event->tilt_x; + } + + if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y) { + roots_tool->tilt_y = event->tilt_y; + } + if (event->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) { wlr_tablet_v2_tablet_tool_notify_tilt( - roots_tool->tablet_v2_tool, event->tilt_x, event->tilt_y); + roots_tool->tablet_v2_tool, + roots_tool->tilt_x, roots_tool->tilt_y); } if (event->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) { @@ -285,6 +294,12 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) { wl_list_init(&roots_tool->tool_link); } + if (event->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { + struct roots_tablet_tool *roots_tool = tool->data; + wlr_tablet_v2_tablet_tool_notify_proximity_out(roots_tool->tablet_v2_tool); + return; + } + handle_tablet_tool_position(cursor, event->device->data, event->tool, true, true, event->x, event->y, 0, 0); } |