Attachment 55356 Details for Bug 44578 – git formatted patch (although clearly meant for mailing lists!)

[patch] git formatted patch (although clearly meant for mailing lists!)

0001-missing-multitouch-related-define-tests.patch (text/plain), 1.70 KB, created by Pete Beardmore on 2012-01-09 16:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Beardmore

Created: 2012-01-09 16:38:15 UTC

Size: 1.70 KB

patch

obsolete

>From 52dfe48434c76798f59f2494b3e012408b656dd3 Mon Sep 17 00:00:00 2001
>From: Pete Beardmore <pete.beardmore@msn.com>
>Date: Mon, 9 Jan 2012 23:47:45 +0000
>Subject: [PATCH evdev] missing multitouch related define tests
>
>addition of two missing define tests required when no multitouch related
>symbols are available in user-space
>
>Fixes X.Org Bug 44578 <https://bugs.freedesktop.org/show_bug.cgi?id=44578>
>
>Signed-off-by: Pete Beardmore <pete.beardmore@msn.com>
>---
> src/evdev.c |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/src/evdev.c b/src/evdev.c
>index 82cdb00..989a255 100644
>--- a/src/evdev.c
>+++ b/src/evdev.c
>@@ -1143,6 +1143,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
>     return Success;
> }
> 
>+#ifdef MULTITOUCH
> /* MT axes are counted twice - once as ABS_X (which the kernel keeps for
>  * backwards compatibility), once as ABS_MT_POSITION_X. So we need to keep a
>  * mapping of those axes to make sure we only count them once
>@@ -1160,6 +1161,7 @@ static struct mt_axis_mappings mt_axis_mappings[] = {
>     {ABS_MT_PRESSURE, ABS_PRESSURE},
>     {ABS_MT_DISTANCE, ABS_DISTANCE},
> };
>+#endif
> 
> /**
>  * return TRUE if the axis is not one we should count as true axis
>@@ -1280,6 +1282,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
> 
>         mapping = i;
> 
>+#ifdef MULTITOUCH
>         for (j = 0; j < ArrayLength(mt_axis_mappings); j++)
>         {
>             if (mt_axis_mappings[j].code == axis)
>@@ -1288,7 +1291,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
>                     mt_axis_mappings[j].needs_mapping)
>                 mapping = mt_axis_mappings[j].mapping;
>         }
>-
>+#endif
>         pEvdev->axis_map[axis] = mapping;
>         if (mapping == i)
>             i++;
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 44578: 55293 | 55356 | 55357 | 55358

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.