Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- This reverts commit 889ce06946b8c1a246130a899e2702a3d7340fd2.
- ---
- dix/getevents.c | 25 ++++---------------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
- diff --git a/dix/getevents.c b/dix/getevents.c
- index fade40c..272b14e 100644
- --- a/dix/getevents.c
- +++ b/dix/getevents.c
- @@ -1179,33 +1179,16 @@ static void
- transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
- {
- double x, y, ox, oy;
- - int has_x, has_y;
- -
- - has_x = valuator_mask_fetch_double(mask, 0, &ox);
- - has_y = valuator_mask_fetch_double(mask, 1, &oy);
- -
- - if (!has_x && !has_y)
- - return;
- -
- - if (!has_x || !has_y) {
- - struct pixman_f_transform invert;
- -
- - /* undo transformation from last event */
- - ox = dev->last.valuators[0];
- - oy = dev->last.valuators[1];
- -
- - pixman_f_transform_invert(&invert, &dev->transform);
- - transform(&invert, &ox, &oy);
- -
- - x = ox;
- - y = oy;
- - }
- if (valuator_mask_isset(mask, 0))
- ox = x = valuator_mask_get_double(mask, 0);
- + else
- + ox = x = dev->last.valuators[0];
- if (valuator_mask_isset(mask, 1))
- oy = y = valuator_mask_get_double(mask, 1);
- + else
- + oy = y = dev->last.valuators[1];
- transform(&dev->transform, &x, &y);
- --
- 1.7.12
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement