fix for non-quartz branch

[wxWidgets.git] / src / mac / carbon / timer.cpp

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index f2b5f2e8961ec113b98baac62f9bd738d3713359..5fe0c8428e3488adf4b7db569782728387848192 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -1,102 +1,220 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.cpp
 // Purpose:     wxTimer implementation
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.cpp
 // Purpose:     wxTimer implementation

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "timer.h"
 #endif
 
 #pragma implementation "timer.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/timer.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/timer.h"
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#endif
+#ifndef __DARWIN__
+#include <Timer.h>

 #endif
 
 #endif
 

+#include "wx/dynarray.h"
+
+#define wxMAC_USE_CARBON_TIMER 1
+
+#if wxMAC_USE_CARBON_TIMER
+
+typedef struct MacTimerInfo
+{
+    wxTimer* m_timer ;
+    EventLoopTimerUPP m_proc ;
+    EventLoopTimerRef   m_timerRef ;
+} ;
+
+static pascal void wxProcessTimer( EventLoopTimerRef  theTimer , void *data ) ;
+static pascal void wxProcessTimer( EventLoopTimerRef theTimer , void *data )
+{
+    if ( !data )
+        return ;
+        
+    wxTimer* timer = (wxTimer*) data ;
+    
+    if ( timer->IsOneShot() )
+        timer->Stop() ;
+
+    timer->Notify();
+}
+
+void wxTimer::Init()
+{
+    m_info = new MacTimerInfo() ;
+    m_info->m_timer = this ;
+    m_info->m_proc = NULL ;
+    m_info->m_timerRef = kInvalidID ;
+}
+
+bool wxTimer::IsRunning() const 
+{
+    return ( m_info->m_timerRef != kInvalidID ) ;
+}
+
+wxTimer::~wxTimer()
+{
+    Stop();
+    if (m_info != NULL) {
+        delete m_info ;
+        m_info = NULL ;
+    }
+}
+
+bool wxTimer::Start(int milliseconds,bool mode)
+{
+    (void)wxTimerBase::Start(milliseconds, mode);
+
+    wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") );
+    wxCHECK_MSG( m_info->m_timerRef == NULL , FALSE, wxT("attempting to restart a timer") );
+
+    m_info->m_timer = this ;
+    m_info->m_proc = NewEventLoopTimerUPP( &wxProcessTimer);
+    verify_noerr( InstallEventLoopTimer (
+        GetMainEventLoop() ,
+        m_milli*kEventDurationMillisecond,
+        IsOneShot() ? 0 : m_milli*kEventDurationMillisecond ,
+        m_info->m_proc,
+        this,
+        &m_info->m_timerRef) ) ;
+    return TRUE;
+}
+
+void wxTimer::Stop()
+{
+    if (m_info->m_timerRef)
+        RemoveEventLoopTimer( m_info->m_timerRef ) ; 
+    if (m_info->m_proc)
+        DisposeEventLoopTimerUPP(m_info->m_proc) ;
+    m_info->m_proc = NULL ;
+    m_info->m_timerRef = kInvalidID ;
+}
+
+#else
+
+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 )
 {
 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 ) ;
+    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 )
 {
 static void wxProcessTimer( unsigned long event , void *data )
 {

-       if ( !data )
-               return ;
-               
-       wxTimer* timer = (wxTimer*) data ;
-       if ( timer->IsOneShot() )
-               timer->Stop() ;
-               
+    if ( !data )
+        return ;
+        
+    wxTimer* timer = (wxTimer*) data ;
+    
+    if ( timer->IsOneShot() )
+        timer->Stop() ;
+        
+    gTimersInProcess.Add( timer ) ;
+     

     timer->Notify();
 
     timer->Notify();
 

-    if ( timer->m_info.m_task.tmAddr && !timer->IsOneShot() )
+    int index = gTimersInProcess.Index( timer ) ;
+    
+    if ( index != wxNOT_FOUND )

     {
     {

-           PrimeTime( (QElemPtr)  &timer->m_info.m_task , timer->GetInterval() ) ;
+        gTimersInProcess.RemoveAt( index ) ;
+        
+        if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
+        {
+            PrimeTime( (QElemPtr)  &timer->m_info->m_task , timer->GetInterval() ) ;
+        }
+    

     }
 }
 
 void wxTimer::Init()
 {
     }
 }
 
 void wxTimer::Init()
 {

-       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 ;
+    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 
 {
 }
 
 bool wxTimer::IsRunning() const 
 {

-       return ( m_info.m_task.qType & kTMTaskActive ) ;
+    // 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();
 }
 
 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)
 {
     (void)wxTimerBase::Start(milliseconds, mode);
 
 }
 
 bool wxTimer::Start(int milliseconds,bool mode)
 {
     (void)wxTimerBase::Start(milliseconds, mode);
 

-    wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
-    wxCHECK_MSG( m_info.m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
-
-    m_milli = milliseconds;
-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
-    m_info.m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
-#else
-    m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ;
-#endif
-    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 FALSE;
+    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") );
+
+    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()
 {
 }
 
 void wxTimer::Stop()
 {

-    m_milli = 0 ;
-    if ( m_info.m_task.tmAddr )
+    if ( m_info->m_task.tmAddr )

     {
     {

-       RmvTime(  (QElemPtr) &m_info.m_task ) ;
-       DisposeTimerUPP(m_info.m_task.tmAddr) ;
-       m_info.m_task.tmAddr = NULL ;
+        RmvTime(  (QElemPtr) &m_info->m_task ) ;
+        DisposeTimerUPP(m_info->m_task.tmAddr) ;
+        m_info->m_task.tmAddr = NULL ;

     }
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }
 
     }
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }
 

+#endif