diff options
Diffstat (limited to 'src/synaptics.c')
| -rw-r--r-- | src/synaptics.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 4f6b65f..64e87da 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -488,6 +488,11 @@ static void set_default_parameters(InputInfoPtr pInfo) palmMinWidth = priv->minw + range * (10.0/16); emulateTwoFingerMinW = priv->minw + range * (7.0/16); + /* Clickpad conflicts with click actions, disable by default unless there + * is a physical right button. */ + if (pars->clickpad && !priv->has_right) + pars->clickpad = 0; + /* Enable tap if we don't have a phys left button */ tapButton1 = priv->has_left ? 0 : 1; tapButton2 = priv->has_left ? 0 : 3; @@ -534,7 +539,7 @@ static void set_default_parameters(InputInfoPtr pInfo) pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", tapMove); pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180); pars->click_time = xf86SetIntOption(opts, "ClickTime", 100); - pars->clickpad = xf86SetIntOption(opts, "ClickPad", FALSE); + pars->clickpad = xf86SetIntOption(opts, "ClickPad", pars->clickpad); /* Probed */ pars->fast_taps = xf86SetBoolOption(opts, "FastTaps", FALSE); pars->emulate_mid_button_time = xf86SetIntOption(opts, "EmulateMidButtonTime", 75); pars->emulate_twofinger_z = xf86SetIntOption(opts, "EmulateTwoFingerMinZ", emulateTwoFingerMinZ); |