xserver: Branch 'master'

[Oliver McFadden]

 hw/xfree86/common/xf86Xinput.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit b83c682e7ea4e10757eca6363de28281108591a8
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date:   Mon Aug 3 02:46:57 2009 +0300

    xf86Xinput: xf86PostButtonEventP must set POINTER_ACCELERATE for relative events.
    
    Thanks to Peter Hutterer for spotting this bug.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 210f5bf..3543811 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -864,6 +864,14 @@ xf86PostButtonEventP(DeviceIntPtr	device,
 {
     int i = 0, nevents = 0;
     int index;
+    int flags = 0;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    if (is_absolute)
+        flags = POINTER_ABSOLUTE;
+    else
+        flags = POINTER_RELATIVE | POINTER_ACCELERATE;
 
 #if XFreeXDGA
     if (miPointerGetScreen(device)) {
@@ -873,13 +881,10 @@ xf86PostButtonEventP(DeviceIntPtr	device,
     }
 #endif
 
-    XI_VERIFY_VALUATORS(num_valuators);
-
     GetEventList(&xf86Events);
     nevents = GetPointerEvents(xf86Events, device,
                                is_down ? ButtonPress : ButtonRelease, button,
-                               (is_absolute) ? POINTER_ABSOLUTE : POINTER_RELATIVE,
-                               first_valuator, num_valuators, valuators);
+                               flags, first_valuator, num_valuators, valuators);
 
     for (i = 0; i < nevents; i++)
         mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));