summaryrefslogtreecommitdiff
path: root/src/wcmXCommand.c
diff options
context:
space:
mode:
authorChris Bagwell <chris@cnpbagwell.com>2011-06-25 12:07:12 -0500
committerChris Bagwell <chris@cnpbagwell.com>2011-06-28 18:55:39 -0500
commit6c9c05e7dfadb6fc49f11a6541a18b1f84f8c844 (patch)
tree83b881f987aab38203c8519a25023933c78b2ded /src/wcmXCommand.c
parented83c973802c4f3f34faa166ccfebbfdc5414e49 (diff)
downloadxf86-input-wacom-6c9c05e7dfadb6fc49f11a6541a18b1f84f8c844.tar.gz
Remove unused Capacity logic on touch devices
The feature never fully worked and bits have slowing been removed. Remove remaining in one swoop. As apart of removing logic, now store ABS_PRESSURE values in the more appropriate "pressure" location so that it can eventually be exposed in the Pressure axis that touch devices create but do not currently send. Additional changes beyond this patch are required to get Pressure Axis working on touch devices. Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Diffstat (limited to 'src/wcmXCommand.c')
-rw-r--r--src/wcmXCommand.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
index 98de29b..18e5b61 100644
--- a/src/wcmXCommand.c
+++ b/src/wcmXCommand.c
@@ -89,7 +89,6 @@ Atom prop_strip_buttons;
Atom prop_wheel_buttons;
Atom prop_tv_resolutions;
Atom prop_cursorprox;
-Atom prop_capacity;
Atom prop_threshold;
Atom prop_suppress;
Atom prop_touch;
@@ -192,9 +191,6 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo)
prop_cursorprox = InitWcmAtom(pInfo->dev, WACOM_PROP_PROXIMITY_THRESHOLD, 32, 1, values);
}
- values[0] = common->wcmCapacity;
- prop_capacity = InitWcmAtom(pInfo->dev, WACOM_PROP_CAPACITY, 32, 1, values);
-
values[0] = (!common->wcmMaxZ) ? 0 : common->wcmThreshold;
prop_threshold = InitWcmAtom(pInfo->dev, WACOM_PROP_PRESSURE_THRESHOLD, 32, 1, values);
@@ -738,21 +734,6 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
if (!checkonly)
common->wcmCursorProxoutDist = value;
- } else if (property == prop_capacity)
- {
- INT32 value;
-
- if (prop->size != 1 || prop->format != 32)
- return BadValue;
-
- value = *(INT32*)prop->data;
-
- if ((value < -1) || (value > 5))
- return BadValue;
-
- if (!checkonly)
- common->wcmCapacity = value;
-
} else if (property == prop_threshold)
{
CARD32 value;