aboutsummaryrefslogtreecommitdiff
path: root/src/emuMB.c
diff options
context:
space:
mode:
authorOliver McFadden <oliver.mcfadden@nokia.com>2010-02-25 07:11:21 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2010-02-25 16:07:39 +1000
commit801778c3106fc7e409369b4500253a38be6a5795 (patch)
treed8ca06c6962895e1bc8fd1c67985813d7e032309 /src/emuMB.c
parentman: fix man page formatting for option EmulateWheel. (diff)
downloadxf86-input-evdev-801778c3106fc7e409369b4500253a38be6a5795.tar.gz
xf86-input-evdev-801778c3106fc7e409369b4500253a38be6a5795.tar.bz2
xf86-input-evdev-801778c3106fc7e409369b4500253a38be6a5795.zip
emuMB: default to disabled mouse button emulation for touchscreens.
Because touchscreens only use one button (see EvdevProcessKeyEvent()) EvdevMBEmuFilterEvent() never calls EvdevMBEmuEnable(..., FALSE) to disable emulation. This results in touchscreen devices incurring a delay of Emulate3Timeout (typically 50 ms.) Default to MBEMU_DISABLED for touchscreen devices (unless overwritten by Xorg.conf.) Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/emuMB.c')
-rw-r--r--src/emuMB.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index 199c0d7..113a708 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -309,7 +309,11 @@ void
EvdevMBEmuPreInit(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
- pEvdev->emulateMB.enabled = MBEMU_AUTO;
+
+ if (pEvdev->flags & EVDEV_TOUCHSCREEN)
+ pEvdev->emulateMB.enabled = MBEMU_DISABLED;
+ else
+ pEvdev->emulateMB.enabled = MBEMU_AUTO;
if (xf86FindOption(pInfo->options, "Emulate3Buttons"))
{