svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

1 files changed, 175 insertions, 137 deletions

diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index c13ff9808..3dceeb7ae 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -46,6 +46,7 @@
 #include "mipointer.h"

 #include "eventstr.h"

 #include "eventconvert.h"

+#include "inpututils.h"

 

 #include <X11/extensions/XKBproto.h>

 #include "xkbsrv.h"

@@ -199,34 +200,38 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
 }

 

 static void

-set_raw_valuators(RawDeviceEvent *event, int first, int num, int *valuators, int32_t* data)

+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data)

 {

     int i;

-    for (i = first; i < first + num; i++)

-        SetBit(event->valuators.mask, i);

 

-    memcpy(&data[first], valuators, num * sizeof(uint32_t));

+    for (i = 0; i < valuator_mask_size(mask); i++)

+    {

+        if (valuator_mask_isset(mask, i))

+        {

+            SetBit(event->valuators.mask, i);

+            data[i] = valuator_mask_get(mask, i);

+        }

+    }

 }

 

 

 static void

-set_valuators(DeviceIntPtr dev, DeviceEvent* event, int first_valuator,

-              int num_valuators, int *valuators)

+set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)

 {

     int i;

 

-    for (i = first_valuator; i < first_valuator + num_valuators; i++)

+    for (i = 0; i < valuator_mask_size(mask); i++)

     {

-        SetBit(event->valuators.mask, i);

-        if (dev->valuator->mode == Absolute)

-            SetBit(event->valuators.mode, i);

-        event->valuators.data_frac[i] =

-            dev->last.remainder[i] * (1 << 16) * (1 << 16);

+        if (valuator_mask_isset(mask, i))

+        {

+            SetBit(event->valuators.mask, i);

+            if (dev->valuator->axes[i].mode == Absolute)

+                SetBit(event->valuators.mode, i);

+            event->valuators.data[i] = valuator_mask_get(mask, i);

+            event->valuators.data_frac[i] =

+                dev->last.remainder[i] * (1 << 16) * (1 << 16);

+        }

     }

-

-    memcpy(&event->valuators.data[first_valuator],

-           valuators, num_valuators * sizeof(int32_t));

-

 }

 

 void

@@ -265,8 +270,7 @@ CreateClassesChangedEvent(EventList* event,
             dce->valuators[i].min = slave->valuator->axes[i].min_value;

             dce->valuators[i].max = slave->valuator->axes[i].max_value;

             dce->valuators[i].resolution = slave->valuator->axes[i].resolution;

-            /* This should, eventually, be a per-axis mode */

-            dce->valuators[i].mode = slave->valuator->mode;

+            dce->valuators[i].mode = slave->valuator->axes[i].mode;

             dce->valuators[i].name = slave->valuator->axes[i].label;

         }

     }

@@ -384,8 +388,15 @@ AllocateMotionHistory(DeviceIntPtr pDev)
      */

     if (IsMaster(pDev))

         size = sizeof(INT32) * 3 * MAX_VALUATORS;

-    else

-        size = sizeof(INT32) * pDev->valuator->numAxes;

+    else {

+        ValuatorClassPtr v = pDev->valuator;

+        int numAxes;

+        /* XI1 doesn't understand mixed mode devices */

+        for (numAxes = 0; numAxes < v->numAxes; numAxes++)

+            if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0))

+                break;

+        size = sizeof(INT32) * numAxes;

+    }

 

     size += sizeof(Time);

 

@@ -539,12 +550,12 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
  *   for SDs: [time] [val0] [val1] ... [valn]

  *   for MDs: [time] [min_val0] [max_val0] [val0] [min_val1] ... [valn]

  *

- * For events that have some valuators unset (first_valuator > 0):

+ * For events that have some valuators unset:

  *      min_val == max_val == val == 0.

  */

 static void

-updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,

-                    int num_valuators, int *valuators)

+updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,

+                    int *valuators)

 {

     char *buff = (char *) pDev->valuator->motion;

     ValuatorClassPtr v;

@@ -563,17 +574,22 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
         buff += sizeof(Time);

 

         memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);

-        buff += 3 * sizeof(INT32) * first_valuator;

 

-        for (i = first_valuator; i < first_valuator + num_valuators; i++)

+        for (i = 0; i < v->numAxes; i++)

         {

-            if (i >= v->numAxes)

+            /* XI1 doesn't support mixed mode devices */

+            if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0))

                 break;

+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

