X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48da7d0ba891d2e6d2f326a5122b92bae2fdf1fc..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 1813d7b4cf..795bbef448 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -6,9 +6,17 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "event.h" #endif @@ -22,46 +30,60 @@ #ifndef WX_PRECOMP #include "wx/defs.h" - #include "wx/control.h" - #include "wx/utils.h" #include "wx/app.h" - #include "wx/dc.h" + #include "wx/list.h" + + #if wxUSE_GUI + #include "wx/control.h" + #include "wx/utils.h" + #include "wx/dc.h" + #endif // wxUSE_GUI #endif #include "wx/event.h" -#include "wx/validate.h" + +#if wxUSE_GUI + #include "wx/validate.h" +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) + + #if wxUSE_GUI + IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) + #endif // wxUSE_GUI const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; } @@ -74,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, @@ -102,7 +138,7 @@ wxEvent::wxEvent(int theId) void wxEvent::CopyObject(wxObject& object_dest) const { - wxEvent *obj = (wxEvent *)&object_dest; + wxEvent *obj = (wxEvent *)&object_dest; wxObject::CopyObject(object_dest); obj->m_eventType = m_eventType; @@ -114,6 +150,8 @@ void wxEvent::CopyObject(wxObject& object_dest) const obj->m_isCommandEvent = m_isCommandEvent; } +#if wxUSE_GUI + /* * Command events * @@ -127,13 +165,13 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) m_extraLong = 0; m_commandInt = 0; m_id = theId; - m_commandString = (wxChar *) NULL; + m_commandString = wxEmptyString; m_isCommandEvent = TRUE; } void wxCommandEvent::CopyObject(wxObject& obj_d) const { - wxCommandEvent *obj = (wxCommandEvent *)&obj_d; + wxCommandEvent *obj = (wxCommandEvent *)&obj_d; wxEvent::CopyObject(obj_d); @@ -170,6 +208,16 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, m_commandInt = pos; } +void wxScrollWinEvent::CopyObject(wxObject& obj_d) const +{ + wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; + + wxEvent::CopyObject(obj_d); + + obj->m_extraLong = m_extraLong; + obj->m_commandInt = m_commandInt; +} + /* * Mouse events * @@ -221,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; @@ -242,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; @@ -262,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; @@ -273,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: @@ -281,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; @@ -299,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; @@ -398,7 +446,7 @@ void wxCloseEvent::CopyObject(wxObject& obj_d) const #endif obj->m_canVeto = m_canVeto; } - + void wxShowEvent::CopyObject(wxObject& obj_d) const { wxShowEvent *obj = (wxShowEvent *)&obj_d; @@ -417,7 +465,7 @@ void wxJoystickEvent::CopyObject(wxObject& obj_d) const obj->m_buttonChange = m_buttonChange; obj->m_buttonState = m_buttonState; obj->m_joyStick = m_joyStick; -} +} void wxDropFilesEvent::CopyObject(wxObject& obj_d) const { @@ -427,15 +475,7 @@ void wxDropFilesEvent::CopyObject(wxObject& obj_d) const obj->m_noFiles = m_noFiles; obj->m_pos = m_pos; // TODO: Problem with obj->m_files. It should be deallocated by the - // destructor of the event. -} - -void wxIdleEvent::CopyObject(wxObject& obj_d) const -{ - wxIdleEvent *obj = (wxIdleEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_requestMore = m_requestMore; + // destructor of the event. } void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const @@ -479,6 +519,16 @@ wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) SetEventObject(win); } +#endif // wxUSE_GUI + +void wxIdleEvent::CopyObject(wxObject& obj_d) const +{ + wxIdleEvent *obj = (wxIdleEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_requestMore = m_requestMore; +} + /* * Event handler */ @@ -490,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() @@ -518,62 +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 -#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 @@ -581,26 +679,28 @@ void wxEvtHandler::ProcessPendingEvents() bool wxEvtHandler::ProcessEvent(wxEvent& event) { +#if wxUSE_GUI // check that our flag corresponds to reality wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) ); +#endif // wxUSE_GUI // 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 - const wxEventTable *table = GetEventTable(); +#if wxUSE_GUI && wxUSE_VALIDATORS // Try the associated validator first, if this is a window. // Problem: if the event handler of the window has been replaced, // this wxEvtHandler may no longer be a window. @@ -609,7 +709,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) // THIS CAN BE CURED if PushEventHandler is used instead of // SetEventHandler, and then processing will be passed down the // chain of event handlers. - if ( m_isWindow ) + if (m_isWindow) { wxWindow *win = (wxWindow *)this; @@ -624,9 +724,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) } } } +#endif // Search upwards through the inheritance hierarchy - while ( table ) + while (table) { if ( SearchEventTable((wxEventTable&)*table, event) ) return TRUE; @@ -641,6 +742,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) return TRUE; } +#if wxUSE_GUI // Carry on up the parent-child hierarchy, // but only if event is a command event: it wouldn't // make sense for a parent to receive a child's size event, for example @@ -651,6 +753,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) if (parent && !parent->IsBeingDeleted()) return parent->GetEventHandler()->ProcessEvent(event); } +#endif // wxUSE_GUI // Last try - application object. if ( wxTheApp && (this != wxTheApp) ) @@ -701,6 +804,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) } return FALSE; } + void wxEvtHandler::Connect( int id, int lastId, wxEventType eventType, wxObjectEventFunction func, @@ -719,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(); @@ -766,6 +897,8 @@ bool wxEvtHandler::OnClose() } #endif // WXWIN_COMPATIBILITY +#if wxUSE_GUI + // Find a window with the focus, that is also a descendant of the given window. // This is used to determine the window to initially send commands to. wxWindow* wxFindFocusDescendant(wxWindow* ancestor) @@ -789,3 +922,4 @@ wxWindow* wxFindFocusDescendant(wxWindow* ancestor) return focusWin; } +#endif // wxUSE_GUI