Attachment 21824 Details for Bug 19285 – 0001-dix-drop-x-y-back-into-last.valuators-before-updati.patch

[patch] 0001-dix-drop-x-y-back-into-last.valuators-before-updati.patch

0001-dix-drop-x-y-back-into-last.valuators-before-updati.patch (text/plain), 1.59 KB, created by Peter Hutterer on 2009-01-08 20:16:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2009-01-08 20:16:06 UTC

Size: 1.59 KB

patch

obsolete

>From 41dd825acf4c3d28f89e74a902c64091dcc40037 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Fri, 9 Jan 2009 13:46:20 +1000
>Subject: [PATCH] dix: drop x/y back into last.valuators before updating the history (#19285)
>
>positionSprite needs to scale to screen coordinates and in the process of
>doing so alters dev->last.valuators[0:1]. Drop the real coordinates back after
>finishing and before updating the motion history. This way, we don't push the
>screen coordinates into the motion history.
>
>X.Org Bug 19285 <http://bugs.freedesktop.org/show_bug.cgi?id=19285>
>---
> dix/getevents.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/dix/getevents.c b/dix/getevents.c
>index 96cf2f5..ee1b5cd 100644
>--- a/dix/getevents.c
>+++ b/dix/getevents.c
>@@ -722,6 +722,9 @@ positionSprite(DeviceIntPtr dev, int *x, int *y,
>                                  dev->valuator->axes + 1, scr->height);
>     }
> 
>+    /* dropy x/y (device coordinates) back into valuators for next event */
>+    dev->last.valuators[0] = *x;
>+    dev->last.valuators[1] = *y;
> }
> 
> /**
>@@ -1008,9 +1011,6 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
>     positionSprite(pDev, &x, &y, scr, &cx, &cy, flags & POINTER_SCREEN);
>     updateHistory(pDev, first_valuator, num_valuators, ms);
> 
>-    /* dropy x/y (device coordinates) back into valuators for next event */
>-    pDev->last.valuators[0] = x;
>-    pDev->last.valuators[1] = y;
> 
>     /* Update the valuators with the true value sent to the client*/
>     if (num_valuators >= 1 && first_valuator == 0)
>-- 
>1.6.0.6
>

Actions: View | Splinter Review

Attachments on bug 19285: 21789 | 21824

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.