+            {

+                buff += 3 * sizeof(INT32);

+                continue;

+            }

             memcpy(buff, &v->axes[i].min_value, sizeof(INT32));

             buff += sizeof(INT32);

             memcpy(buff, &v->axes[i].max_value, sizeof(INT32));

             buff += sizeof(INT32);

-            memcpy(buff, &valuators[i - first_valuator], sizeof(INT32));

+            memcpy(buff, &valuators[i], sizeof(INT32));

             buff += sizeof(INT32);

         }

     } else

@@ -586,9 +602,17 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
         buff += sizeof(Time);

 

         memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);

-        buff += sizeof(INT32) * first_valuator;

 

-        memcpy(buff, valuators, sizeof(INT32) * num_valuators);

+        for (i = 0; i < MAX_VALUATORS; i++)

+        {

+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

+            {

+                buff += sizeof(INT32);

+                continue;

+            }

+            memcpy(buff, &valuators[i], sizeof(INT32));

+            buff += sizeof(INT32);

+        }

     }

 

     pDev->valuator->last_motion = (pDev->valuator->last_motion + 1) %

@@ -646,13 +670,17 @@ clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
  * Clip every axis in the list of valuators to its bounds.

  */

 static void

-clipValuators(DeviceIntPtr pDev, int first_valuator, int num_valuators,

-              int *valuators)

+clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)

 {

     int i;

 

-    for (i = 0; i < num_valuators; i++)

-        clipAxis(pDev, i + first_valuator, &(valuators[i]));

+    for (i = 0; i < valuator_mask_size(mask); i++)

+        if (valuator_mask_isset(mask, i))

+        {

+            int val = valuator_mask_get(mask, i);

+            clipAxis(pDev, i, &val);

+            valuator_mask_set(mask, i, val);

+        }

 }

 

 /**

@@ -695,36 +723,35 @@ UpdateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_event
  * @param dev The device which's pointer is to be moved.

  * @param x Returns the x position of the pointer after the move.

  * @param y Returns the y position of the pointer after the move.

- * @param first The first valuator in @valuators

- * @param num Total number of valuators in @valuators.

+ * @param mask Bit mask of valid valuators.

  * @param valuators Valuator data for each axis between @first and

  *        @first+@num.

  */

 static void

-moveAbsolute(DeviceIntPtr dev, int *x, int *y,

-             int first, int num, int *valuators)

