summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@ubuntu.com>2010-10-19 14:59:47 -0400
committerChase Douglas <chase.douglas@ubuntu.com>2010-11-05 10:42:18 -0400
commitd0884b2cc38bb42b15a8613dc0db5d39b7fdeee0 (patch)
tree560cab795568aaa6f09850ba0bbf8283a6ed0ab2
parent1a3d1c2b8d265c1a2b8a4e3bba43e05ea3d0fb17 (diff)
Don't copy touch class on master device changes
Touch classes don't follow master/slave input device semantics. Only slave devices may have touch classes. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--Xi/exevents.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 47be91779..df9a9de0d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -565,7 +565,8 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
to->valuator = NULL;
}
- if (from->touch)
+ /* Touch classes don't obey master/slave semantics */
+ if (from->touch && !IsMaster(to))
{
TouchClassPtr t;
int i;