diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-04-22 18:58:11 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-04-30 11:41:03 +1000 |
| commit | 7bf27568417691e772e715f8fc6c30ea7ec892d6 (patch) | |
| tree | 562c5506876352b4e2b94fed5959bbe0fe70841e /conf | |
| parent | 41afac2abf12dd74a171f726b57014f7fb266957 (diff) | |
Add support for INPUT_PROP_TOPBUTTONPAD
Add a HasSecondaryButtons boolean config option which defaults to true for
devices with the INPUT_PROP_TOPBUTTONPAD and false for all other devices.
Only parse the SecondarySoftButtonAreas when this option is true, effectively
disabling the top buttons when it is false. Likewise, only initialize the
SecondarySoftButtonAreas property if we enable support for it.
This means that it is now safe to always set a SecondarySoftButtonAreas
default in 50-synaptics.conf, and that he section which was intended for
use with future pnp-id matching can be dropped, as that is now all handled
in the kernel.
While at also remove the comment about disabling the bottom edge area, as that
is now done automatically.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/50-synaptics.conf | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf index 161c1dd..a3145b8 100644 --- a/conf/50-synaptics.conf +++ b/conf/50-synaptics.conf @@ -25,16 +25,15 @@ Section "InputClass" Option "Ignore" "on" EndSection -# This option enables the bottom right corner to be a right button on -# non-synaptics clickpads. +# This option enables the bottom right corner to be a right button on clickpads +# and the right and middle top areas to be right / middle buttons on clickpads +# with a top button area. # This option is only interpreted by clickpads. Section "InputClass" Identifier "Default clickpad buttons" MatchDriver "synaptics" Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" -# To disable the bottom edge area so the buttons only work as buttons, -# not for movement, set the AreaBottomEdge -# Option "AreaBottomEdge" "82%" + Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%" EndSection # This option disables software buttons on Apple touchpads. @@ -45,19 +44,3 @@ Section "InputClass" MatchDriver "synaptics" Option "SoftButtonAreas" "0 0 0 0 0 0 0 0" EndSection - -# The Lenovo *40 series has no physical button for the TrackPoint and needs -# the top softbutton area enabled by default. -# Affected devices and their PNPIDs -# LEN0033: Helix -# LEN0034: T431, T540, X1 Carbon -# LEN0035: X240 -# LEN0036: T440 -# LEN0042: Yoga -# LEN2004: L440, L540 -Section "InputClass" - Identifier "Lenovo TrackPoint top software buttons" - MatchDriver "synaptics" - MatchPnPID "LEN0033*|LEN0034*|LEN0035*|LEN0036*|LEN0042*|LEN2004*" - Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%" -EndSection |