diff options
| author | Pauli Nieminen <ext-pauli.nieminen@nokia.com> | 2010-12-30 19:19:32 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:52:51 +0000 |
| commit | aa8cea953dc66bcf4cb4d08f2681f9e6cb1bc8c5 (patch) | |
| tree | 596b1f5d3324f28c838d554c9979818bd407e6e5 /render/animcur.c | |
| parent | 91beeee05f88eed10ab0fd97dc625e96cb7763ba (diff) | |
render: Don't filter 0 return from GetTimeInMillis
In animate cursor block handler code assumes GetTimeInMillis returns
always nonzero value. This isn't true when time wraps around.
To prevent any problems in case GetTimeInMillis would return zero use
activeDevice variable to track if we have received time.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'render/animcur.c')
| -rw-r--r-- | render/animcur.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/render/animcur.c b/render/animcur.c index 2160f5043..1a8ca43ba 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -150,6 +150,7 @@ AnimCurScreenBlockHandler (int screenNum, ScreenPtr pScreen = screenInfo.screens[screenNum]; AnimCurScreenPtr as = GetAnimCurScreen(pScreen); DeviceIntPtr dev; + Bool activeDevice = FALSE; CARD32 now = 0, soonest = ~0; /* earliest time to wakeup again */ @@ -157,7 +158,10 @@ AnimCurScreenBlockHandler (int screenNum, { if (IsPointerDevice(dev) && pScreen == dev->spriteInfo->anim.pScreen) { - if (!now) now = GetTimeInMillis (); + if (!activeDevice) { + now = GetTimeInMillis (); + activeDevice = TRUE; + } if ((INT32) (now - dev->spriteInfo->anim.time) >= 0) { @@ -187,7 +191,7 @@ AnimCurScreenBlockHandler (int screenNum, } } - if (now) + if (activeDevice) AdjustWaitForDelay (pTimeout, soonest - now); Unwrap (as, pScreen, BlockHandler); |