X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..2121eb69fa8d49f4484f7170159e61f2e8885de4:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 2d830719c9..8eebbeb35c 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -22,18 +22,12 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/memory.h" + #include "wx/font.h" #endif -#include "wx/gdicmn.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/settings.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" -#include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ @@ -45,10 +39,6 @@ #include "wx/univ/renderer.h" #endif -#if wxUSE_THREADS - #include "wx/thread.h" -#endif - #include #ifdef HAVE_POLL @@ -74,13 +64,16 @@ #include #include #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif #endif // HAVE_POLL/!HAVE_POLL #include "wx/unix/private.h" #include "wx/gtk/win_gtk.h" #include "wx/gtk/private.h" -#include +#include //----------------------------------------------------------------------------- // link GnomeVFS @@ -96,7 +89,6 @@ FORCE_LINK(gnome_vfs) //----------------------------------------------------------------------------- bool g_mainThreadLocked = false; -gint g_pendingTag = 0; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; @@ -143,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // We need to remove idle callbacks or the loop will // never finish. - wxTheApp->RemoveIdleTag(); + RemoveIdleSource(); #if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't @@ -192,58 +184,34 @@ void wxApp::WakeUpIdle() extern "C" { -static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) +// One-shot emission hook for "event" signal, to install idle handler. +// This will be called when the "event" signal is issued on any GtkWidget object. +static gboolean +event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer) { - if (!wxTheApp) return TRUE; - - // When getting called from GDK's time-out handler - // we are no longer within GDK's grab on the GUI - // thread so we must lock it here ourselves. - gdk_threads_enter(); - - // Sent idle event to all who request them. - wxTheApp->ProcessPendingEvents(); - - { -#if wxUSE_THREADS - wxMutexLocker lock(gs_idleTagsMutex); -#endif - g_pendingTag = 0; - } - - // Flush the logged messages if any. -#if wxUSE_LOG - wxLog::FlushActive(); -#endif // wxUSE_LOG - - // Release lock again - gdk_threads_leave(); + wxapp_install_idle_handler(); + // remove hook + return false; +} - // Return FALSE to indicate that no more idle events are - // to be sent (single shot instead of continuous stream) - return FALSE; +static inline void wxAddEmissionHook() +{ + // add emission hook for "event" signal, to re-install idle handler when needed + guint sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); + g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL); } static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) - return TRUE; + return false; #ifdef __WXDEBUG__ // don't generate the idle events while the assert modal dialog is shown, // this completely confuses the apps which don't expect to be reentered // from some safely-looking functions if ( wxTheApp->IsInAssert() ) - { - // But repaint the assertion message if necessary - if (wxTopLevelWindows.GetCount() > 0) - { - wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData(); - if (win->IsKindOf(CLASSINFO(wxMessageDialog))) - win->OnInternalIdle(); - } - return TRUE; - } + return false; #endif // __WXDEBUG__ // When getting called from GDK's time-out handler @@ -271,6 +239,9 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) // Release lock again gdk_threads_leave(); + if (!moreIdles) + wxAddEmissionHook(); + // Return FALSE if no more idle events are to be sent return moreIdles; } @@ -386,15 +357,12 @@ void wxapp_install_idle_handler() g_isIdle = false; - if (g_pendingTag == 0) - g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL ); - // This routine gets called by all event handlers // indicating that the idle is over. It may also // get called from other thread for sending events // to the main thread (and processing these in // idle time). Very low priority. - wxTheApp->m_idleTag = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL ); + wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); } //----------------------------------------------------------------------------- @@ -435,8 +403,6 @@ wxApp::wxApp() g_main_context_set_poll_func( NULL, wxapp_poll_func ); #endif - m_colorCube = (unsigned char*) NULL; - // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp m_glVisualInfo = (void *) NULL; m_glFBCInfo = (void *) NULL; @@ -446,9 +412,6 @@ wxApp::~wxApp() { if (m_idleTag) g_source_remove( m_idleTag ); - - if (m_colorCube) - free(m_colorCube); } bool wxApp::OnInitGui() @@ -456,8 +419,6 @@ bool wxApp::OnInitGui() if ( !wxAppBase::OnInitGui() ) return false; - GdkVisual *visual = gdk_visual_get_system(); - // if this is a wxGLApp (derived from wxApp), and we've already // chosen a specific visual, then derive the GdkVisual from that if (m_glVisualInfo != NULL) @@ -467,8 +428,6 @@ bool wxApp::OnInitGui() GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); - - visual = vis; } // On some machines, the default visual is just 256 colours, so @@ -482,59 +441,6 @@ bool wxApp::OnInitGui() GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); - - visual = vis; - } - - // Nothing to do for 15, 16, 24, 32 bit displays - if (visual->depth > 8) return true; - - // initialize color cube for 8-bit color reduction dithering - - GdkColormap *cmap = gtk_widget_get_default_colormap(); - - m_colorCube = (unsigned char*)malloc(32 * 32 * 32); - - for (int r = 0; r < 32; r++) - { - for (int g = 0; g < 32; g++) - { - for (int b = 0; b < 32; b++) - { - int rr = (r << 3) | (r >> 2); - int gg = (g << 3) | (g >> 2); - int bb = (b << 3) | (b >> 2); - - int index = -1; - - GdkColor *colors = cmap->colors; - if (colors) - { - int max = 3 * 65536; - - for (int i = 0; i < cmap->size; i++) - { - int rdiff = ((rr << 8) - colors[i].red); - int gdiff = ((gg << 8) - colors[i].green); - int bdiff = ((bb << 8) - colors[i].blue); - int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); - if (sum < max) - { - index = i; max = sum; - } - } - } - else - { - // assume 8-bit true or static colors. this really exists - GdkVisual* vis = gdk_colormap_get_visual( cmap ); - index = (r >> (5 - vis->red_prec)) << vis->red_shift; - index |= (g >> (5 - vis->green_prec)) << vis->green_shift; - index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift; - } - m_colorCube[ (r*1024) + (g*32) + b ] = index; - } - } } return true; @@ -682,26 +588,31 @@ void wxApp::CleanUp() #ifdef __WXDEBUG__ -void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) { m_isInAssert = true; - wxAppBase::OnAssert(file, line, cond, msg); + wxAppBase::OnAssertFailure(file, line, func, cond, msg); m_isInAssert = false; } #endif // __WXDEBUG__ -void wxApp::RemoveIdleTag() +void wxApp::RemoveIdleSource() { #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - if (!g_isIdle) + if (m_idleTag != 0) { - g_source_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + g_source_remove(m_idleTag); + m_idleTag = 0; g_isIdle = true; + wxAddEmissionHook(); } }