mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-17 08:56:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

types/wlr_touch: add base wlr_input_device

Browse source 
wlr_touch now owns its wlr_input_device. It will be initialized when the
tablet tool is initialized, and finished when the touch is destroyed.
This commit is contained in:
Simon Zeni 2022-02-01 11:51:50 -05:00 • committed by Kirill Primak
parent 7dfee50350
commit edfb332b24
8 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/x11/input_device.c
View file

@ -72,7 +72,7 @@ static void send_pointer_position_event(struct wlr_x11_output *output,
static void send_touch_down_event(struct wlr_x11_output *output,
int16_t x, int16_t y, int32_t touch_id, xcb_timestamp_t time) {
struct wlr_event_touch_down ev = {
.device = &output->touch_dev,
.device = &output->touch.base,
.time_msec = time,
.x = (double)x / output->wlr_output.width,
.y = (double)y / output->wlr_output.height,
@ -85,7 +85,7 @@ static void send_touch_down_event(struct wlr_x11_output *output,
static void send_touch_motion_event(struct wlr_x11_output *output,
int16_t x, int16_t y, int32_t touch_id, xcb_timestamp_t time) {
struct wlr_event_touch_motion ev = {
.device = &output->touch_dev,
.device = &output->touch.base,
.time_msec = time,
.x = (double)x / output->wlr_output.width,
.y = (double)y / output->wlr_output.height,
@ -98,7 +98,7 @@ static void send_touch_motion_event(struct wlr_x11_output *output,
static void send_touch_up_event(struct wlr_x11_output *output,
int32_t touch_id, xcb_timestamp_t time) {
struct wlr_event_touch_up ev = {
.device = &output->touch_dev,
.device = &output->touch.base,
.time_msec = time,
.touch_id = touch_id,
};
@ -341,6 +341,8 @@ bool wlr_input_device_is_x11(struct wlr_input_device *wlr_dev) {
return wlr_dev->keyboard->impl == &keyboard_impl;
case WLR_INPUT_DEVICE_POINTER:
return wlr_dev->pointer->impl == &pointer_impl;
case WLR_INPUT_DEVICE_TOUCH:
return wlr_dev->touch->impl == &touch_impl;
default:
return wlr_dev->impl == &input_device_impl;
}