frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: Set fractional member in set_raw_valuators 

RawDeviceEvents have space for fractional valuator members, so might as
well start using them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2011-03-02 13:34:32 +00:00 committed by Peter Hutterer
parent cdf202250e
commit e1df51421b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dix/getevents.c
View File

@ -167,16 +167,20 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
} }
static void static void
set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data) set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data,
int32_t* data_frac)
{ {
int i; int i;
double val;
for (i = 0; i < valuator_mask_size(mask); i++) for (i = 0; i < valuator_mask_size(mask); i++)
{ {
if (valuator_mask_isset(mask, i)) if (valuator_mask_isset(mask, i))
{ {
SetBit(event->valuators.mask, i); SetBit(event->valuators.mask, i);
data[i] = valuator_mask_get(mask, i); val = valuator_mask_get_double(mask, i);
data[i] = trunc(val);
data_frac[i] = (val - data[i]) * (1UL << 32);
} }
} }
} }
@ -969,11 +973,13 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
valuator_mask_copy(&mask, mask_in); valuator_mask_copy(&mask, mask_in);
init_raw(pDev, raw, ms, type, key_code); init_raw(pDev, raw, ms, type, key_code);
set_raw_valuators(raw, &mask, raw->valuators.data_raw); set_raw_valuators(raw, &mask, raw->valuators.data_raw,
raw->valuators.data_raw_frac);
clipValuators(pDev, &mask); clipValuators(pDev, &mask);
set_raw_valuators(raw, &mask, raw->valuators.data); set_raw_valuators(raw, &mask, raw->valuators.data,
raw->valuators.data_frac);
event = &events->device_event; event = &events->device_event;
init_device_event(event, pDev, ms); init_device_event(event, pDev, ms);
@ -1147,7 +1153,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons
num_events++; num_events++;
init_raw(pDev, raw, ms, type, buttons); init_raw(pDev, raw, ms, type, buttons);
set_raw_valuators(raw, &mask, raw->valuators.data_raw); set_raw_valuators(raw, &mask, raw->valuators.data_raw,
raw->valuators.data_raw_frac);
} }
if (flags & POINTER_ABSOLUTE) if (flags & POINTER_ABSOLUTE)
@ -1188,7 +1195,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons
} }
if ((flags & POINTER_NORAW) == 0) if ((flags & POINTER_NORAW) == 0)
set_raw_valuators(raw, &mask, raw->valuators.data); set_raw_valuators(raw, &mask, raw->valuators.data,
raw->valuators.data_frac);
positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
&x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);