X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e23e2d59a25a7eae5ca16958877be59f7eeb33b..b879becf6af686ab38d1c67799d837c64fb4833d:/src/motif/evtloop.cpp diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp index d92da8a1eb..a3994827f8 100644 --- a/src/motif/evtloop.cpp +++ b/src/motif/evtloop.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: motif/evtloop.cpp +// Name: src/motif/evtloop.cpp // Purpose: implements wxEventLoop for Motif // Author: Mattia Barbon // Modified by: @@ -17,37 +17,35 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "evtloop.h" -#endif - -#ifdef __VMS -#define XtParent XTPARENT -#define XtDisplay XTDISPLAY -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/event.h" + #include "wx/app.h" + #include "wx/window.h" + #include "wx/module.h" #endif //WX_PRECOMP #include "wx/evtloop.h" -#include "wx/event.h" -#include "wx/app.h" -#include "wx/window.h" +#include "wx/thread.h" #ifdef __VMS__ -#pragma message disable nosimpint + #pragma message disable nosimpint #endif #include #include #ifdef __VMS__ -#pragma message enable nosimpint + #pragma message enable nosimpint #endif +#include "wx/unix/private.h" #include "wx/motif/private.h" +#ifdef HAVE_SYS_SELECT_H +# include +#endif + static bool CheckForKeyUp(XEvent* event); static bool CheckForKeyDown(XEvent* event); static bool CheckForAccelerator(XEvent* event); @@ -99,20 +97,17 @@ bool wxEventLoopImpl::SendIdleMessage() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - -wxEventLoop::~wxEventLoop() +wxGUIEventLoop::~wxGUIEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); } -int wxEventLoop::Run() +int wxGUIEventLoop::Run() { // event loops are not recursive, you need to create another loop! wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") ); - wxEventLoop *oldLoop = ms_activeLoop; - ms_activeLoop = this; + wxEventLoopActivator activate(this); m_impl = new wxEventLoopImpl; m_impl->SetKeepGoing( true ); @@ -123,16 +118,16 @@ int wxEventLoop::Run() break; } + OnExit(); + int exitcode = m_impl->GetExitCode(); delete m_impl; m_impl = NULL; - ms_activeLoop = oldLoop; - return exitcode; } -void wxEventLoop::Exit(int rc) +void wxGUIEventLoop::Exit(int rc) { wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); @@ -142,16 +137,30 @@ void wxEventLoop::Exit(int rc) ::wxBreakDispatch(); } +bool wxGUIEventLoop::YieldFor(long eventsToProcess) +{ + m_isInsideYield = true; + m_eventsToProcessInsideYield = eventsToProcess; + + while (wxTheApp && wxTheApp->Pending()) + // TODO: implement event filtering using the eventsToProcess mask + wxTheApp->Dispatch(); + + m_isInsideYield = false; + + return true; +} + // ---------------------------------------------------------------------------- // wxEventLoop message processing dispatching // ---------------------------------------------------------------------------- -bool wxEventLoop::Pending() const +bool wxGUIEventLoop::Pending() const { return XtAppPending( (XtAppContext)wxTheApp->GetAppContext() ) != 0; } -bool wxEventLoop::Dispatch() +bool wxGUIEventLoop::Dispatch() { XEvent event; XtAppContext context = (XtAppContext)wxTheApp->GetAppContext(); @@ -260,7 +269,7 @@ bool CheckForAccelerator(XEvent* event) wxWindow* win = NULL; // Find the first wxWindow that corresponds to this event window - while (widget && !(win = wxGetWindowFromTable(widget))) + while (widget && ((win = wxGetWindowFromTable(widget))!=NULL)) widget = XtParent(widget); if (!widget || !win) @@ -294,7 +303,7 @@ bool CheckForKeyDown(XEvent* event) wxWindow* win = NULL; // Find the first wxWindow that corresponds to this event window - while (widget && !(win = wxGetWindowFromTable(widget))) + while (widget && ((win = wxGetWindowFromTable(widget))!=NULL)) widget = XtParent(widget); if (!widget || !win) @@ -303,7 +312,7 @@ bool CheckForKeyDown(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_DOWN); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->GetEventHandler()->ProcessEvent( keyEvent ); + return win->HandleWindowEvent( keyEvent ); } return false; @@ -320,7 +329,7 @@ bool CheckForKeyUp(XEvent* event) wxWindow* win = NULL; // Find the first wxWindow that corresponds to this event window - while (widget && !(win = wxGetWindowFromTable(widget))) + while (widget && ((win = wxGetWindowFromTable(widget))!=NULL)) widget = XtParent(widget); if (!widget || !win) @@ -329,7 +338,7 @@ bool CheckForKeyUp(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->GetEventHandler()->ProcessEvent( keyEvent ); + return win->HandleWindowEvent( keyEvent ); } return false; @@ -339,7 +348,7 @@ bool CheckForKeyUp(XEvent* event) // executes one main loop iteration (declared in include/wx/motif/private.h) // ---------------------------------------------------------------------------- -bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) +bool wxDoEventLoopIteration( wxGUIEventLoop& evtLoop ) { bool moreRequested, pendingEvents; @@ -381,13 +390,10 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) // also wxEventLoop::Exit is implemented that way, so that exiting an // event loop won't require an event being in the queue -#include "wx/module.h" - #include #include #include -static XtInputId inputId; static int idleFds[2] = { -1, -1 }; class wxIdlePipeModule : public wxModule @@ -414,7 +420,7 @@ private: DECLARE_DYNAMIC_CLASS(wxIdlePipeModule) }; -IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule); +IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule) static void wxInputCallback( XtPointer, int* fd, XtInputId* ) { @@ -429,8 +435,8 @@ static void wxInputCallback( XtPointer, int* fd, XtInputId* ) timeout.tv_sec = 0; timeout.tv_usec = 0; - FD_ZERO( &in ); - FD_SET( *fd, &in ); + wxFD_ZERO( &in ); + wxFD_SET( *fd, &in ); if( select( *fd + 1, &in, NULL, NULL, &timeout ) <= 0 ) break; @@ -450,8 +456,8 @@ static void wxBreakDispatch() timeout.tv_sec = 0; timeout.tv_usec = 0; - FD_ZERO( &in ); - FD_SET( idleFds[0], &in ); + wxFD_ZERO( &in ); + wxFD_SET( idleFds[0], &in ); if( select( idleFds[0] + 1, &in, NULL, NULL, &timeout ) > 0 ) return; @@ -476,14 +482,13 @@ bool wxAddIdleCallback() { if (!wxInitIdleFds()) return false; - + // install input handler for wxWakeUpIdle - inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(), - idleFds[0], - (XtPointer)XtInputReadMask, - wxInputCallback, - NULL ); + XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(), + idleFds[0], + (XtPointer)XtInputReadMask, + wxInputCallback, + NULL); return true; } -