diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | synaptics.c | 4 | ||||
| -rw-r--r-- | synclient.c | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -136,7 +136,9 @@ value. The MinSpeed, MaxSpeed and AccelFactor parameters don't have any effect on scrolling speed. Scrolling speed is determined solely from -the VertScrollDelta and HorizScrollDelta parameters. +the VertScrollDelta and HorizScrollDelta parameters. To disable +vertical or horizontal scrolling, set VertScrollDelta or +HorizScrollDelta to zero. When hitting an egde, movement can be automatically continued. If EdgeMotionUseAlways is false, edge motion is only used when diff --git a/synaptics.c b/synaptics.c index 14b9784..388ac6e 100644 --- a/synaptics.c +++ b/synaptics.c @@ -1064,12 +1064,12 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw) DBG(7, ErrorF("circular scroll detected on edge\n")); } } else { - if (edge & RIGHT_EDGE) { + if ((para->scroll_dist_vert != 0) && (edge & RIGHT_EDGE)) { priv->vert_scroll_on = TRUE; priv->scroll_y = hw->y; DBG(7, ErrorF("vert edge scroll detected on right edge\n")); } - if (edge & BOTTOM_EDGE) { + if ((para->scroll_dist_horiz != 0) && (edge & BOTTOM_EDGE)) { priv->horiz_scroll_on = TRUE; priv->scroll_x = hw->x; DBG(7, ErrorF("horiz edge scroll detected on bottom edge\n")); diff --git a/synclient.c b/synclient.c index 8146264..40ef724 100644 --- a/synclient.c +++ b/synclient.c @@ -74,8 +74,8 @@ static struct Parameter params[] = { DEFINE_PAR("MaxTapTime", tap_time, PT_INT, 0, 1000), DEFINE_PAR("MaxTapMove", tap_move, PT_INT, 0, 2000), DEFINE_PAR("EmulateMidButtonTime", emulate_mid_button_time, PT_INT, 0, 1000), - DEFINE_PAR("VertScrollDelta", scroll_dist_vert, PT_INT, 5, 1000), - DEFINE_PAR("HorizScrollDelta", scroll_dist_horiz, PT_INT, 5, 1000), + DEFINE_PAR("VertScrollDelta", scroll_dist_vert, PT_INT, 0, 1000), + DEFINE_PAR("HorizScrollDelta", scroll_dist_horiz, PT_INT, 0, 1000), DEFINE_PAR("MinSpeed", min_speed, PT_DOUBLE, 0, 1.0), DEFINE_PAR("MaxSpeed", max_speed, PT_DOUBLE, 0, 1.0), DEFINE_PAR("AccelFactor", accl, PT_DOUBLE, 0, 0.2), |