X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ef50df3a0fa3c343800c554e609f98fc7575cc..1a27a87d531c408a4ccd9bf871bab32384a7d617:/src/msw/timer.cpp diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 17f1c17552..9027958705 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp +// Name: src/msw/timer.cpp // Purpose: wxTimer implementation // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite) // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "timer.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,99 +18,98 @@ #if wxUSE_TIMER +#include "wx/msw/private/timer.h" + #ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/window.h" #include "wx/list.h" #include "wx/event.h" #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/hashmap.h" #endif -#include "wx/timer.h" - #include "wx/msw/private.h" // ---------------------------------------------------------------------------- -// private functions +// private globals // ---------------------------------------------------------------------------- -wxList wxTimerList(wxKEY_INTEGER); -UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); +// define a hash containing all the timers: it is indexed by timer id and +// contains the corresponding timer +WX_DECLARE_HASH_MAP(unsigned long, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual, + wxTimerMap); + +// instead of using a global here, wrap it in a static function as otherwise it +// could have been used before being initialized if a timer object were created +// globally +static wxTimerMap& TimerMap() +{ + static wxTimerMap s_timerMap; + + return s_timerMap; +} // ---------------------------------------------------------------------------- -// macros +// private functions // ---------------------------------------------------------------------------- -#ifdef __WIN32__ - #define _EXPORT -#else - #define _EXPORT _export -#endif - -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) +// timer callback used for all timers +void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime); // ============================================================================ // implementation // ============================================================================ // ---------------------------------------------------------------------------- -// wxTimer class +// wxMSWTimerImpl class // ---------------------------------------------------------------------------- -void wxTimer::Init() +bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot) { - m_id = 0; -} - -wxTimer::~wxTimer() -{ - wxTimer::Stop(); - - wxTimerList.DeleteObject(this); -} - -bool wxTimer::Start(int milliseconds, bool oneShot) -{ - (void)wxTimerBase::Start(milliseconds, oneShot); - - wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") ); - - wxTimerList.DeleteObject(this); - -#ifdef __WXMICROWIN__ - m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1), - (UINT)milliseconds, (TIMERPROC) wxTimerProc); -#else - TIMERPROC wxTimerProcInst = (TIMERPROC) - MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance()); - - m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1), - (UINT)milliseconds, wxTimerProcInst); -#endif - - if ( m_id > 0 ) + if ( !wxTimerImpl::Start(milliseconds, oneShot) ) + return false; + + m_id = ::SetTimer + ( + NULL, // don't use window + 1, // id ignored with NULL hwnd anyhow + (UINT)m_milli, // delay + wxTimerProc // timer proc to call + ); + + if ( !m_id ) { - wxTimerList.Append(m_id, this); + wxLogSysError(_("Couldn't create a timer")); - return TRUE; + return false; } - else + + // check that SetTimer() didn't reuse an existing id: according to the MSDN + // this can happen and this would be catastrophic to us as we rely on ids + // uniquely identifying the timers because we use them as keys in the hash + if ( TimerMap().find(m_id) != TimerMap().end() ) { - wxLogSysError(_("Couldn't create a timer")); + wxLogError(_("Timer creation failed.")); + + ::KillTimer(NULL, m_id); + m_id = 0; - return FALSE; + return false; } + + TimerMap()[m_id] = this; + + return true; } -void wxTimer::Stop() +void wxMSWTimerImpl::Stop() { - if ( m_id ) - { - KillTimer(NULL, (UINT)m_id); - wxTimerList.DeleteObject(this); - } + wxASSERT_MSG( m_id, _T("should be running") ); + + ::KillTimer(NULL, m_id); + + TimerMap().erase(m_id); m_id = 0; } @@ -123,11 +118,9 @@ void wxTimer::Stop() // private functions // ---------------------------------------------------------------------------- -void wxProcessTimer(wxTimer& timer) +void wxProcessTimer(wxMSWTimerImpl& timer) { - // Avoid to process spurious timer events - if ( timer.m_id == 0) - return; + wxASSERT_MSG( timer.IsRunning(), _T("bogus timer id") ); if ( timer.IsOneShot() ) timer.Stop(); @@ -135,15 +128,17 @@ void wxProcessTimer(wxTimer& timer) timer.Notify(); } -UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) +void WINAPI +wxTimerProc(HWND WXUNUSED(hwnd), + UINT WXUNUSED(msg), + UINT_PTR idTimer, + DWORD WXUNUSED(dwTime)) { - wxNode *node = wxTimerList.Find((long)idTimer); - - wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") ); + wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer); - wxProcessTimer(*(wxTimer *)node->Data()); + wxCHECK_RET( node != TimerMap().end(), wxT("bogus timer id in wxTimerProc") ); - return 0; + wxProcessTimer(*(node->second)); } #endif // wxUSE_TIMER