summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-01-05 15:55:04 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-01-06 08:06:05 +1000
commit223ba8b46eacbc8e573bc5136a3d6677f3e39099 (patch)
tree4b6affde5d692390fb380b1ed1b8e7fae4159782 /dix
parent3ce102c362cadcd7087bdcf48440d9498eaf77d0 (diff)
dix: fix wrong condition checking for attached slave (#44003)
We need to update the master if the device is not a master _and_ it is not floating. X.Org Bug 44003 <http://bugs.freedesktop.org/show_bug.cgi?id=44003> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/getevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 3b40a5bb7..d0014e617 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1328,7 +1328,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
storeLastValuators(pDev, &mask, 0, 1, devx, devy);
/* Update the MD's co-ordinates, which are always in desktop space. */
- if (!IsMaster(pDev) || !IsFloating(pDev)) {
+ if (!IsMaster(pDev) && !IsFloating(pDev)) {
DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER);
master->last.valuators[0] = screenx;
master->last.valuators[1] = screeny;