X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dde19c2180ef8d6415af7bb2492bfcb0a2d5c7e4..a8a3ccb853083fef8c96ba7cb422790a8852dbde:/src/gtk/evtloop.cpp diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 0096351d1e..1c656d5661 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -25,12 +25,15 @@ #endif #include "wx/evtloop.h" +#include "wx/evtloopsrc.h" #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/log.h" #endif // WX_PRECOMP #include +#include // ============================================================================ // wxEventLoop implementation @@ -80,6 +83,84 @@ void wxGUIEventLoop::WakeUp() wxTheApp->WakeUpIdle(); } +// ---------------------------------------------------------------------------- +// wxEventLoop adding & removing sources +// ---------------------------------------------------------------------------- + +#if wxUSE_EVENTLOOP_SOURCE + +extern "C" +{ +static gboolean wx_on_channel_event(GIOChannel *channel, + GIOCondition condition, + gpointer data) +{ + wxLogTrace(wxTRACE_EVT_SOURCE, + "wx_on_channel_event, fd=%d, condition=%08x", + g_io_channel_unix_get_fd(channel), condition); + + wxEventLoopSourceHandler * const + handler = static_cast(data); + + if (condition & G_IO_IN || condition & G_IO_PRI) + handler->OnReadWaiting(); + if (condition & G_IO_OUT) + handler->OnWriteWaiting(); + else if (condition & G_IO_ERR || condition & G_IO_NVAL) + handler->OnExceptionWaiting(); + + // we never want to remove source here, so always return true + return TRUE; +} +} + +wxEventLoopSource * +wxGUIEventLoop::AddSourceForFD(int fd, + wxEventLoopSourceHandler *handler, + int flags) +{ + wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); + + int condition = 0; + if (flags & wxEVENT_SOURCE_INPUT) + condition |= G_IO_IN | G_IO_PRI; + if (flags & wxEVENT_SOURCE_OUTPUT) + condition |= G_IO_OUT; + if (flags & wxEVENT_SOURCE_EXCEPTION) + condition |= G_IO_ERR | G_IO_HUP | G_IO_NVAL; + + GIOChannel* channel = g_io_channel_unix_new(fd); + const unsigned sourceId = g_io_add_watch + ( + channel, + (GIOCondition)condition, + &wx_on_channel_event, + handler + ); + // it was ref'd by g_io_add_watch() so we can unref it here + g_io_channel_unref(channel); + + if ( !sourceId ) + return NULL; + + wxLogTrace(wxTRACE_EVT_SOURCE, + "Adding event loop source for fd=%d with GTK id=%u", + fd, sourceId); + + + return new wxGTKEventLoopSource(sourceId, handler, flags); +} + +wxGTKEventLoopSource::~wxGTKEventLoopSource() +{ + wxLogTrace(wxTRACE_EVT_SOURCE, + "Removing event loop source with GTK id=%u", m_sourceId); + + g_source_remove(m_sourceId); +} + +#endif // wxUSE_EVENTLOOP_SOURCE + // ---------------------------------------------------------------------------- // wxEventLoop message processing dispatching // ---------------------------------------------------------------------------- @@ -97,7 +178,7 @@ bool wxGUIEventLoop::Pending() const bool wxGUIEventLoop::Dispatch() { - wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") ); + wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") ); // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called return !gtk_main_iteration(); @@ -132,6 +213,95 @@ int wxGUIEventLoop::DispatchTimeout(unsigned long timeout) // YieldFor //----------------------------------------------------------------------------- +extern "C" { +static void wxgtk_main_do_event(GdkEvent* event, void* data) +{ + // categorize the GDK event according to wxEventCategory. + // See http://library.gnome.org/devel/gdk/unstable/gdk-Events.html#GdkEventType + // for more info. + + // NOTE: GDK_* constants which were not present in the GDK2.0 can be tested for + // only at compile-time; when running the program (compiled with a recent GDK) + // on a system with an older GDK lib we can be sure there won't be problems + // because event->type will never assume those values corresponding to + // new event types (since new event types are always added in GDK with non + // conflicting values for ABI compatibility). + + wxEventCategory cat = wxEVT_CATEGORY_UNKNOWN; + switch (event->type) + { + case GDK_SELECTION_REQUEST: + case GDK_SELECTION_NOTIFY: + case GDK_SELECTION_CLEAR: +#if GTK_CHECK_VERSION(2,6,0) + case GDK_OWNER_CHANGE: +#endif + cat = wxEVT_CATEGORY_CLIPBOARD; + break; + + case GDK_KEY_PRESS: + case GDK_KEY_RELEASE: + case GDK_BUTTON_PRESS: + case GDK_2BUTTON_PRESS: + case GDK_3BUTTON_PRESS: + case GDK_BUTTON_RELEASE: + case GDK_SCROLL: // generated from mouse buttons + case GDK_CLIENT_EVENT: + cat = wxEVT_CATEGORY_USER_INPUT; + break; + + case GDK_PROXIMITY_IN: + case GDK_PROXIMITY_OUT: + + case GDK_MOTION_NOTIFY: + case GDK_ENTER_NOTIFY: + case GDK_LEAVE_NOTIFY: + case GDK_VISIBILITY_NOTIFY: + case GDK_PROPERTY_NOTIFY: + + case GDK_FOCUS_CHANGE: + case GDK_CONFIGURE: + case GDK_WINDOW_STATE: + case GDK_SETTING: + case GDK_DELETE: + case GDK_DESTROY: + + case GDK_EXPOSE: + case GDK_NO_EXPOSE: + case GDK_MAP: + case GDK_UNMAP: + + case GDK_DRAG_ENTER: + case GDK_DRAG_LEAVE: + case GDK_DRAG_MOTION: + case GDK_DRAG_STATUS: + case GDK_DROP_START: + case GDK_DROP_FINISHED: +#if GTK_CHECK_VERSION(2,8,0) + case GDK_GRAB_BROKEN: +#endif +#if GTK_CHECK_VERSION(2,14,0) + case GDK_DAMAGE: +#endif + cat = wxEVT_CATEGORY_UI; + break; + + default: + cat = wxEVT_CATEGORY_UNKNOWN; + break; + } + + wxGUIEventLoop* evtloop = static_cast(data); + + // is this event allowed now? + if (evtloop->IsEventAllowedInsideYield(cat)) + gtk_main_do_event(event); // process it now + else if (event->type != GDK_NOTHING) + evtloop->StoreGdkEventForLaterProcessing(gdk_event_copy(event)); + // process it later (but make a copy; the caller will free the event pointer) +} +} + bool wxGUIEventLoop::YieldFor(long eventsToProcess) { #if wxUSE_THREADS @@ -151,90 +321,18 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) wxLog::Suspend(); #endif - // NOTE: gtk_main_iteration() doesn't allow us to filter events, so we - // rather use gtk_main_do_event() after filtering the events at - // GDK level - - GdkDisplay* disp = gtk_widget_get_display(wxGetRootWindow()); - - // gdk_display_get_event() will transform X11 events into GDK events - // and will queue all of them in the display (private) structure; - // finally it will "unqueue" the last one and return it to us - GdkEvent* event = gdk_display_get_event(disp); - while (event) - { - // categorize the GDK event according to wxEventCategory. - // See http://library.gnome.org/devel/gdk/unstable/gdk-Events.html#GdkEventType - // for more info. - - wxEventCategory cat = wxEVT_CATEGORY_UNKNOWN; - switch (event->type) - { - case GDK_SELECTION_REQUEST: - case GDK_SELECTION_NOTIFY: - case GDK_SELECTION_CLEAR: - case GDK_OWNER_CHANGE: - cat = wxEVT_CATEGORY_CLIPBOARD; - break; - - - case GDK_KEY_PRESS: - case GDK_KEY_RELEASE: - case GDK_BUTTON_PRESS: - case GDK_2BUTTON_PRESS: - case GDK_3BUTTON_PRESS: - case GDK_BUTTON_RELEASE: - case GDK_SCROLL: // generated from mouse buttons - case GDK_CLIENT_EVENT: - cat = wxEVT_CATEGORY_USER_INPUT; - break; - - - case GDK_PROXIMITY_IN: - case GDK_PROXIMITY_OUT: - - case GDK_MOTION_NOTIFY: - case GDK_ENTER_NOTIFY: - case GDK_LEAVE_NOTIFY: - case GDK_VISIBILITY_NOTIFY: - case GDK_PROPERTY_NOTIFY: - - case GDK_FOCUS_CHANGE: - case GDK_CONFIGURE: - case GDK_WINDOW_STATE: - case GDK_SETTING: - case GDK_DELETE: - case GDK_DESTROY: - - case GDK_EXPOSE: - case GDK_NO_EXPOSE: - case GDK_MAP: - case GDK_UNMAP: - //case GDK_DAMAGE: - - case GDK_DRAG_ENTER: - case GDK_DRAG_LEAVE: - case GDK_DRAG_MOTION: - case GDK_DRAG_STATUS: - case GDK_DROP_START: - case GDK_DROP_FINISHED: - case GDK_GRAB_BROKEN: - cat = wxEVT_CATEGORY_UI; - break; - - default: - cat = wxEVT_CATEGORY_UNKNOWN; - break; - } - - if (eventsToProcess & cat) - gtk_main_do_event(event); // process it now - else - m_arrGdkEvents.Add(event); // process it later - - // get next event - event = gdk_display_get_event(disp); - } + // temporarily replace the global GDK event handler with our function, which + // categorizes the events and using m_eventsToProcessInsideYield decides + // if an event should be processed immediately or not + // NOTE: this approach is better than using gdk_display_get_event() because + // gtk_main_iteration() does more than just calling gdk_display_get_event() + // and then call gtk_main_do_event()! + // In particular in this way we also process input from sources like + // GIOChannels (this is needed for e.g. wxGUIAppTraits::WaitForChild). + gdk_event_handler_set(wxgtk_main_do_event, this, NULL); + while (Pending()) // avoid false positives from our idle source + gtk_main_iteration(); + gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL); if (eventsToProcess != wxEVT_CATEGORY_CLIPBOARD) { @@ -251,6 +349,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) // then we fall into a never-ending loop... // put all unprocessed GDK events back in the queue + GdkDisplay* disp = gtk_widget_get_display(wxGetRootWindow()); for (size_t i=0; i