fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 09:10:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: Use wl_fixed_t for relative motions

Browse source 
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl 2012-05-10 16:46:48 -04:00
parent 3ffaf3d79b
commit def34d026d
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/evdev.c
View file

@ -63,7 +63,7 @@ struct evdev_input_device {
struct mtdev *mtdev; struct mtdev *mtdev;
struct { struct {
int dx, dy; wl_fixed_t dx, dy;
} rel; } rel;
int type; /* event type flags */ int type; /* event type flags */
@ -196,6 +196,7 @@ evdev_process_absolute_motion_touchpad(struct evdev_input_device *device,
{ {
/* FIXME: Make this configurable somehow. */ /* FIXME: Make this configurable somehow. */
const int touchpad_speed = 700; const int touchpad_speed = 700;
int dx, dy;
switch (e->code) { switch (e->code) {
case ABS_X: case ABS_X:
@ -203,10 +204,11 @@ evdev_process_absolute_motion_touchpad(struct evdev_input_device *device,
if (device->abs.reset_x) if (device->abs.reset_x)
device->abs.reset_x = 0; device->abs.reset_x = 0;
else { else {
device->rel.dx = dx =
(e->value - device->abs.old_x) * (e->value - device->abs.old_x) *
touchpad_speed / touchpad_speed /
(device->abs.max_x - device->abs.min_x); (device->abs.max_x - device->abs.min_x);
device->rel.dx = wl_fixed_from_int(dx);
} }
device->abs.old_x = e->value; device->abs.old_x = e->value;
device->type |= EVDEV_RELATIVE_MOTION; device->type |= EVDEV_RELATIVE_MOTION;
@ -216,11 +218,12 @@ evdev_process_absolute_motion_touchpad(struct evdev_input_device *device,
if (device->abs.reset_y) if (device->abs.reset_y)
device->abs.reset_y = 0; device->abs.reset_y = 0;
else { else {
device->rel.dy = dy =
(e->value - device->abs.old_y) * (e->value - device->abs.old_y) *
touchpad_speed / touchpad_speed /
/* maybe use x size here to have the same scale? */ /* maybe use x size here to have the same scale? */
(device->abs.max_y - device->abs.min_y); (device->abs.max_y - device->abs.min_y);
device->rel.dy = wl_fixed_from_int(dy);
} }
device->abs.old_y = e->value; device->abs.old_y = e->value;
device->type |= EVDEV_RELATIVE_MOTION; device->type |= EVDEV_RELATIVE_MOTION;
@ -234,11 +237,11 @@ evdev_process_relative(struct evdev_input_device *device,
{ {
switch (e->code) { switch (e->code) {
case REL_X: case REL_X:
device->rel.dx += e->value; device->rel.dx += wl_fixed_from_int(e->value);
device->type |= EVDEV_RELATIVE_MOTION; device->type |= EVDEV_RELATIVE_MOTION;
break; break;
case REL_Y: case REL_Y:
device->rel.dy += e->value; device->rel.dy += wl_fixed_from_int(e->value);
device->type |= EVDEV_RELATIVE_MOTION; device->type |= EVDEV_RELATIVE_MOTION;
break; break;
case REL_WHEEL: case REL_WHEEL:
@ -300,8 +303,8 @@ evdev_flush_motion(struct evdev_input_device *device, uint32_t time)
if (device->type & EVDEV_RELATIVE_MOTION) { if (device->type & EVDEV_RELATIVE_MOTION) {
notify_motion(master, time, notify_motion(master, time,
master->x + wl_fixed_from_int(device->rel.dx), master->x + device->rel.dx,
master->y + wl_fixed_from_int(device->rel.dy)); master->y + device->rel.dy);
device->type &= ~EVDEV_RELATIVE_MOTION; device->type &= ~EVDEV_RELATIVE_MOTION;
device->rel.dx = 0; device->rel.dx = 0;
device->rel.dy = 0; device->rel.dy = 0;