aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-20 18:03:51 +0000
committermarha <marha@users.sourceforge.net>2010-10-20 18:03:51 +0000
commitc24d80341cb2ccb427ed85a5c149e6d009355f96 (patch)
tree5422d18117fd5d6cacbe33d71aaacd66adfdebd4 /xorg-server/hw/xfree86
parentbe10ad8a9efe4131c14c2dde36adaf11e7b125aa (diff)
parentf31315aaa8df8630415a9ba6aeeb8b97dcd5094b (diff)
downloadvcxsrv-c24d80341cb2ccb427ed85a5c149e6d009355f96.tar.gz
vcxsrv-c24d80341cb2ccb427ed85a5c149e6d009355f96.tar.bz2
vcxsrv-c24d80341cb2ccb427ed85a5c149e6d009355f96.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/common/xf86DGA.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 1d46a67d3..9a99a339b 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -1133,6 +1133,10 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
ev.root_x = event->dx;
ev.root_y = event->dy;
ev.corestate = event->state;
+ /* DGA is core only, so valuators.data doesn't actually matter.
+ * Mask must be set for EventToCore to create motion events. */
+ SetBit(ev.valuators.mask, 0);
+ SetBit(ev.valuators.mask, 1);
DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);
}
}