Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix for STR#3387 Bug of timer implementation on macosx

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12271 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2017-06-26 15:20:25 +00:00
parent 51ed4e2162
commit 66200436bf
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+5 -9
View File
@@ -505,7 +505,7 @@ struct MacTimeout {
static MacTimeout* mac_timers; static MacTimeout* mac_timers;
static int mac_timer_alloc; static int mac_timer_alloc;
static int mac_timer_used; static int mac_timer_used;
static MacTimeout* current_timer; // the timer that triggered its callback function, or NULL static MacTimeout* current_timer; // the timer that triggered its callback function
static void realloc_timers() static void realloc_timers()
{ {
@@ -530,14 +530,14 @@ static void delete_timer(MacTimeout& t)
kCFRunLoopDefaultMode); kCFRunLoopDefaultMode);
CFRelease(t.timer); CFRelease(t.timer);
memset(&t, 0, sizeof(MacTimeout)); memset(&t, 0, sizeof(MacTimeout));
if (&t == current_timer) current_timer = NULL;
} }
} }
static void do_timer(CFRunLoopTimerRef timer, void* data) static void do_timer(CFRunLoopTimerRef timer, void* data)
{ {
fl_lock_function(); fl_lock_function();
current_timer = (MacTimeout*)data; fl_intptr_t timerId = (fl_intptr_t)data;
current_timer = &mac_timers[timerId];
current_timer->pending = 0; current_timer->pending = 0;
(current_timer->callback)(current_timer->data); (current_timer->callback)(current_timer->data);
if (current_timer && current_timer->pending == 0) if (current_timer && current_timer->pending == 0)
@@ -562,7 +562,7 @@ void Fl_Cocoa_Screen_Driver::add_timeout(double time, Fl_Timeout_Handler cb, voi
} }
} }
// no existing timer to use. Create a new one: // no existing timer to use. Create a new one:
int timer_id = -1; fl_intptr_t timer_id = -1;
// find an empty slot in the timer array // find an empty slot in the timer array
for (int i = 0; i < mac_timer_used; ++i) { for (int i = 0; i < mac_timer_used; ++i) {
if ( !mac_timers[i].timer ) { if ( !mac_timers[i].timer ) {
@@ -580,7 +580,7 @@ void Fl_Cocoa_Screen_Driver::add_timeout(double time, Fl_Timeout_Handler cb, voi
} }
// now install a brand new timer // now install a brand new timer
MacTimeout& t = mac_timers[timer_id]; MacTimeout& t = mac_timers[timer_id];
CFRunLoopTimerContext context = {0, &t, NULL,NULL,NULL}; CFRunLoopTimerContext context = {0, (void*)timer_id, NULL,NULL,NULL};
CFRunLoopTimerRef timerRef = CFRunLoopTimerCreate(kCFAllocatorDefault, CFRunLoopTimerRef timerRef = CFRunLoopTimerCreate(kCFAllocatorDefault,
CFAbsoluteTimeGetCurrent() + time, CFAbsoluteTimeGetCurrent() + time,
1E30, 1E30,
@@ -603,7 +603,6 @@ void Fl_Cocoa_Screen_Driver::add_timeout(double time, Fl_Timeout_Handler cb, voi
void Fl_Cocoa_Screen_Driver::repeat_timeout(double time, Fl_Timeout_Handler cb, void* data) void Fl_Cocoa_Screen_Driver::repeat_timeout(double time, Fl_Timeout_Handler cb, void* data)
{ {
if (current_timer) {
// k = how many times 'time' seconds after the last scheduled timeout until the future // k = how many times 'time' seconds after the last scheduled timeout until the future
double k = ceil( (CFAbsoluteTimeGetCurrent() - current_timer->next_timeout) / time); double k = ceil( (CFAbsoluteTimeGetCurrent() - current_timer->next_timeout) / time);
if (k < 1) k = 1; if (k < 1) k = 1;
@@ -612,9 +611,6 @@ void Fl_Cocoa_Screen_Driver::repeat_timeout(double time, Fl_Timeout_Handler cb,
current_timer->callback = cb; current_timer->callback = cb;
current_timer->data = data; current_timer->data = data;
current_timer->pending = 1; current_timer->pending = 1;
return;
}
add_timeout(time, cb, data);
} }
int Fl_Cocoa_Screen_Driver::has_timeout(Fl_Timeout_Handler cb, void* data) int Fl_Cocoa_Screen_Driver::has_timeout(Fl_Timeout_Handler cb, void* data)