X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac16633fdcfbd3f00d8bf1601a878819d6c20546..e75390d4aa51b46b9217dc4699267c1345893054:/src/msw/evtloop.cpp diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index 0b5530ff70..6d8ecdd7c2 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -24,18 +24,20 @@ #pragma hdrstop #endif +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #if wxUSE_GUI #include "wx/window.h" #endif #include "wx/app.h" + #include "wx/log.h" #endif //WX_PRECOMP -#include "wx/evtloop.h" #include "wx/thread.h" #include "wx/except.h" -#include "wx/ptr_scpd.h" #include "wx/msw/private.h" +#include "wx/scopeguard.h" #if wxUSE_GUI #include "wx/tooltip.h" @@ -77,8 +79,6 @@ bool wxMSWEventLoopBase::Pending() const bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg) { - wxCHECK_MSG( IsRunning(), false, _T("can't get messages if not running") ); - const BOOL rc = ::GetMessage(msg, NULL, 0, 0); if ( rc == 0 ) @@ -359,16 +359,203 @@ void wxGUIEventLoop::WakeUp() ::PostMessage(NULL, WM_NULL, 0, 0); } -#else // !wxUSE_GUI -#if wxUSE_CONSOLE_EVENTLOOP +// ---------------------------------------------------------------------------- +// Yield to incoming messages +// ---------------------------------------------------------------------------- + +#include +WX_DEFINE_OBJARRAY(wxMSGArray); -void wxConsoleEventLoop::OnNextIteration() +bool wxGUIEventLoop::YieldFor(long eventsToProcess) { - if ( wxTheApp ) + // set the flag and don't forget to reset it before returning + m_isInsideYield = true; + m_eventsToProcessInsideYield = eventsToProcess; + + wxON_BLOCK_EXIT_SET(m_isInsideYield, false); + +#if wxUSE_LOG + // disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + wxLog::Suspend(); + + // ensure the logs will be flashed again when we exit + wxON_BLOCK_EXIT0(wxLog::Resume); +#endif // wxUSE_LOG + + // we don't want to process WM_QUIT from here - it should be processed in + // the main event loop in order to stop it + MSG msg; + int nPaintsReceived = 0; + while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && + msg.message != WM_QUIT ) + { +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS + + if (msg.message == WM_PAINT) + { + // NOTE: WM_PAINTs are categorized as wxEVT_CATEGORY_UI + if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0) + { + // this msg is not going to be dispatched... + // however WM_PAINT is special: until there are damaged + // windows, Windows will keep sending it forever! + if (nPaintsReceived > 10) + { + // we got 10 WM_PAINT consecutive messages... + // we must have reached the tail of the message queue: + // we're now getting _only_ WM_PAINT events and this will + // continue forever (since we don't dispatch them + // because of the user-specified eventsToProcess mask)... + // break out of this loop! + break; + } + else + nPaintsReceived++; + } + //else: we're going to dispatch it below, + // so we don't need to take any special action + } + else + { + // reset the counter of consecutive WM_PAINT messages received: + nPaintsReceived = 0; + } + + // choose a wxEventCategory for this Windows message + wxEventCategory cat; + switch (msg.message) + { +#if !defined(__WXWINCE__) + case WM_NCMOUSEMOVE: + + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONUP: + case WM_NCLBUTTONDBLCLK: + case WM_NCRBUTTONDOWN: + case WM_NCRBUTTONUP: + case WM_NCRBUTTONDBLCLK: + case WM_NCMBUTTONDOWN: + case WM_NCMBUTTONUP: + case WM_NCMBUTTONDBLCLK: +#endif + + case WM_KEYDOWN: + case WM_KEYUP: + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: +#ifdef WM_UNICHAR + case WM_UNICHAR: +#endif + case WM_HOTKEY: + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_COMMAND: + case WM_SYSCOMMAND: + + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: + case WM_IME_CHAR: + case WM_IME_KEYDOWN: + case WM_IME_KEYUP: + +#if !defined(__WXWINCE__) + case WM_MOUSEHOVER: + case WM_MOUSELEAVE: +#endif +#ifdef WM_NCMOUSELEAVE + case WM_NCMOUSELEAVE: +#endif + + case WM_CUT: + case WM_COPY: + case WM_PASTE: + case WM_CLEAR: + case WM_UNDO: + + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_LBUTTONDBLCLK: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_RBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MBUTTONDBLCLK: + case WM_MOUSEWHEEL: + cat = wxEVT_CATEGORY_USER_INPUT; + break; + + case WM_TIMER: + cat = wxEVT_CATEGORY_TIMER; + break; + + default: + if (msg.message < WM_USER) + { + // 0;WM_USER-1 is the range of message IDs reserved for use + // by the system. + // there are too many of these types of messages to handle + // them in this switch + cat = wxEVT_CATEGORY_UI; + } + else + cat = wxEVT_CATEGORY_UNKNOWN; + } + + // should we process this event now? + if (cat & eventsToProcess) + { + if ( !wxTheApp->Dispatch() ) + break; + } + else + { + // remove the message and store it + ::GetMessage(&msg, NULL, 0, 0); + m_arrMSG.Add(msg); + } + } + + // if there are pending events, we must process them. + if (wxTheApp) wxTheApp->ProcessPendingEvents(); + + // put back unprocessed events in the queue + DWORD id = GetCurrentThreadId(); + for (size_t i=0; imessage == WM_TIMER ) - { - TIMERPROC proc = (TIMERPROC)msg->lParam; - if ( proc ) - (*proc)(NULL, 0, msg->wParam, 0); - } - else - { - ::DispatchMessage(msg); - } + ::DispatchMessage(msg); } bool wxConsoleEventLoop::Dispatch()