+moveAbsolute(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

 {

     int i;

 

-

-    if (num >= 1 && first == 0)

-        *x = *(valuators + 0);

+    if (valuator_mask_isset(mask, 0))

+        *x = valuator_mask_get(mask, 0);

     else

         *x = dev->last.valuators[0];

 

-    if (first <= 1 && num >= (2 - first))

-        *y = *(valuators + 1 - first);

+    if (valuator_mask_isset(mask, 1))

+        *y = valuator_mask_get(mask, 1);

     else

         *y = dev->last.valuators[1];

 

     clipAxis(dev, 0, x);

     clipAxis(dev, 1, y);

 

-    i = (first > 2) ? 0 : 2;

-    for (; i < num; i++)

+    for (i = 2; i < valuator_mask_size(mask); i++)

     {

-        dev->last.valuators[i + first] = valuators[i];

-        clipAxis(dev, i, &dev->last.valuators[i + first]);

+        if (valuator_mask_isset(mask, i))

+        {

+            dev->last.valuators[i] = valuator_mask_get(mask, i);

+            clipAxis(dev, i, &dev->last.valuators[i]);

+        }

     }

 }

 

@@ -734,42 +761,44 @@ moveAbsolute(DeviceIntPtr dev, int *x, int *y,
  * @param dev The device which's pointer is to be moved.

  * @param x Returns the x position of the pointer after the move.

  * @param y Returns the y position of the pointer after the move.

- * @param first The first valuator in @valuators

- * @param num Total number of valuators in @valuators.

+ * @param mask Bit mask of valid valuators.

  * @param valuators Valuator data for each axis between @first and

  *        @first+@num.

  */

 static void

-moveRelative(DeviceIntPtr dev, int *x, int *y,

-             int first, int num, int *valuators)

+moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

 {

     int i;

 

     *x = dev->last.valuators[0];

     *y = dev->last.valuators[1];

 

-    if (num >= 1 && first == 0)

-        *x += *(valuators +0);

+    if (valuator_mask_isset(mask, 0))

+        *x += valuator_mask_get(mask, 0);

 

-    if (first <= 1 && num >= (2 - first))

-        *y += *(valuators + 1 - first);

+    if (valuator_mask_isset(mask, 1))

+        *y += valuator_mask_get(mask, 1);

 

     /* if attached, clip both x and y to the defined limits (usually

      * co-ord space limit). If it is attached, we need x/y to go over the

      * limits to be able to change screens. */

-    if(dev->u.master && dev->valuator->mode == Absolute) {

-        clipAxis(dev, 0, x);

-        clipAxis(dev, 1, y);

+    if(dev->u.master) {

+        if (valuator_get_mode(dev, 0) == Absolute)

+            clipAxis(dev, 0, x);

+        if (valuator_get_mode(dev, 1) == Absolute)

+            clipAxis(dev, 1, y);

     }

 

     /* calc other axes, clip, drop back into valuators */

-    i = (first > 2) ? 0 : 2;

-    for (; i < num; i++)

+    for (i = 2; i < valuator_mask_size(mask); i++)

     {

-        dev->last.valuators[i + first] += valuators[i];

-        if (dev->valuator->mode == Absolute)

-            clipAxis(dev, i, &dev->last.valuators[i + first]);

-        valuators[i] = dev->last.valuators[i + first];

+        if (valuator_mask_isset(mask, i))

+        {

+            dev->last.valuators[i] += valuator_mask_get(mask, i);

+            if (valuator_get_mode(dev, i) == Absolute)

+                clipAxis(dev, i, &dev->last.valuators[i]);

+            valuator_mask_set(mask, i, dev->last.valuators[i]);

+        }

     }

 }

 

@@ -883,18 +912,18 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,
  * Update the motion history for the device and (if appropriate) for its

  * master device.

  * @param dev Slave device to update.

- * @param first First valuator to append to history.

+ * @param mask Bit mask of valid valuators to append to history.

  * @param num Total number of valuators to append to history.

  * @param ms Current time

  */

 static void

-updateHistory(DeviceIntPtr dev, int first, int num, CARD32 ms)

+updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)

 {

-    updateMotionHistory(dev, ms, first, num, &dev->last.valuators[first]);

+    updateMotionHistory(dev, ms, mask, dev->last.valuators);

     if (dev->u.master)

     {

         DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);

-        updateMotionHistory(master, ms, first, num, &dev->last.valuators[first]);

+        updateMotionHistory(master, ms, mask, dev->last.valuators);

     }

 }

 

@@ -904,7 +933,10 @@ updateHistory(DeviceIntPtr dev, int first, int num, CARD32 ms)
  */

 int

 GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {

-    return GetKeyboardValuatorEvents(events, pDev, type, key_code, 0, 0, NULL);

+    ValuatorMask mask;

+

+    valuator_mask_zero(&mask);

+    return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);

 }

 

 

@@ -918,20 +950,18 @@ GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code)
  */

 int

 GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,

-                          int key_code, int first_valuator,

-                          int num_valuators, int *valuators_in) {

+                          int key_code, const ValuatorMask *mask_in) {

     int num_events = 0;

     CARD32 ms = 0;

     DeviceEvent *event;

     RawDeviceEvent *raw;

-    int valuators[MAX_VALUATORS];

+    ValuatorMask mask;

 

     /* refuse events from disabled devices */

     if (!pDev || !pDev->enabled)

         return 0;

 

     if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||

-        num_valuators > MAX_VALUATORS ||

        (type != KeyPress && type != KeyRelease) ||

        (key_code < 8 || key_code > 255))

         return 0;

@@ -956,17 +986,14 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
     events++;

     num_events++;

 

-    memcpy(valuators, valuators_in, num_valuators * sizeof(int));

+    valuator_mask_copy(&mask, mask_in);

 

     init_raw(pDev, raw, ms, type, key_code);

-    set_raw_valuators(raw, first_valuator, num_valuators, valuators,

-                      raw->valuators.data_raw);

+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

 

-    if (num_valuators)

-        clipValuators(pDev, first_valuator, num_valuators, valuators);

+    clipValuators(pDev, &mask);

 

-    set_raw_valuators(raw, first_valuator, num_valuators, valuators,

-                      raw->valuators.data);

+    set_raw_valuators(raw, &mask, raw->valuators.data);

 

     event = (DeviceEvent*) events->event;

     init_event(pDev, event, ms);

@@ -981,10 +1008,9 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
 	set_key_up(pDev, key_code, KEY_POSTED);

     }

 

-    if (num_valuators)

