From 801778c3106fc7e409369b4500253a38be6a5795 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Thu, 25 Feb 2010 07:11:21 +0200 Subject: 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 Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/emuMB.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/emuMB.c') 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")) { -- cgit v1.2.3