[PATCH xf86-input-synaptics 02/12] Check for clickpad property

[Peter Hutterer]

On Thu, Feb 09, 2012 at 06:52:56PM -0800, Chase Douglas wrote:
> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
> ---
>  src/eventcomm.c |    7 +++++++
>  src/synaptics.c |    2 +-
>  2 files changed, 8 insertions(+), 1 deletions(-)
> 

IMO could be merged into 01/12 but Reviewed-by: Peter Hutterer
<peter.hutterer at who-t.net> either way.

Cheers,
  Peter

> diff --git a/src/eventcomm.c b/src/eventcomm.c
> index 2dac9e7..8b29c46 100644
> --- a/src/eventcomm.c
> +++ b/src/eventcomm.c
> @@ -668,6 +668,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;
> @@ -685,6 +686,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 b5ab8dc..2891784 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);
> -- 
> 1.7.8.3
>