X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf91e652859f75b2cc6dea7d473424100ff37d2e..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/evtloop.cpp diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp index 59207e7d8d..424b96c5ab 100644 --- a/src/motif/evtloop.cpp +++ b/src/motif/evtloop.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: motif/evtloop.cpp +// Name: src/motif/evtloop.cpp // Purpose: implements wxEventLoop for Motif // Author: Mattia Barbon // Modified by: // Created: 01.11.02 // RCS-ID: $Id$ // Copyright: (c) 2002 Mattia Barbon -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "evtloop.h" -#endif - #ifdef __VMS #define XtParent XTPARENT #define XtDisplay XTDISPLAY @@ -35,6 +31,7 @@ #include "wx/evtloop.h" #include "wx/event.h" #include "wx/app.h" +#include "wx/window.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -45,6 +42,7 @@ #pragma message enable nosimpint #endif +#include "wx/unix/private.h" #include "wx/motif/private.h" static bool CheckForKeyUp(XEvent* event); @@ -82,9 +80,7 @@ private: static bool SendIdleMessage() { - wxIdleEvent event; - - return wxTheApp->ProcessEvent(event) && event.MoreRequested(); + return wxTheApp->ProcessIdle(); } bool wxEventLoopImpl::SendIdleMessage() @@ -100,25 +96,17 @@ bool wxEventLoopImpl::SendIdleMessage() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoop::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); } -bool wxEventLoop::IsRunning() const -{ - return m_impl != NULL; -} - int wxEventLoop::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 ); @@ -133,8 +121,6 @@ int wxEventLoop::Run() delete m_impl; m_impl = NULL; - ms_activeLoop = oldLoop; - return exitcode; } @@ -168,12 +154,14 @@ bool wxEventLoop::Dispatch() ProcessXEvent( &event ); } else -#ifdef __VMS - XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput ); -#else - XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput|XtIMSignal ); + { + XtAppProcessEvent( context, XtIMTimer | XtIMAlternateInput +#ifdef XtIMSignal + | XtIMSignal #endif - + ); + } + return m_impl ? m_impl->GetKeepGoing() : true; } @@ -233,7 +221,7 @@ void ProcessXEvent(XEvent* event) * window is recieved. Prevents flicker as windows are resized. */ - Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()); + Display *disp = event->xany.display; Window win = event->xany.window; XEvent report; @@ -259,12 +247,12 @@ bool CheckForAccelerator(XEvent* event) { // Find a wxWindow for this window // TODO: should get display for the window, not the current display - Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), + Widget widget = XtWindowToWidget(event->xany.display, event->xany.window); 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) @@ -293,12 +281,12 @@ bool CheckForKeyDown(XEvent* event) { if (event->xany.type == KeyPress) { - Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), - event->xany.window); + Widget widget = XtWindowToWidget(event->xany.display, + event->xany.window); 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) @@ -307,7 +295,7 @@ bool CheckForKeyDown(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_DOWN); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->ProcessEvent( keyEvent ); + return win->GetEventHandler()->ProcessEvent( keyEvent ); } return false; @@ -319,12 +307,12 @@ bool CheckForKeyUp(XEvent* event) { if (event->xany.type == KeyRelease) { - Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), - event->xany.window); + Widget widget = XtWindowToWidget(event->xany.display, + event->xany.window); 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) @@ -333,7 +321,7 @@ bool CheckForKeyUp(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->ProcessEvent( keyEvent ); + return win->GetEventHandler()->ProcessEvent( keyEvent ); } return false; @@ -345,17 +333,27 @@ bool CheckForKeyUp(XEvent* event) bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) { + bool moreRequested, pendingEvents; + + for(;;) + { + pendingEvents = evtLoop.Pending(); + if( pendingEvents ) break; + moreRequested = ::SendIdleMessage(); + if( !moreRequested ) break; + } + #if wxUSE_THREADS - // leave the main loop to give other threads a chance to - // perform their GUI work - wxMutexGuiLeave(); - wxUsleep(20); - wxMutexGuiEnter(); + if( !pendingEvents && !moreRequested ) + { + // leave the main loop to give other threads a chance to + // perform their GUI work + wxMutexGuiLeave(); + wxMilliSleep(20); + wxMutexGuiEnter(); + } #endif - while ( !evtLoop.Pending() && ::SendIdleMessage() ) - ; - if( !evtLoop.Dispatch() ) return false; @@ -381,7 +379,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) #include #include -static XtInputId inputId; static int idleFds[2] = { -1, -1 }; class wxIdlePipeModule : public wxModule @@ -391,9 +388,11 @@ public: virtual bool OnInit() { + // Must be done before modules are initialized +#if 0 if( pipe(idleFds) != 0 ) return false; - +#endif return true; } @@ -403,10 +402,10 @@ public: close( idleFds[1] ); } private: - DECLARE_DYNAMIC_CLASS(wxIdlePipeModule); + DECLARE_DYNAMIC_CLASS(wxIdlePipeModule) }; -IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule); +IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule) static void wxInputCallback( XtPointer, int* fd, XtInputId* ) { @@ -421,8 +420,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; @@ -433,7 +432,7 @@ static void wxInputCallback( XtPointer, int* fd, XtInputId* ) static void wxBreakDispatch() { - char dummy; + char dummy = 0; // for valgrind // check if wxWakeUpIdle has already been called fd_set in; @@ -442,8 +441,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; @@ -452,19 +451,29 @@ static void wxBreakDispatch() write( idleFds[1], &dummy, 1 ); } -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { ::wxBreakDispatch(); } +bool wxInitIdleFds() +{ + if( pipe(idleFds) != 0 ) + return false; + return true; +} + 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; }