X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..5fc01d1326a34223746546326a7f616df8bfa991:/src/mac/carbon/timer.cpp diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index 5262040cf6..fe935003ca 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: timer.cpp // Purpose: wxTimer implementation -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -19,34 +19,121 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) #endif -wxTimer::wxTimer() +#ifdef __WXMAC__ +#include "wx/mac/private.h" +#endif +#ifndef __DARWIN__ +#include +#endif + +#include "wx/dynarray.h" + +typedef struct MacTimerInfo +{ + TMTask m_task; + wxMacNotifierTableRef m_table ; + wxTimer* m_timer ; +} ; + +static void wxProcessTimer( unsigned long event , void *data ) ; + +static pascal void MacTimerProc( TMTask * t ) +{ + MacTimerInfo * tm = (MacTimerInfo*) t ; + wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ; +} + +// we need this array to track timers that are being deleted within the Notify procedure +// adding the timer before the Notify call and checking after whether it still is in there +// as the destructor would have removed it from the array + +wxArrayPtrVoid gTimersInProcess ; + +static void wxProcessTimer( unsigned long event , void *data ) +{ + if ( !data ) + return ; + + wxTimer* timer = (wxTimer*) data ; + + if ( timer->IsOneShot() ) + timer->Stop() ; + + gTimersInProcess.Add( timer ) ; + + timer->Notify(); + + int index = gTimersInProcess.Index( timer ) ; + + if ( index != wxNOT_FOUND ) + { + gTimersInProcess.RemoveAt( index ) ; + + if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr ) + { + PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ; + } + + } +} + +void wxTimer::Init() { - m_milli = 0 ; - m_id = 0; - m_oneShot = FALSE; + m_info = new MacTimerInfo() ; + m_info->m_task.tmAddr = NULL ; + m_info->m_task.tmWakeUp = 0 ; + m_info->m_task.tmReserved = 0 ; + m_info->m_task.qType = 0 ; + m_info->m_table = wxMacGetNotifierTable() ; + m_info->m_timer = this ; +} + +bool wxTimer::IsRunning() const +{ + // as the qType may already indicate it is elapsed, but it + // was not handled internally yet + return ( m_info->m_task.tmAddr != NULL ) ; } wxTimer::~wxTimer() { Stop(); + if (m_info != NULL) { + delete m_info ; + m_info = NULL ; + } + int index = gTimersInProcess.Index( this ) ; + if ( index != wxNOT_FOUND ) + gTimersInProcess.RemoveAt( index ) ; } bool wxTimer::Start(int milliseconds,bool mode) { - m_oneShot = mode ; - if (milliseconds <= 0) - return FALSE; + (void)wxTimerBase::Start(milliseconds, mode); - m_milli = milliseconds; + wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") ); + wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") ); - // TODO: set the timer going. - return FALSE; + m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ; + m_info->m_task.tmWakeUp = 0 ; + m_info->m_task.tmReserved = 0 ; + m_info->m_task.qType = 0 ; + m_info->m_timer = this ; + InsXTime((QElemPtr) &m_info->m_task ) ; + PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ; + return TRUE; } void wxTimer::Stop() { - m_id = 0 ; - m_milli = 0 ; + if ( m_info->m_task.tmAddr ) + { + RmvTime( (QElemPtr) &m_info->m_task ) ; + DisposeTimerUPP(m_info->m_task.tmAddr) ; + m_info->m_task.tmAddr = NULL ; + } + wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ; } +