X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 847582748d..795bbef448 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "event.h" #endif @@ -38,6 +46,10 @@ #include "wx/validate.h" #endif // wxUSE_GUI +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) @@ -84,12 +96,26 @@ #endif // !USE_SHARED_LIBRARY +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +// To put pending event handlers +wxList *wxPendingEvents = (wxList *)NULL; + #if wxUSE_THREADS -/* To put pending event handlers */ -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; + // protects wxPendingEvents list + wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; #endif +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxEvent +// ---------------------------------------------------------------------------- + /* * General wxWindows events, covering * all interesting things that might happen (button clicking, resizing, @@ -243,7 +269,7 @@ bool wxMouseEvent::ButtonDClick(int but) const case 3: return RightDClick(); default: - wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonDClick")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick")); } return FALSE; @@ -264,7 +290,7 @@ bool wxMouseEvent::ButtonDown(int but) const case 3: return RightDown(); default: - wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonDown")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown")); } return FALSE; @@ -284,7 +310,7 @@ bool wxMouseEvent::ButtonUp(int but) const case 3: return RightUp(); default: - wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonUp")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp")); } return FALSE; @@ -295,7 +321,7 @@ bool wxMouseEvent::Button(int but) const { switch (but) { case -1: - return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)) ; + return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)); case 1: return (LeftDown() || LeftUp() || LeftDClick()); case 2: @@ -303,7 +329,7 @@ bool wxMouseEvent::Button(int but) const case 3: return (RightDown() || RightUp() || RightDClick()); default: - wxFAIL_MSG(T("invalid parameter in wxMouseEvent::Button")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button")); } return FALSE; @@ -321,7 +347,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const case 3: return RightIsDown(); default: - wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonIsDown")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown")); } return FALSE; @@ -514,10 +540,12 @@ wxEvtHandler::wxEvtHandler() m_enabled = TRUE; m_dynamicEvents = (wxList *) NULL; m_isWindow = FALSE; + m_pendingEvents = (wxList *) NULL; #if wxUSE_THREADS - m_eventsLocker = new wxCriticalSection(); +# if !defined(__VISAGECPP__) + m_eventsLocker = new wxCriticalSection; +# endif #endif - m_pendingEvents = (wxList *) NULL; } wxEvtHandler::~wxEvtHandler() @@ -542,63 +570,108 @@ wxEvtHandler::~wxEvtHandler() delete m_dynamicEvents; }; -#if wxUSE_THREADS - if (m_pendingEvents) - delete m_pendingEvents; + delete m_pendingEvents; +#if wxUSE_THREADS +# if !defined(__VISAGECPP__) delete m_eventsLocker; +# endif #endif } #if wxUSE_THREADS -#ifdef __WXGTK__ -extern bool g_isIdle; -extern void wxapp_install_idle_handler(); -#endif - bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) { - wxEvent *event_main; - wxCriticalSectionLocker locker(*m_eventsLocker); - // check that we are really in a child thread - wxASSERT( !wxThread::IsMain() ); + wxASSERT_MSG( !wxThread::IsMain(), + wxT("use ProcessEvent() in main thread") ); - if (m_pendingEvents == NULL) - m_pendingEvents = new wxList(); + AddPendingEvent(event); - event_main = (wxEvent *)event.Clone(); + return TRUE; +} - m_pendingEvents->Append(event_main); +#endif // wxUSE_THREADS - wxPendingEventsLocker->Enter(); - wxPendingEvents->Append(this); - wxPendingEventsLocker->Leave(); +void wxEvtHandler::AddPendingEvent(wxEvent& event) +{ + // 1) Add event to list of pending events of this event handler - // TODO: Wake up idle handler for the other platforms. -#ifdef __WXGTK__ - if (g_isIdle) - wxapp_install_idle_handler(); +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); #endif - return TRUE; + if ( !m_pendingEvents ) + m_pendingEvents = new wxList; + + wxEvent *event2 = (wxEvent *)event.Clone(); + + m_pendingEvents->Append(event2); + +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif + + // 2) Add this event handler to list of event handlers that + // have pending events. + + wxENTER_CRIT_SECT(*wxPendingEventsLocker); + + if ( !wxPendingEvents ) + wxPendingEvents = new wxList; + wxPendingEvents->Append(this); + + // 3) Inform the system that new pending events are somwehere, + // and that these should be processed in idle time. + + wxWakeUpIdle(); + + wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); } void wxEvtHandler::ProcessPendingEvents() { - wxCriticalSectionLocker locker(*m_eventsLocker); - wxNode *node = m_pendingEvents->First(); - wxEvent *event; +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif - while (node != NULL) { - event = (wxEvent *)node->Data(); - ProcessEvent(*event); - delete node; - node = m_pendingEvents->First(); + wxNode *node = m_pendingEvents->First(); + while ( node ) + { + wxEvent *event = (wxEvent *)node->Data(); + delete node; + + // In ProcessEvent, new events might get added and + // we can safely leave the crtical section here. +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif + ProcessEvent(*event); + delete event; +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + + node = m_pendingEvents->First(); } -} + +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); #endif +} /* * Event table stuff @@ -607,25 +680,24 @@ void wxEvtHandler::ProcessPendingEvents() bool wxEvtHandler::ProcessEvent(wxEvent& event) { #if wxUSE_GUI - /* check that our flag corresponds to reality */ + // check that our flag corresponds to reality wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) ); #endif // wxUSE_GUI - /* An event handler can be enabled or disabled */ + // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { #if wxUSE_THREADS - /* Check whether we are in a child thread. */ - if (!wxThread::IsMain()) + // Check whether we are in a child thread. + if ( !wxThread::IsMain() ) return ProcessThreadEvent(event); -#endif - /* Handle per-instance dynamic event tables first */ +#endif // wxUSE_THREADS + // Handle per-instance dynamic event tables first if ( m_dynamicEvents && SearchDynamicEventTable(event) ) return TRUE; - /* Then static per-class event tables */ - + // Then static per-class event tables const wxEventTable *table = GetEventTable(); #if wxUSE_GUI && wxUSE_VALIDATORS @@ -732,6 +804,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) } return FALSE; } + void wxEvtHandler::Connect( int id, int lastId, wxEventType eventType, wxObjectEventFunction func, @@ -750,10 +823,37 @@ void wxEvtHandler::Connect( int id, int lastId, m_dynamicEvents->Append( (wxObject*) entry ); } +bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, + wxObjectEventFunction func, + wxObject *userData ) +{ + if (!m_dynamicEvents) + return FALSE; + + wxNode *node = m_dynamicEvents->First(); + while (node) + { + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + if ((entry->m_id == id) && + ((entry->m_lastId == lastId) || (lastId == -1)) && + ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && + ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) && + ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL))) + { + if (entry->m_callbackUserData) delete entry->m_callbackUserData; + m_dynamicEvents->DeleteNode( node ); + delete entry; + return TRUE; + } + node = node->Next(); + } + return FALSE; +} + bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { wxCHECK_MSG( m_dynamicEvents, FALSE, - T("caller should check that we have dynamic events") ); + wxT("caller should check that we have dynamic events") ); int commandId = event.GetId();