[PATCH 1/6] dix: replace a manual valuator check with valuator_get_mode().

Jeremy Huddleston jeremyhu at apple.com
Tue Nov 23 09:47:38 PST 2010


All 6:
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Nov 22, 2010, at 19:35, Peter Hutterer wrote:

> This check was missing the OutOfProximity mask and resulted in the wrong
> bits being set in InternalEvents.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> dix/getevents.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/dix/getevents.c b/dix/getevents.c
> index 06a0da0..5f4fb66 100644
> --- a/dix/getevents.c
> +++ b/dix/getevents.c
> @@ -210,7 +210,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
>         if (valuator_mask_isset(mask, i))
>         {
>             SetBit(event->valuators.mask, i);
> -            if (dev->valuator->axes[i].mode == Absolute)
> +            if (valuator_get_mode(dev, i) == Absolute)
>                 SetBit(event->valuators.mode, i);
>             event->valuators.data[i] = valuator_mask_get(mask, i);
>             event->valuators.data_frac[i] =
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel



More information about the xorg-devel mailing list