diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-17 13:18:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-17 13:18:21 +0200 |
| commit | f5e157731e6b51421ac89cfefb666b8bbf971b03 (patch) | |
| tree | a39529411c67f07761f016803733d1819b2c8e5a /xorg-server/dix | |
| parent | 06f4de23ace4de1fd628c37891214f0a4ecb77db (diff) | |
| download | vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.gz vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.bz2 vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.zip | |
mesa mkfontscale xserver git update 17 Jul 2013
xserver commit 74469895e39fa38337f59edd64c4031ab9bb51d8
mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0
mesa commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/events.c | 3 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 03b2d2ea7..ed3138d07 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1441,7 +1441,8 @@ UpdateTouchesForGrab(DeviceIntPtr mouse) listener->type = LISTENER_POINTER_GRAB; else listener->type = LISTENER_GRAB; - FreeGrab(listener->grab); + if (listener->grab) + FreeGrab(listener->grab); listener->grab = AllocGrab(grab); } } diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index d6fef9cf3..e75300a17 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -245,11 +245,10 @@ AccelSetDecelProperty(DeviceIntPtr dev, Atom atom, if (checkOnly) { if (rc) return rc; - return (v >= 1.0f) ? Success : BadValue; + return (v > 0) ? Success : BadValue; } - if (v >= 1.0f) - vel->const_acceleration = 1 / v; + vel->const_acceleration = 1 / v; return Success; } |