forked from enlightenment/efl
parent
b2edd2d7d6
commit
41ac47244f
|
@ -645,17 +645,12 @@ _ecore_main_loop_iterate_internal(int once_only)
|
||||||
{
|
{
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
double cur_time, t;
|
|
||||||
|
|
||||||
if (!_ecore_idler_call()) goto start_loop;
|
if (!_ecore_idler_call()) goto start_loop;
|
||||||
if (_ecore_event_exist()) break;
|
if (_ecore_event_exist()) break;
|
||||||
if (_ecore_main_select(0.0) > 0) have_event = 1;
|
if (_ecore_main_select(0.0) > 0) have_event = 1;
|
||||||
if (_ecore_main_win32_message(0.0) > 0) have_msg = 1;
|
if (_ecore_main_win32_message(0.0) > 0) have_msg = 1;
|
||||||
if (_ecore_signal_count_get() > 0) have_signal = 1;
|
if (_ecore_signal_count_get() > 0) have_signal = 1;
|
||||||
if (have_event || have_signal || have_msg) break;
|
if (have_event || have_signal || have_msg) break;
|
||||||
cur_time = ecore_time_get();
|
|
||||||
t = ecore_time_get() - cur_time;
|
|
||||||
if (t >= next_time) break;
|
|
||||||
next_time = _ecore_timer_next_get();
|
next_time = _ecore_timer_next_get();
|
||||||
if (next_time < 0) goto start_loop;
|
if (next_time < 0) goto start_loop;
|
||||||
if (do_quit) break;
|
if (do_quit) break;
|
||||||
|
|
|
@ -289,7 +289,7 @@ _ecore_timer_next_get(void)
|
||||||
Ecore_Timer *timer;
|
Ecore_Timer *timer;
|
||||||
|
|
||||||
if (!timers) return -1;
|
if (!timers) return -1;
|
||||||
now = ecore_time_get();
|
now = ecore_loop_time_get();
|
||||||
timer = (Ecore_Timer *)timers;
|
timer = (Ecore_Timer *)timers;
|
||||||
while ((timer) && ((timer->delete_me) || (timer->just_added)))
|
while ((timer) && ((timer->delete_me) || (timer->just_added)))
|
||||||
timer = (Ecore_Timer *)((Ecore_List2 *)timer)->next;
|
timer = (Ecore_Timer *)((Ecore_List2 *)timer)->next;
|
||||||
|
|
Loading…
Reference in New Issue