diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-02-08 15:07:38 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-02-11 07:46:01 +1000 |
| commit | 0df994b3d80006d2fb114226d8b488e98d0e03d4 (patch) | |
| tree | b575b71e3b1b9de1eab8823ea811f3921a010d52 /src | |
| parent | 5486ab3486e1ba4a0ef8fc9efe4d243ea90f5794 (diff) | |
Rename num_touches to max_touches
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/eventcomm.c | 4 | ||||
| -rw-r--r-- | src/synaptics.c | 2 | ||||
| -rw-r--r-- | src/synapticsstr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c index b83da8f..6fb83f5 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -821,7 +821,7 @@ event_query_touch(InputInfoPtr pInfo) int rc; uint8_t prop; - priv->num_touches = 0; + priv->max_touches = 0; priv->num_mt_axes = 0; SYSCALL(rc = ioctl(pInfo->fd, EVIOCGPROP(sizeof(prop)), &prop)); @@ -879,7 +879,7 @@ event_query_touch(InputInfoPtr pInfo) }; if (mtdev->caps.slot.maximum > 0) - priv->num_touches = mtdev->caps.slot.maximum - + priv->max_touches = mtdev->caps.slot.maximum - mtdev->caps.slot.minimum + 1; priv->touch_axes = malloc(priv->num_mt_axes * diff --git a/src/synaptics.c b/src/synaptics.c index 475683b..337a3aa 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -1149,7 +1149,7 @@ DeviceInit(DeviceIntPtr dev) if (priv->has_touch) { /* x/y + whatever other MT axes we found */ - if (!InitTouchClassDeviceStruct(dev, priv->num_touches, + if (!InitTouchClassDeviceStruct(dev, priv->max_touches, XIDependentTouch, 2 + priv->num_mt_axes)) { xf86IDrvMsg(pInfo, X_ERROR, diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 9a11816..a903269 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -278,7 +278,7 @@ typedef struct _SynapticsPrivateRec #ifdef HAVE_MULTITOUCH Bool has_touch; /* Device has multitouch capabilities */ - int num_touches; /* Number of touches supported */ + int max_touches; /* Number of touches supported */ int num_mt_axes; /* Number of multitouch axes other than X, Y */ SynapticsTouchAxisRec *touch_axes; /* Touch axis information other than X, Y */ #endif |