summaryrefslogtreecommitdiff
path: root/src/properties.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-02-05 00:46:48 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-10 09:42:30 +1000
commit54f65f3ca1f7a7118bea96915d79acee28721581 (patch)
tree8123f224b7cbecc40594deb48c7984814fa793d7 /src/properties.c
parentd14ea867ad5d6f8a758a18223e457e1a56fa6065 (diff)
Purge edge motion
A funny feature, but unreliable and mostly untested. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'src/properties.c')
-rw-r--r--src/properties.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/src/properties.c b/src/properties.c
index e89147f..0c422fb 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -251,19 +251,6 @@ InitDeviceProperties(InputInfoPtr pInfo)
fvalues[3] = 0;
prop_speed = InitFloatAtom(pInfo->dev, SYNAPTICS_PROP_SPEED, 4, fvalues);
- values[0] = para->edge_motion_min_z;
- values[1] = para->edge_motion_max_z;
- prop_edgemotion_pressure =
- InitAtom(pInfo->dev, SYNAPTICS_PROP_EDGEMOTION_PRESSURE, 32, 2, values);
-
- values[0] = para->edge_motion_min_speed;
- values[1] = para->edge_motion_max_speed;
- prop_edgemotion_speed =
- InitAtom(pInfo->dev, SYNAPTICS_PROP_EDGEMOTION_SPEED, 32, 2, values);
- prop_edgemotion_always =
- InitAtom(pInfo->dev, SYNAPTICS_PROP_EDGEMOTION, 8, 1,
- &para->edge_motion_use_always);
-
if (priv->has_scrollbuttons) {
values[0] = para->updown_button_scrolling;
values[1] = para->leftright_button_scrolling;
@@ -554,42 +541,6 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
para->min_speed = speed[0];
para->max_speed = speed[1];
para->accl = speed[2];
-
- }
- else if (property == prop_edgemotion_pressure) {
- CARD32 *pressure;
-
- if (prop->size != 2 || prop->format != 32 || prop->type != XA_INTEGER)
- return BadMatch;
-
- pressure = (CARD32 *) prop->data;
- if (pressure[0] > pressure[1])
- return BadValue;
-
- para->edge_motion_min_z = pressure[0];
- para->edge_motion_max_z = pressure[1];
-
- }
- else if (property == prop_edgemotion_speed) {
- CARD32 *speed;
-
- if (prop->size != 2 || prop->format != 32 || prop->type != XA_INTEGER)
- return BadMatch;
-
- speed = (CARD32 *) prop->data;
- if (speed[0] > speed[1])
- return BadValue;
-
- para->edge_motion_min_speed = speed[0];
- para->edge_motion_max_speed = speed[1];
-
- }
- else if (property == prop_edgemotion_always) {
- if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
- return BadMatch;
-
- para->edge_motion_use_always = *(BOOL *) prop->data;
-
}
else if (property == prop_buttonscroll) {
BOOL *scroll;