X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d284c07534af75014345a80363a7036897b5e388..169adfa9c4b781f737920bc808da91cd926c3e36:/src/msw/evtloop.cpp diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index 80be767371..54ac1c55cd 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "evtloop.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -44,53 +40,18 @@ #if wxUSE_THREADS #include "wx/thread.h" - // define the array of MSG strutures - WX_DECLARE_OBJARRAY(MSG, wxMsgArray); + // define the list of MSG strutures + WX_DECLARE_LIST(MSG, wxMsgList); - #include "wx/arrimpl.cpp" + #include "wx/listimpl.cpp" - WX_DEFINE_OBJARRAY(wxMsgArray); + WX_DEFINE_LIST(wxMsgList) #endif // wxUSE_THREADS -// ---------------------------------------------------------------------------- -// wxEventLoopImpl -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxEventLoopImpl -{ -public: - // ctor - wxEventLoopImpl() { m_exitcode = 0; m_shouldExit = false; } - - // process a message - void ProcessMessage(MSG *msg); - - // generate an idle message, return TRUE if more idle time requested - bool SendIdleMessage(); - - // set/get the exit code - void Exit(int exitcode) { m_exitcode = exitcode; m_shouldExit = true; } - int GetExitCode() const { return m_exitcode; } - bool ShouldExit() const { return m_shouldExit; } - -private: - // preprocess a message, return TRUE if processed (i.e. no further - // dispatching required) - bool PreProcessMessage(MSG *msg); - - // the exit code of the event loop - int m_exitcode; - - // true if we were asked to terminate - bool m_shouldExit; -}; - // ---------------------------------------------------------------------------- // helper class // ---------------------------------------------------------------------------- -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl); - // this object sets the wxEventLoop given to the ctor as the currently active // one and unsets it in its dtor class wxEventLoopActivator @@ -116,14 +77,27 @@ private: }; // ============================================================================ -// wxEventLoopImpl implementation +// wxEventLoop implementation // ============================================================================ +wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; +wxWindowMSW *wxEventLoop::ms_winCritical = NULL; + // ---------------------------------------------------------------------------- -// wxEventLoopImpl message processing +// ctor/dtor // ---------------------------------------------------------------------------- -void wxEventLoopImpl::ProcessMessage(MSG *msg) +wxEventLoop::wxEventLoop() +{ + m_shouldExit = false; + m_exitcode = 0; +} + +// ---------------------------------------------------------------------------- +// wxEventLoop message processing +// ---------------------------------------------------------------------------- + +void wxEventLoop::ProcessMessage(WXMSG *msg) { // give us the chance to preprocess the message first if ( !PreProcessMessage(msg) ) @@ -134,18 +108,32 @@ void wxEventLoopImpl::ProcessMessage(MSG *msg) } } -bool wxEventLoopImpl::PreProcessMessage(MSG *msg) +bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win) +{ + while ( win ) + { + if ( win == ms_winCritical ) + return true; + + win = win->GetParent(); + } + + return false; +} + +bool wxEventLoop::PreProcessMessage(WXMSG *msg) { HWND hwnd = msg->hwnd; - wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); + wxWindow * const wndThis = wxGetWindowFromHWND((WXHWND)hwnd); + wxWindow *wnd; - // this may happen if the event occured in a standard modeless dialog (the + // this may happen if the event occurred in a standard modeless dialog (the // only example of which I know of is the find/replace dialog) - then call // IsDialogMessage() to make TAB navigation in it work if ( !wndThis ) { // we need to find the dialog containing this control as - // IsDialogMessage() just eats all the messages (i.e. returns TRUE for + // IsDialogMessage() just eats all the messages (i.e. returns true for // them) if we call it for the control itself while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ) { @@ -155,6 +143,17 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg) return hwnd && ::IsDialogMessage(hwnd, msg) != 0; } + if ( !AllowProcessing(wndThis) ) + { + // not a child of critical window, so we eat the event but take care to + // stop an endless stream of WM_PAINTs which would have resulted if we + // didn't validate the invalidated part of the window + if ( msg->message == WM_PAINT ) + ::ValidateRect(hwnd, NULL); + + return true; + } + #if wxUSE_TOOLTIPS // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to // popup the tooltip bubbles @@ -173,16 +172,14 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg) // grab Ctrl-C/V/X, even if they are also accelerators in some parent) if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) ) { - return FALSE; + return false; } // try translations first: the accelerators override everything - wxWindow *wnd; - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWTranslateMessage((WXMSG *)msg)) - return TRUE; + return true; // stop at first top level window, i.e. don't try to process the key // strokes originating in a dialog using the accelerators of the parent @@ -191,46 +188,33 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg) break; } - // now try the other hooks (kbd navigation is handled here): we start from - // wndThis->GetParent() because wndThis->MSWProcessMessage() was already - // called above - for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() ) + // now try the other hooks (kbd navigation is handled here) + for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { - if ( wnd->MSWProcessMessage((WXMSG *)msg) ) - return TRUE; + if (wnd != wndThis) // Skip the first since wndThis->MSWProcessMessage() was called above + { + if ( wnd->MSWProcessMessage((WXMSG *)msg) ) + return true; + } + + // Stop at first top level window (as per comment above). + // If we don't do this, pressing ESC on a modal dialog shown as child of a modal + // dialog with wxID_CANCEL will cause the parent dialog to be closed, for example + if (wnd->IsTopLevel()) + break; } // no special preprocessing for this message, dispatch it normally - return FALSE; -} - -// ---------------------------------------------------------------------------- -// wxEventLoopImpl idle event processing -// ---------------------------------------------------------------------------- - -bool wxEventLoopImpl::SendIdleMessage() -{ - return wxTheApp && wxTheApp->ProcessIdle(); + return false; } -// ============================================================================ -// wxEventLoop implementation -// ============================================================================ - -wxEventLoop *wxEventLoop::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop::~wxEventLoop() -{ - wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); -} - bool wxEventLoop::IsRunning() const { - return m_impl != NULL; + return ms_activeLoop == this; } int wxEventLoop::Run() @@ -238,11 +222,10 @@ 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") ); - // SendIdleMessage() and Dispatch() below may throw so the code here should + // ProcessIdle() and Dispatch() below may throw so the code here should // be exception-safe, hence we must use local objects for all actions we // should undo wxEventLoopActivator activate(&ms_activeLoop, this); - wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl); // we must ensure that OnExit() is called even if an exception is thrown // from inside Dispatch() but we must call it from Exit() in normal @@ -265,13 +248,13 @@ int wxEventLoop::Run() // generate and process idle events for as long as we don't // have anything else to do - while ( !Pending() && m_impl->SendIdleMessage() ) + while ( !Pending() && (wxTheApp && wxTheApp->ProcessIdle()) ) ; // if the "should exit" flag is set, the loop should terminate // but not before processing any remaining messages so while // Pending() returns true, do process them - if ( m_impl->ShouldExit() ) + if ( m_shouldExit ) { while ( Pending() ) Dispatch(); @@ -315,14 +298,15 @@ int wxEventLoop::Run() } #endif // wxUSE_EXCEPTIONS - return m_impl->GetExitCode(); + return m_exitcode; } void wxEventLoop::Exit(int rc) { wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); - m_impl->Exit(rc); + m_exitcode = rc; + m_shouldExit = true; OnExit(); @@ -348,7 +332,7 @@ bool wxEventLoop::Pending() const bool wxEventLoop::Dispatch() { - wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") ); + wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") ); MSG msg; BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0); @@ -356,7 +340,7 @@ bool wxEventLoop::Dispatch() if ( rc == 0 ) { // got WM_QUIT - return FALSE; + return false; } if ( rc == -1 ) @@ -365,31 +349,32 @@ bool wxEventLoop::Dispatch() wxLogLastError(wxT("GetMessage")); // still break from the loop - return FALSE; + return false; } #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), wxT("only the main thread can process Windows messages") ); - static bool s_hadGuiLock = TRUE; - static wxMsgArray s_aSavedMessages; + static bool s_hadGuiLock = true; + static wxMsgList s_aSavedMessages; // if a secondary thread owning the mutex is doing GUI calls, save all // messages for later processing - we can't process them right now because // it will lead to recursive library calls (and we're not reentrant) if ( !wxGuiOwnedByMainThread() ) { - s_hadGuiLock = FALSE; + s_hadGuiLock = false; // leave out WM_COMMAND messages: too dangerous, sometimes // the message will be processed twice if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND ) { - s_aSavedMessages.Add(msg); + MSG* pMsg = new MSG(msg); + s_aSavedMessages.Append(pMsg); } - return TRUE; + return true; } else { @@ -400,22 +385,25 @@ bool wxEventLoop::Dispatch() // messages normally - expect some things to break... if ( !s_hadGuiLock ) { - s_hadGuiLock = TRUE; + s_hadGuiLock = true; - size_t count = s_aSavedMessages.Count(); - for ( size_t n = 0; n < count; n++ ) + wxMsgList::compatibility_iterator node = s_aSavedMessages.GetFirst(); + while (node) { - MSG& msg = s_aSavedMessages[n]; - m_impl->ProcessMessage(&msg); - } + MSG* pMsg = node->GetData(); + s_aSavedMessages.Erase(node); + + ProcessMessage(pMsg); + delete pMsg; - s_aSavedMessages.Empty(); + node = s_aSavedMessages.GetFirst(); + } } } #endif // wxUSE_THREADS - m_impl->ProcessMessage(&msg); + ProcessMessage(&msg); - return TRUE; + return true; }