summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.alps4
-rw-r--r--synaptics.c4
-rw-r--r--synclient.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/README.alps b/README.alps
index 3163878..5fec268 100644
--- a/README.alps
+++ b/README.alps
@@ -26,8 +26,8 @@ Section "InputDevice"
Option "MinSpeed" "0.3"
Option "MaxSpeed" "0.75"
Option "AccelFactor" "0.015"
- Option "EdgeMotionMinSpeed" "100"
- Option "EdgeMotionMaxSpeed" "100"
+ Option "EdgeMotionMinSpeed" "200"
+ Option "EdgeMotionMaxSpeed" "200"
Option "UpDownScrolling" "1"
Option "CircularScrolling" "1"
Option "CircScrollDelta" "0.1"
diff --git a/synaptics.c b/synaptics.c
index d3465e7..5fb8152 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -358,7 +358,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pars->edge_motion_min_z = xf86SetIntOption(local->options, "EdgeMotionMinZ", 30);
pars->edge_motion_max_z = xf86SetIntOption(local->options, "EdgeMotionMaxZ", 160);
pars->edge_motion_min_speed = xf86SetIntOption(local->options, "EdgeMotionMinSpeed", 1);
- pars->edge_motion_max_speed = xf86SetIntOption(local->options, "EdgeMotionMaxSpeed", 200);
+ pars->edge_motion_max_speed = xf86SetIntOption(local->options, "EdgeMotionMaxSpeed", 400);
pars->edge_motion_use_always = xf86SetBoolOption(local->options, "EdgeMotionUseAlways", FALSE);
repeater = xf86SetStrOption(local->options, "Repeater", NULL);
pars->updown_button_scrolling = xf86SetBoolOption(local->options, "UpDownScrolling", TRUE);
@@ -1183,7 +1183,7 @@ static long ComputeDeltas(SynapticsPrivate *priv, struct SynapticsHwState *hw,
double tmpf;
int x_edge_speed = 0;
int y_edge_speed = 0;
- double dtime = (hw->millis - HIST(1).millis) / 1000.0;
+ double dtime = (hw->millis - HIST(0).millis) / 1000.0;
dx = estimate_delta(hw->x, HIST(0).x, HIST(1).x, HIST(2).x);
dy = estimate_delta(hw->y, HIST(0).y, HIST(1).y, HIST(2).y);
diff --git a/synclient.c b/synclient.c
index 64776b4..35b3ec9 100644
--- a/synclient.c
+++ b/synclient.c
@@ -84,8 +84,8 @@ static struct Parameter params[] = {
DEFINE_PAR("AccelFactor", accl, PT_DOUBLE, 0, 0.2),
DEFINE_PAR("EdgeMotionMinZ", edge_motion_min_z, PT_INT, 1, 255),
DEFINE_PAR("EdgeMotionMaxZ", edge_motion_max_z, PT_INT, 1, 255),
- DEFINE_PAR("EdgeMotionMinSpeed", edge_motion_min_speed, PT_INT, 0, 500),
- DEFINE_PAR("EdgeMotionMaxSpeed", edge_motion_max_speed, PT_INT, 0, 500),
+ DEFINE_PAR("EdgeMotionMinSpeed", edge_motion_min_speed, PT_INT, 0, 1000),
+ DEFINE_PAR("EdgeMotionMaxSpeed", edge_motion_max_speed, PT_INT, 0, 1000),
DEFINE_PAR("EdgeMotionUseAlways", edge_motion_use_always, PT_BOOL, 0, 1),
DEFINE_PAR("UpDownScrolling", updown_button_scrolling, PT_BOOL, 0, 1),
DEFINE_PAR("TouchpadOff", touchpad_off, PT_INT, 0, 2),