Commit Graph

26 Commits

Author SHA1 Message Date
Stefan Dirsch
59e5db0253 conf: rename to 70-synaptics.conf
Bump up the synaptics driver to 70, so it get's preferred over libinput, which
was dropped down to 60. The synaptics driver is more of a leaf package
than libinput (which covers a multitude of device types) and can be removed by
default. When specifically installed by the user, the synaptics driver should
override the system default.

Similar to what was done for wacom configuration file.

https://bugzilla.suse.com/show_bug.cgi?id=979554

Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-05-23 11:35:27 +10:00
Peter Hutterer
5378a020a0 Revert "Support the new Lenovo X1 Carbon 3rd trackpoint buttons"
This reverts commit 064445364b.

The Lenovo *50 series, including the X1 Carbon 3rd always require multiple
kernel patches to enable the touchpad buttons. This patch in synaptics only
addresses the re-routing of the top buttons.

The final iteration of the kernel patches also route the trackpoint buttons
through the trackpoint device, rendering this patch unnecessary. These patches
are queued for 4.0.

See kernel patch series up to commit cdd9dc195916ef5644cfac079094c3c1d1616e4c
Author: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date:   Sun Mar 8 22:35:41 2015 -0700

    Input: synaptics - re-route tracksticks buttons on the Lenovo 2015 series

Currently in Dmitry's for-linus branch.

Distributions running older kernels or the kernel stable series which has
partial backports of the above patch series are encouraged to leave the
0644453 commit in and undo this revert.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-03-18 07:25:31 +10:00
Peter Hutterer
00db769067 conf: add Lenovo T450s and W451 to rules
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-03-06 11:07:02 +10:00
Peter Hutterer
064445364b Support the new Lenovo X1 Carbon 3rd trackpoint buttons
This device has the trackpoint buttons wired up to the touchpad to send BTN_0,
BTN_1 and BTN_2 for left, right, middle. This conflicts with previous
touchpads that used those event codes for dedicated scroll buttons.

Add an option HasTrackpointButtons that can be set via a xorg.conf.d
snippets. This option is not intended as a user-set option, rather
we expect distributions to ship some conglomerate of udev/hal rules with
xorg.conf snippets that take effect.

If the option is set, we look at the three affected buttons at the beginning
of HandleState and send button events immediately for them. The HW state is
reset to neutral and other processing continues. This saves us from having to
synchronize these buttons with software buttons (also present on this device),
tapping, etc.

Since the buttons are physically different and (mentally) associated with the
trackpoint device we also don't need to worry about having finger motion event
correctly synced up with the button presses - it's acceptable to send the
presses before the motion events.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
2015-01-30 09:39:38 +10:00
Peter Hutterer
7301012234 conf: increase top software button area to 15%
We had reports that the top software button area is hard to hit for those
using the trackpoint and clicking the buttons with their thumb.

Analysis of event recordings (3 different people) for left, right and middle
clicks shows that there is a significant amount of events up to about 10mm
(with outliers up to 12mm) from the top of the touchpad. That maps to 15%.

Interestingly, the middle button does not seem to need this, presumably the
haptic feedback of the little dots sticking out from the surface make hitting
the button easier. Its size is increased to 15% anyway, for simplicity and
because a sample set of 3 is too small to be definitive about this.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2014-08-08 11:02:41 +10:00
Peter Hutterer
d4d7229c41 conf: drop the PNPID matching from the fdi file
Rely on INPUT_PROP_TOP_BUTTONPAD and default button areas as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-04-30 13:08:53 +10:00
Hans de Goede
7bf2756841 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>
2014-04-30 11:41:03 +10:00
Peter Hutterer
f183c1c387 conf: add more PnPIDs and DMI matches for Lenovos
And expand DMI strings to more precise matches

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2014-04-22 11:07:08 +10:00
Peter Hutterer
4122db68f6 conf: automatically enable the top softbutton area for the new Lenovos
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-14 16:05:26 +10:00
Peter Hutterer
18dae625ea conf: apply ClickPad softbuttons option through fdi file too (fixed version)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-13 16:39:22 +10:00
Peter Hutterer
f2cb48e6ee Revert "conf: apply ClickPad softbuttons option through fdi file too"
Bad fdi file, type="string" is missing and it wouldn't merge properly.

