X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ca375c5620209d77a88d2d378bdcdedbc82e7e..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/x11/evtloop.cpp diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index f718baab53..146fabde14 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -6,7 +6,7 @@ // Created: 01.06.01 // RCS-ID: $Id$ // Copyright: (c) 2002 Julian Smart -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -29,16 +29,16 @@ #include "wx/module.h" #endif -#include "wx/private/selectdispatcher.h" +#include "wx/private/fdiodispatcher.h" #include "wx/unix/private.h" #include "wx/x11/private.h" -#include "X11/Xlib.h" #include "wx/generic/private/timer.h" #if wxUSE_THREADS #include "wx/thread.h" #endif +#include #include #include @@ -98,31 +98,8 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event) return false; } -bool wxEventLoopImpl::PreProcessEvent(XEvent *event) +bool wxEventLoopImpl::PreProcessEvent(XEvent *WXUNUSED(event)) { - // TODO -#if 0 - HWND hWnd = msg->hwnd; - wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd); - - - // try translations first; find the youngest window with a translation - // table. - wxWindow *wnd; - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) - { - if ( wnd->MSWTranslateMessage((WXMSG *)msg) ) - return true; - } - - // Anyone for a non-translation message? Try youngest descendants first. - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) - { - if ( wnd->MSWProcessMessage((WXMSG *)msg) ) - return true; - } -#endif - return false; } @@ -143,15 +120,15 @@ bool wxEventLoopImpl::SendIdleEvent() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop::~wxEventLoop() +wxGUIEventLoop::~wxGUIEventLoop() { - wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); + wxASSERT_MSG( !m_impl, wxT("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") ); + wxCHECK_MSG( !m_impl, -1, wxT("can't reenter a message loop") ); m_impl = new wxEventLoopImpl; @@ -185,36 +162,37 @@ int wxEventLoop::Run() OnExit(); int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; + wxDELETE(m_impl); return exitcode; } -void wxEventLoop::Exit(int rc) +void wxGUIEventLoop::Exit(int rc) { - wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); - - m_impl->SetExitCode(rc); - m_impl->m_keepGoing = false; + if ( m_impl ) + { + m_impl->SetExitCode(rc); + m_impl->m_keepGoing = false; + } } // ---------------------------------------------------------------------------- // wxEventLoop message processing dispatching // ---------------------------------------------------------------------------- -bool wxEventLoop::Pending() const +bool wxGUIEventLoop::Pending() const { XFlush( wxGlobalDisplay() ); return (XPending( wxGlobalDisplay() ) > 0); } -bool wxEventLoop::Dispatch() +bool wxGUIEventLoop::Dispatch() { - XEvent event; + // see comment in wxEventLoopManual::ProcessEvents() + if ( wxTheApp ) + wxTheApp->ProcessPendingEvents(); - // Start off by checking if any of our child processes have finished. - wxCheckForFinishedChildren(); + XEvent event; // TODO allowing for threads, as per e.g. wxMSW @@ -253,7 +231,7 @@ bool wxEventLoop::Dispatch() // An X11 event was pending, get it if (wxFD_ISSET( fd, &readset )) XNextEvent( wxGlobalDisplay(), &event ); - } + } #endif } else @@ -263,9 +241,39 @@ bool wxEventLoop::Dispatch() #if wxUSE_SOCKETS // handle any pending socket events: - wxSelectDispatcher::Get().RunLoop(0); + wxFDIODispatcher::DispatchPending(); #endif (void) m_impl->ProcessEvent( &event ); return true; } + +bool wxGUIEventLoop::YieldFor(long eventsToProcess) +{ + // Sometimes only 2 yields seem + // to do the trick, e.g. in the + // progress dialog + int i; + for (i = 0; i < 2; i++) + { + m_isInsideYield = true; + m_eventsToProcessInsideYield = eventsToProcess; + + // Call dispatch at least once so that sockets + // can be tested + wxTheApp->Dispatch(); + + // TODO: implement event filtering using the eventsToProcess mask + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); + +#if wxUSE_TIMER + wxGenericTimerImpl::NotifyTimers(); +#endif + ProcessIdle(); + + m_isInsideYield = false; + } + + return true; +}