diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-07 07:51:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-07 07:51:02 +0200 |
| commit | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (patch) | |
| tree | 0451299b4aaaaf6d2423d1faf07dc9f35c9f80d8 /xorg-server/dix/getevents.c | |
| parent | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (diff) | |
| download | vcxsrv-f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0.tar.gz vcxsrv-f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0.tar.bz2 vcxsrv-f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0.zip | |
mesa xserver xkeyboard-config git update 7 Aug 2012
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 27c2e04d1..b3bb162ae 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -1625,6 +1625,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, if (adj != 0.0 && axis != -1) { adj *= pDev->valuator->axes[axis].scroll.increment; + if (!valuator_mask_isset(&mask, axis)) + valuator_mask_set(&mask, axis, 0); add_to_scroll_valuator(pDev, &mask, axis, adj); type = MotionNotify; buttons = 0; |