This reverts commit a35b2d629d.
2014-03-13 16:39:22 +10:00
Peter Hutterer
a35b2d629d conf: apply ClickPad softbuttons option through fdi file too
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-13 09:02:27 +10:00
Peter Hutterer
2159b5d262 conf: add example for AreaBottomEdge on clickpad buttons
Those that use clickpad buttons as buttons can see cursor jumps as the press
on the touchpad - largely caused by the finger changing shape as the
pressure changes and thus moving the hotspot.

Simple fix is to define the clickpad soft button areas as dead areas, but
this cannot be set as general option as it would break for those that use
tapping.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-04 16:11:00 +10:00
Peter Hutterer
291fdc6980 conf: the bcm5974 doesn't have Apple in the product name
But it's still a single-button device from the known fruit manufacturer.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-24 19:51:36 +10:00
Peter Hutterer
b6779458bc conf: enable right-button click by default on non-Apple clickpads
The right-half of the bottom 18% of the touchpad are enabled as right button
by default. On Apple touchpads (these don't have marking for the right
button) disable them by default.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-23 08:31:46 +10:00
Gaetan Nadon
cb6818b623 Revert "build: collapse all Makefile.am files into a single non-recursive one."
This reverts commit 39afe69ad7.

1. For such a small module, the build time improvement is most likely
negligible. At least, I'd like to see some timings proving it's
worthiness before seeing the patch go back in.

2. This kind of change would need a thorough review. The need to
operate the build from a single toplevel Makefile is a significant
change. The two most noticeable issues for me are that collapsing all
the Makefiles could easily cause namespacing issues with the
variables, and operating on files outside the current directory can
introduce subtle bugs. I feel that the non-recursive style is
generally less robust than the standard recursive make scheme.

3. It's unlike all the other X.org modules. This isn't a showstopper
for me, but the recursive style is well understood here and you've
beaten all the modules into a consistent format that makes build bugs
unique to specific modules less likely.

Acked-by: Dan Nicholson <dbn.lists@gmail.com>

To give a concrete example for #3 above, the 175 man pages are much
easier maintained using a very similar makefile in the man directory
of all X.Org module.

The cost of maintaining a single makefile is much higher. Every target
in the makefile has to be reviewed and tested when changes are made.
Not everyone has the all the skills to handle widely different targets
such as man pages, DocBook/XML, librairies, C code, distribution hooks,
and so on.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-07-05 16:39:33 -04:00
Daniel Kurtz
a0b7f755e9 conf: fix snippet to ignore /dev/input/mouse* on Linux
Added '*' to match any and all mouse devices.

Signed-off-by: Daniel Kurtz <djkurtz@google.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-28 08:10:46 +10:00
Peter Hutterer
f37c67fc6c conf: add snippet to ignore /dev/input/mouse* on Linux
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-05-31 14:43:59 +10:00
Diego Elio Pettenò
39afe69ad7 build: collapse all Makefile.am files into a single non-recursive one.
With this change, the whole of the build is done non-recursively in the
top-level Makefile.am. This reduces the amount of overhead due to recursing
into directories only to build one file.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Christoph Brill <egore911@egore911.de>
2011-05-15 21:46:06 +02:00
Peter Hutterer
b7acee2346 conf: add a descriptive header with warning to example config file
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-21 11:56:11 +10:00
Peter Hutterer
bc01d6a88a conf: remove SHM example from fdi
SHM is dead for configuration.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-21 11:56:10 +10:00
Christoph Brill
0662e1c181 Add note about MatchDevicePath
This question seems to pop up very often. Add a note pointing to Peter's
blog entry describing the details of this misconfiguration.
2011-03-09 23:25:05 +01:00
Gaetan Nadon
dead313d15 config: fdi file must be installed in $(datadir)/hal/fdi/policy/20thirdparty
Applies to server with no sysconfigdir

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-06-01 20:55:15 -04:00
Gaetan Nadon
82c2e2d934 config: 50-synaptics.conf must be unconditionally distributed
A file may or may not be installed based on a particular system
configuration, but it must always be distributed in the tarball
so the package contains the complete source code.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-31 12:53:27 -04:00
Gaetan Nadon
e517ccca6e config: use automake "dir" pattern for simplification
configdir is where the config file is installed
config_DATA is the filename

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-31 12:53:27 -04:00
Peter Hutterer
87b29e6004 Add 50-synaptics.conf snippet.
If the server exports the sysconfigdir variable, install the
50-synaptics.conf snippet in the directory provided.

This patch also moves the fdi file from fdi/ into the new conf/ subdir to
have a single location for all config files.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-04-16 10:34:01 +10:00