diff options
| author | Peter Osterlund <petero2@telia.com> | 2004-02-29 20:46:37 +0100 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:01:51 +0200 |
| commit | 661c08dca83b7413cab6f2ac3c3a3f097b975234 (patch) | |
| tree | a7577bd4ecf5a95335064f758cea81ba24f95c16 /synaptics.c | |
| parent | bc76e183f5b7d9d3f01744c22232212558c4067c (diff) | |
Added pressure dependent edge motion speed. From Matthias
Ihmig <m.ihmig@gmx.net>.
Diffstat (limited to 'synaptics.c')
| -rw-r--r-- | synaptics.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/synaptics.c b/synaptics.c index b291c5e..6c32900 100644 --- a/synaptics.c +++ b/synaptics.c @@ -1,4 +1,7 @@ /* + * Copyright 2004 Matthias Ihmig <m.ihmig@gmx.net> + * patch for pressure dependent EdgeMotion speed + * * Copyright 2004 Alexei Gilchrist <alexei@physics.uq.edu.au> * patch for circular scrolling * @@ -328,7 +331,10 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) "EmulateMidButtonTime", 75); priv->synpara->scroll_dist_vert = xf86SetIntOption(local->options, "VertScrollDelta", 100); priv->synpara->scroll_dist_horiz = xf86SetIntOption(local->options, "HorizScrollDelta", 100); - priv->synpara->edge_motion_speed = xf86SetIntOption(local->options, "EdgeMotionSpeed", 40); + priv->synpara->edge_motion_min_z = xf86SetIntOption(local->options, "EdgeMotionMinZ", 30); + priv->synpara->edge_motion_max_z = xf86SetIntOption(local->options, "EdgeMotionMaxZ", 160); + priv->synpara->edge_motion_min_speed = xf86SetIntOption(local->options, "EdgeMotionMinSpeed", 1); + priv->synpara->edge_motion_max_speed = xf86SetIntOption(local->options, "EdgeMotionMaxSpeed", 200); priv->synpara->repeater = xf86SetStrOption(local->options, "Repeater", NULL); priv->synpara->updown_button_scrolling = xf86SetBoolOption(local->options, "UpDownScrolling", TRUE); priv->synpara->touchpad_off = xf86SetBoolOption(local->options, "TouchpadOff", FALSE); @@ -1139,7 +1145,19 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw) dy = (hw->y - MOVE_HIST(2).y) / 2; if (priv->drag || priv->draglock) { - int edge_speed = para->edge_motion_speed; + int minZ = para->edge_motion_min_z; + int maxZ = para->edge_motion_max_z; + int minSpd = para->edge_motion_min_speed; + int maxSpd = para->edge_motion_max_speed; + int edge_speed; + + if (hw->z <= minZ) { + edge_speed = minSpd; + } else if (hw->z >= maxZ) { + edge_speed = maxSpd; + } else { + edge_speed = minSpd + (hw->z - minZ) * (maxSpd - minSpd) / (maxZ - minZ); + } if (edge & RIGHT_EDGE) { dx += clamp(edge_speed - dx, 0, edge_speed); } else if (edge & LEFT_EDGE) { |