Advertisement
Guest User

Untitled

a guest
Aug 25th, 2012
72
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. This reverts commit 889ce06946b8c1a246130a899e2702a3d7340fd2.
  2. ---
  3. dix/getevents.c | 25 ++++---------------------
  4. 1 file changed, 4 insertions(+), 21 deletions(-)
  5.  
  6. diff --git a/dix/getevents.c b/dix/getevents.c
  7. index fade40c..272b14e 100644
  8. --- a/dix/getevents.c
  9. +++ b/dix/getevents.c
  10. @@ -1179,33 +1179,16 @@ static void
  11. transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
  12. {
  13. double x, y, ox, oy;
  14. - int has_x, has_y;
  15. -
  16. - has_x = valuator_mask_fetch_double(mask, 0, &ox);
  17. - has_y = valuator_mask_fetch_double(mask, 1, &oy);
  18. -
  19. - if (!has_x && !has_y)
  20. - return;
  21. -
  22. - if (!has_x || !has_y) {
  23. - struct pixman_f_transform invert;
  24. -
  25. - /* undo transformation from last event */
  26. - ox = dev->last.valuators[0];
  27. - oy = dev->last.valuators[1];
  28. -
  29. - pixman_f_transform_invert(&invert, &dev->transform);
  30. - transform(&invert, &ox, &oy);
  31. -
  32. - x = ox;
  33. - y = oy;
  34. - }
  35.  
  36. if (valuator_mask_isset(mask, 0))
  37. ox = x = valuator_mask_get_double(mask, 0);
  38. + else
  39. + ox = x = dev->last.valuators[0];
  40.  
  41. if (valuator_mask_isset(mask, 1))
  42. oy = y = valuator_mask_get_double(mask, 1);
  43. + else
  44. + oy = y = dev->last.valuators[1];
  45.  
  46. transform(&dev->transform, &x, &y);
  47.  
  48. --
  49. 1.7.12
Advertisement
RAW Paste Data Copied
Advertisement