-        clipValuators(pDev, first_valuator, num_valuators, valuators);

+    clipValuators(pDev, &mask);

 

-    set_valuators(pDev, event, first_valuator, num_valuators, valuators);

+    set_valuators(pDev, event, &mask);

 

     return num_events;

 }

@@ -1041,19 +1067,19 @@ FreeEventList(EventListPtr list, int num_events)
 }

 

 static void

-transformAbsolute(DeviceIntPtr dev, int v[MAX_VALUATORS])

+transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)

 {

     struct pixman_f_vector p;

 

     /* p' = M * p in homogeneous coordinates */

-    p.v[0] = v[0];

-    p.v[1] = v[1];

+    p.v[0] = valuator_mask_get(mask, 0);

+    p.v[1] = valuator_mask_get(mask, 1);

     p.v[2] = 1.0;

 

     pixman_f_transform_point(&dev->transform, &p);

 

-    v[0] = lround(p.v[0]);

-    v[1] = lround(p.v[1]);

+    valuator_mask_set(mask, 0, lround(p.v[0]));

+    valuator_mask_set(mask, 1, lround(p.v[1]));

 }

 

 /**

@@ -1074,8 +1100,7 @@ transformAbsolute(DeviceIntPtr dev, int v[MAX_VALUATORS])
  */

 int

 GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,

-                 int flags, int first_valuator, int num_valuators,

-                 int *valuators_in) {

+                 int flags, const ValuatorMask *mask_in) {

     int num_events = 1;

     CARD32 ms;

     DeviceEvent *event;

@@ -1084,7 +1109,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
         cx, cy; /* only screen coordinates */

     float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac;

     ScreenPtr scr = miPointerGetScreen(pDev);

-    int valuators[MAX_VALUATORS];

+    ValuatorMask mask;

 

     /* refuse events from disabled devices */

     if (!pDev->enabled)

@@ -1092,13 +1117,14 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
 

     ms = GetTimeInMillis(); /* before pointer update to help precision */

 

-    if (!scr || !pDev->valuator || first_valuator < 0 ||

-        num_valuators > MAX_VALUATORS ||

-        ((num_valuators + first_valuator) > pDev->valuator->numAxes) ||

+    if (!scr || !pDev->valuator ||

         (type != MotionNotify && type != ButtonPress && type != ButtonRelease) ||

         (type != MotionNotify && !pDev->button) ||

-        ((type == ButtonPress || type == ButtonRelease) && !buttons) ||

-        (type == MotionNotify && num_valuators <= 0))

+        ((type == ButtonPress || type == ButtonRelease) && !buttons))

+        return 0;

+

+    if (type == MotionNotify &&

+        (!mask_in || valuator_mask_num_valuators(mask_in) <= 0))

         return 0;

 

     events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

@@ -1107,54 +1133,68 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
     events++;

     num_events++;

 

-    memcpy(valuators, valuators_in, num_valuators * sizeof(int));

+    valuator_mask_copy(&mask, mask_in);

 

     init_raw(pDev, raw, ms, type, buttons);

-    set_raw_valuators(raw, first_valuator, num_valuators, valuators,

-                      raw->valuators.data_raw);

+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

 

     if (flags & POINTER_ABSOLUTE)

     {

         if (flags & POINTER_SCREEN) /* valuators are in screen coords */

         {

+            int scaled;

 

-            if (num_valuators >= 1 && first_valuator == 0)

-                valuators[0] = rescaleValuatorAxis(valuators[0], 0.0, &x_frac, NULL,

-                        pDev->valuator->axes + 0,

-                        scr->width);

-            if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))

-                valuators[1 - first_valuator] = rescaleValuatorAxis(valuators[1 - first_valuator], 0.0, &y_frac, NULL,

-                        pDev->valuator->axes + 1,

-                        scr->height);

+            if (valuator_mask_isset(&mask, 0))

+            {

+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 0),

+                                             0.0, &x_frac, NULL,

+                                             pDev->valuator->axes + 0,

+                                             scr->width);

+                valuator_mask_set(&mask, 0, scaled);

+            }

+            if (valuator_mask_isset(&mask, 1))

+            {

+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 1),

+                                             0.0, &y_frac, NULL,

+                                             pDev->valuator->axes + 1,

+                                             scr->height);

+                valuator_mask_set(&mask, 1, scaled);

+            }

         }

 

-        transformAbsolute(pDev, valuators);

-        moveAbsolute(pDev, &x, &y, first_valuator, num_valuators, valuators);

