From ad834abd570be893aa14b83eb10b635947b5a141 Mon Sep 17 00:00:00 2001 From: Julien Plissonneau Duquene Date: Mon, 2 Feb 2009 10:46:52 -0500 Subject: EvdevCacheCompare: ignore changes in current device position Input devices (especially touchscreens) were disabled when switching virtual console back to X because EvdevCacheCompare() thought the device was substituted by another while away from X. Actually only the current position reported by the device changed from what was in the cache. Fixed by ignoring the current position in the comparison. Fixes bug #19819. Signed-off-by: Julien Cristau Signed-off-by: Peter Hutterer (cherry picked from commit 0dbb88c52b057cfdff6116060060841e4fc4abb5) --- src/evdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/evdev.c b/src/evdev.c index bdf7592..e81c54c 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1273,6 +1273,8 @@ EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare) xf86Msg(X_ERROR, "ioctl EVIOCGABS failed: %s\n", strerror(errno)); goto error; } + /* ignore current position (value) in comparison (bug #19819) */ + absinfo[i].value = pEvdev->absinfo[i].value; } } -- cgit v1.2.3