XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-14 11:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move valuator swapping into a helper function

Browse Source 
No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2013-01-14 14:07:26 +10:00
parent 3b7ba39fca
commit 069c035ab0
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/evdev.c
View File

@@ -418,6 +418,36 @@ EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count)
}
}
static void
EvdevSwapAbsValuators(EvdevPtr pEvdev, ValuatorMask *mask)
{
int i;
int swapped_isset[2] = {0, 0};
int swapped_values[2];
if (!pEvdev->swap_axes)
return;
for(i = 0; i <= 1; i++) {
if (valuator_mask_isset(mask, i)) {
swapped_isset[1 - i] = 1;
swapped_values[1 - i] =
xf86ScaleAxis(valuator_mask_get(mask, i),
pEvdev->absinfo[1 - i].maximum,
pEvdev->absinfo[1 - i].minimum,
pEvdev->absinfo[i].maximum,
pEvdev->absinfo[i].minimum);
}
}
for (i = 0; i <= 1; i++) {
if (swapped_isset[i])
valuator_mask_set(mask, i, swapped_values[i]);
else
valuator_mask_unset(mask, i);
}
}
/**
* Take the valuators and process them accordingly.
*/
@@ -496,27 +526,7 @@ EvdevProcessValuators(InputInfoPtr pInfo)
else if (pEvdev->abs_queued && pEvdev->in_proximity) {
int i;
if (pEvdev->swap_axes) {
int swapped_isset[2] = {0, 0};
int swapped_values[2];
for(i = 0; i <= 1; i++)
if (valuator_mask_isset(pEvdev->vals, i)) {
swapped_isset[1 - i] = 1;
swapped_values[1 - i] =
xf86ScaleAxis(valuator_mask_get(pEvdev->vals, i),
pEvdev->absinfo[1 - i].maximum,
pEvdev->absinfo[1 - i].minimum,
pEvdev->absinfo[i].maximum,
pEvdev->absinfo[i].minimum);
}
for (i = 0; i <= 1; i++)
if (swapped_isset[i])
valuator_mask_set(pEvdev->vals, i, swapped_values[i]);
else
valuator_mask_unset(pEvdev->vals, i);
}
EvdevSwapAbsValuators(pEvdev, pEvdev->vals);
for (i = 0; i <= 1; i++) {
int val;