+        transformAbsolute(pDev, &mask);

+        moveAbsolute(pDev, &x, &y, &mask);

     } else {

         if (flags & POINTER_ACCELERATE) {

-            accelPointer(pDev, first_valuator, num_valuators, valuators, ms);

+            /* FIXME: Pointer acceleration only requires X and Y values. This

+             * should be converted to masked valuators. */

+            int vals[2];

+            vals[0] = valuator_mask_isset(&mask, 0) ?

+                      valuator_mask_get(&mask, 0) : pDev->last.valuators[0];

+            vals[1] = valuator_mask_isset(&mask, 1) ?

+                      valuator_mask_get(&mask, 1) : pDev->last.valuators[1];

+            accelPointer(pDev, 0, 2, vals, ms);

+

             /* The pointer acceleration code modifies the fractional part

              * in-place, so we need to extract this information first */

             x_frac = pDev->last.remainder[0];

             y_frac = pDev->last.remainder[1];

         }

-        moveRelative(pDev, &x, &y, first_valuator, num_valuators, valuators);

+        moveRelative(pDev, &x, &y, &mask);

     }

 

-    set_raw_valuators(raw, first_valuator, num_valuators, valuators,

-            raw->valuators.data);

+    set_raw_valuators(raw, &mask, raw->valuators.data);

 

     positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);

-    updateHistory(pDev, first_valuator, num_valuators, ms);

+    updateHistory(pDev, &mask, ms);

 

     /* Update the valuators with the true value sent to the client*/

-    if (num_valuators >= 1 && first_valuator == 0)

-        valuators[0] = x;

-    if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))

-        valuators[1 - first_valuator] = y;

+    if (valuator_mask_isset(&mask, 0))

+        valuator_mask_set(&mask, 0, x);

+    if (valuator_mask_isset(&mask, 1))

+        valuator_mask_set(&mask, 0, y);

 

-    if (num_valuators)

-        clipValuators(pDev, first_valuator, num_valuators, valuators);

+    clipValuators(pDev, &mask);

 

     event = (DeviceEvent*) events->event;

     init_event(pDev, event, ms);

@@ -1180,7 +1220,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
     event->root_x_frac = cx_frac;

     event->root_y_frac = cy_frac;

 

-    set_valuators(pDev, event, first_valuator, num_valuators, valuators);

+    set_valuators(pDev, event, &mask);

 

     return num_events;

 }

@@ -1195,30 +1235,31 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
  * place via GetMaximumEventsNum(), and for freeing it.

  */

 int

-GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,

-                   int first_valuator, int num_valuators, int *valuators_in)

+GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask_in)

 {

-    int num_events = 1;

+    int num_events = 1, i;

     DeviceEvent *event;

-    int valuators[MAX_VALUATORS];

+    ValuatorMask mask;

 

     /* refuse events from disabled devices */

     if (!pDev->enabled)

         return 0;

 

     /* Sanity checks. */

-    if (type != ProximityIn && type != ProximityOut)

+    if ((type != ProximityIn && type != ProximityOut) || !mask_in)

         return 0;

     if (!pDev->valuator)

         return 0;

-    /* Do we need to send a DeviceValuator event? */

-    if ((pDev->valuator->mode & 1) == Relative)

-        num_valuators = 0;

 

-    /* You fail. */

-    if (first_valuator < 0 || num_valuators > MAX_VALUATORS ||

-        (num_valuators + first_valuator) > pDev->valuator->numAxes)

-        return 0;

+    valuator_mask_copy(&mask, mask_in);

+

+    /* ignore relative axes for proximity. */

+    for (i = 0; i < valuator_mask_num_valuators(&mask); i++)

+    {

+        if (valuator_mask_isset(&mask, i) &&

+            valuator_get_mode(pDev, i) == Relative)

+            valuator_mask_unset(&mask, i);

+    }

 

     events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

 

@@ -1226,12 +1267,9 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
     init_event(pDev, event, GetTimeInMillis());

     event->type = (type == ProximityIn) ? ET_ProximityIn : ET_ProximityOut;

 

-    if (num_valuators) {

-        memcpy(valuators, valuators_in, num_valuators * sizeof(int));

-        clipValuators(pDev, first_valuator, num_valuators, valuators);

-    }

+    clipValuators(pDev, &mask);

 

-    set_valuators(pDev, event, first_valuator, num_valuators, valuators);

+    set_valuators(pDev, event, &mask);

 

     return num_events;

 }