diff options
author | dakkar <dakkar@thenautilus.net> | 2010-07-24 14:40:19 +0100 |
---|---|---|
committer | dakkar <dakkar@thenautilus.net> | 2010-07-24 14:40:19 +0100 |
commit | 35315fc33467b93795baddfc581a1937ae3323ca (patch) | |
tree | df268a6064afdc85216434c3cc4d0a51a0b493b8 /src/emuMB.c | |
parent | last touch-ups (diff) | |
parent | evdev 2.4.0 (diff) | |
download | xf86-input-evdev-35315fc33467b93795baddfc581a1937ae3323ca.tar.gz xf86-input-evdev-35315fc33467b93795baddfc581a1937ae3323ca.tar.bz2 xf86-input-evdev-35315fc33467b93795baddfc581a1937ae3323ca.zip |
Merge commit 'xf86-input-evdev-2.4.0' into code-remapcode-remap-2.4.0code-remap
Diffstat (limited to 'src/emuMB.c')
-rw-r--r-- | src/emuMB.c | 6 |
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")) { |