mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: Use weston_output_transform_coordinate for evdev touch screens

Browse Source
dev
Kristian Høgsberg 11 years ago
parent 98c774f1c0
commit 97e806f138
1 changed files with 19 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 34
      src/evdev.c

34
src/evdev.c
Unescape View File

@ -112,15 +112,13 @@ evdev_process_touch(struct evdev_device *device, struct input_event *e)
case ABS_MT_POSITION_X: case ABS_MT_POSITION_X:
device->mt.x[device->mt.slot] = device->mt.x[device->mt.slot] =
(e->value - device->abs.min_x) * screen_width / (e->value - device->abs.min_x) * screen_width /
(device->abs.max_x - device->abs.min_x) + (device->abs.max_x - device->abs.min_x);
device->output->x;
device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION; device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break; break;
case ABS_MT_POSITION_Y: case ABS_MT_POSITION_Y:
device->mt.y[device->mt.slot] = device->mt.y[device->mt.slot] =
(e->value - device->abs.min_y) * screen_height / (e->value - device->abs.min_y) * screen_height /
(device->abs.max_y - device->abs.min_y) + (device->abs.max_y - device->abs.min_y);
device->output->y;
device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION; device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break; break;
} }
@ -250,10 +248,13 @@ static void
evdev_flush_motion(struct evdev_device *device, uint32_t time) evdev_flush_motion(struct evdev_device *device, uint32_t time)
{ {
struct weston_seat *master = device->seat; struct weston_seat *master = device->seat;
wl_fixed_t x, y;
int slot;
if (!(device->pending_events & EVDEV_SYN)) if (!(device->pending_events & EVDEV_SYN))
return; return;
slot = device->mt.slot;
device->pending_events &= ~EVDEV_SYN; device->pending_events &= ~EVDEV_SYN;
if (device->pending_events & EVDEV_RELATIVE_MOTION) { if (device->pending_events & EVDEV_RELATIVE_MOTION) {
notify_motion(master, time, device->rel.dx, device->rel.dy); notify_motion(master, time, device->rel.dx, device->rel.dy);
@ -262,20 +263,22 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
device->rel.dy = 0; device->rel.dy = 0;
} }
if (device->pending_events & EVDEV_ABSOLUTE_MT_DOWN) { if (device->pending_events & EVDEV_ABSOLUTE_MT_DOWN) {
weston_output_transform_coordinate(device->output,
device->mt.x[slot],
device->mt.y[slot],
&x, &y);
notify_touch(master, time, notify_touch(master, time,
device->mt.slot, device->mt.slot, x, y, WL_TOUCH_DOWN);
wl_fixed_from_int(device->mt.x[device->mt.slot]),
wl_fixed_from_int(device->mt.y[device->mt.slot]),
WL_TOUCH_DOWN);
device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN; device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION; device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
} }
if (device->pending_events & EVDEV_ABSOLUTE_MT_MOTION) { if (device->pending_events & EVDEV_ABSOLUTE_MT_MOTION) {
weston_output_transform_coordinate(device->output,
device->mt.x[slot],
device->mt.y[slot],
&x, &y);
notify_touch(master, time, notify_touch(master, time,
device->mt.slot, device->mt.slot, x, y, WL_TOUCH_MOTION);
wl_fixed_from_int(device->mt.x[device->mt.slot]),
wl_fixed_from_int(device->mt.y[device->mt.slot]),
WL_TOUCH_MOTION);
device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN; device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION; device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
} }
@ -286,9 +289,10 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
} }
if (device->pending_events & EVDEV_ABSOLUTE_MOTION) { if (device->pending_events & EVDEV_ABSOLUTE_MOTION) {
transform_absolute(device); transform_absolute(device);
notify_motion_absolute(master, time, weston_output_transform_coordinate(device->output,
wl_fixed_from_int(device->abs.x), device->abs.x,
wl_fixed_from_int(device->abs.y)); device->abs.y, &x, &y);
notify_motion_absolute(master, time, x, y);
device->pending_events &= ~EVDEV_ABSOLUTE_MOTION; device->pending_events &= ~EVDEV_ABSOLUTE_MOTION;
} }
} }

Write Preview
Loading…
Cancel
Save