diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2010-06-02 13:06:31 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2010-06-02 13:06:31 +0200 |
| commit | 700fe78923eaac0b9671e8f87227540afd9f772c (patch) | |
| tree | 560ca0103933a8f67356d41d2fd522b193f88c48 | |
| parent | f0ecd234b78dfa83c535c2b104e98716e1322863 (diff) | |
Add NumberTouchPoints configuration option.multitouch-subdevs
Different hardware has different capabilities, add a configuration
option so this can be done through xorg.conf.d.
| -rw-r--r-- | src/evdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c index ab67664..6273c1b 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2625,6 +2625,10 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) EvdevInitButtonMapping(pInfo); + pEvdev->num_multitouch = xf86CheckIntOption(dev->commonOptions, "NumberTouchPoints", 0); + xf86Msg(X_INFO, "%s: NumberTouchPoints set to %d\n", + dev->identifier, pEvdev->num_multitouch); + if (EvdevCacheCompare(pInfo, FALSE) || EvdevProbe(pInfo)) { close(pInfo->fd); @@ -3252,8 +3256,6 @@ EvdevSetMultitouch(InputInfoPtr pInfo, int num_multitouch) { num_multitouch = MAX_VALUATORS_MT; if (num_multitouch < 0) num_multitouch = 0; - if (num_multitouch == pEvdev->num_multitouch) - return; for (i = 0; i < num_multitouch; ++i) { if (!pEvdev->subdev_info[i].pInfo) { |