From 3701950a90e0b57d4a64e9ca26c1616cbc386c39 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 26 Dec 2019 18:13:03 +0100 Subject: Fix rare early timeouts in Fl_Clock (STR 3516). This is the main patch for Fl_Clock discussed in STR 3516. Although the root cause under Linux (in Fl::add_timeout()) has been fixed in a previous commit (35a3e7cc1) early timeouts may still occur, e.g. under Windows in a Virtualbox environment. This commit reverts bab61a93d and replaces it with the patch proposed by Manolo and further discussed in STR 3516. --- src/Fl_Clock.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/Fl_Clock.cxx') diff --git a/src/Fl_Clock.cxx b/src/Fl_Clock.cxx index ca7237212..4d7f21e47 100644 --- a/src/Fl_Clock.cxx +++ b/src/Fl_Clock.cxx @@ -212,11 +212,16 @@ static void tick(void *v) { time_t sec; int usec; Fl::system_driver()->gettime(&sec, &usec); + double delta = (1000000 - usec)/1000000.; // time till next second + // if current time is just before full second, show that full second + // and wait one more second (STR 3516) + if (delta < 0.1) { + delta += 1.0; + sec++; + } ((Fl_Clock*)v)->value((ulong)sec); - // schedule timer event slightly later than the next second (+25 ms) - // to prevent multiple timer events if triggered too early (STR 3516) - Fl::add_timeout((1025000 - usec)/1000000., tick, v); + Fl::add_timeout(delta, tick, v); } int Fl_Clock::handle(int event) { -- cgit v1.2.3