XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-25 10:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop the pEvdev->delta array

Browse Source 
Now that relative events have their own valuator mask, use it instead of
delta

Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Éric Brunet
2014-09-30 20:49:46 +02:00
committed by Peter Hutterer
parent e0e2587a95
commit 593bbc6390
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/evdev.c
View File

@@ -434,7 +434,8 @@ static void
EvdevProcessValuators(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
int *delta = pEvdev->delta;
int deltaX = 0, deltaY = 0;
if (pEvdev->abs_queued) {
/* convert to relative motion for touchpads */
@@ -443,7 +444,7 @@ EvdevProcessValuators(InputInfoPtr pInfo)
if (valuator_mask_isset(pEvdev->abs_vals, 0))
{
if (valuator_mask_isset(pEvdev->old_vals, 0))
delta[REL_X] = valuator_mask_get(pEvdev->abs_vals, 0) -
deltaX = valuator_mask_get(pEvdev->abs_vals, 0) -
valuator_mask_get(pEvdev->old_vals, 0);
valuator_mask_set(pEvdev->old_vals, 0,
valuator_mask_get(pEvdev->abs_vals, 0));
@@ -451,7 +452,7 @@ EvdevProcessValuators(InputInfoPtr pInfo)
if (valuator_mask_isset(pEvdev->abs_vals, 1))
{
if (valuator_mask_isset(pEvdev->old_vals, 1))
delta[REL_Y] = valuator_mask_get(pEvdev->abs_vals, 1) -
deltaY = valuator_mask_get(pEvdev->abs_vals, 1) -
valuator_mask_get(pEvdev->old_vals, 1);
valuator_mask_set(pEvdev->old_vals, 1,
valuator_mask_get(pEvdev->abs_vals, 1));
@@ -471,35 +472,40 @@ EvdevProcessValuators(InputInfoPtr pInfo)
}
}
/* Apply transformations on relative coordinates */
if (pEvdev->rel_queued) {
int tmp;
int i;
/* deltaX and deltaY may be non-zero if they got computed
* because EVDEV_RELATIVE_MODE, but then we don't expect
* pEvdev->rel_vals also to be set...
*/
if (valuator_mask_isset(pEvdev->rel_vals, REL_X))
deltaX = valuator_mask_get(pEvdev->rel_vals, REL_X);
if (valuator_mask_isset(pEvdev->rel_vals, REL_Y))
deltaY = valuator_mask_get(pEvdev->rel_vals, REL_Y);
if (pEvdev->swap_axes) {
tmp = pEvdev->delta[REL_X];
pEvdev->delta[REL_X] = pEvdev->delta[REL_Y];
pEvdev->delta[REL_Y] = tmp;
if (pEvdev->delta[REL_X] == 0)
valuator_mask_unset(pEvdev->rel_vals, REL_X);
if (pEvdev->delta[REL_Y] == 0)
valuator_mask_unset(pEvdev->rel_vals, REL_Y);
int tmp = deltaX;
deltaX = deltaY;
deltaY = tmp;
}
if (pEvdev->invert_x)
pEvdev->delta[REL_X] *= -1;
deltaX *= -1;
if (pEvdev->invert_y)
pEvdev->delta[REL_Y] *= -1;
deltaY *= -1;
if (deltaX)
valuator_mask_set(pEvdev->rel_vals, REL_X, deltaX);
else
valuator_mask_unset(pEvdev->rel_vals, REL_X);
Evdev3BEmuProcessRelMotion(pInfo,
pEvdev->delta[REL_X],
pEvdev->delta[REL_Y]);
if (deltaY)
valuator_mask_set(pEvdev->rel_vals, REL_Y, deltaY);
else
valuator_mask_unset(pEvdev->rel_vals, REL_Y);
Evdev3BEmuProcessRelMotion(pInfo, deltaX, deltaY);
for (i = 0; i < REL_CNT; i++)
{
int map = pEvdev->rel_axis_map[i];
if (pEvdev->delta[i] && map != -1)
valuator_mask_set(pEvdev->rel_vals, map, pEvdev->delta[i]);
}
}
/*
* Some devices only generate valid abs coords when BTN_TOOL_PEN is
@@ -668,8 +674,11 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
return;
pEvdev->rel_queued = 1;
pEvdev->delta[ev->code] += value;
map = pEvdev->rel_axis_map[ev->code];
if (valuator_mask_isset(pEvdev->rel_vals, map))
value += valuator_mask_get(pEvdev->rel_vals, map);
valuator_mask_set(pEvdev->rel_vals, map, value);
break;
}
@@ -983,7 +992,6 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
EvdevPostQueuedEvents(pInfo);
EvdevPostProximityEvents(pInfo, FALSE);
memset(pEvdev->delta, 0, sizeof(pEvdev->delta));
for (i = 0; i < ArrayLength(pEvdev->queue); i++)
{
EventQueuePtr queue = &pEvdev->queue[i];

1
src/evdev.h
View File

@@ -184,7 +184,6 @@ typedef struct {
BOOL invert_x;
BOOL invert_y;
int delta[REL_CNT];
unsigned int abs_queued, rel_queued, prox_queued;
/* Middle mouse button emulation */