diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-02-04 14:21:51 -0800 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-02-11 23:01:09 +0100 |
| commit | bde0dcc8377ddf13e8eb661db6d8055b94ca03ef (patch) | |
| tree | 74cac1dee39d59acfa82187b3553bddb36b52de1 | |
| parent | fae83b3dcc4f6fbd21d5049cb6891cf1576d58ce (diff) | |
Check for clickpad property
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | src/eventcomm.c | 7 | ||||
| -rw-r--r-- | src/synaptics.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c index e97faa8..0161003 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -711,6 +711,7 @@ static void event_query_touch(InputInfoPtr pInfo) { SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private; + SynapticsParameters *para = &priv->synpara; struct eventcomm_proto_data *proto_data = priv->proto_data; struct mtdev *mtdev; int i; @@ -728,6 +729,12 @@ event_query_touch(InputInfoPtr pInfo) return; } + if (rc >= 0 && BitIsOn(&prop, INPUT_PROP_BUTTONPAD)) + { + xf86IDrvMsg(pInfo, X_INFO, "found clickpad property\n"); + para->clickpad = TRUE; + } + mtdev = mtdev_new_open(pInfo->fd); if (!mtdev) { diff --git a/src/synaptics.c b/src/synaptics.c index 8d9cb74..771a128 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -534,7 +534,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); |