X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d4dc3a4d0780f9d25804d93b0f1d9da59afa289..4f55a07f9f4c6ba6905aaa8e584e6fb14771d278:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 65460281f1..e2bdb2f344 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -49,9 +49,10 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL extern bool g_isIdle; -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = FALSE; +gint g_pendingTag = 0; -GtkWidget *wxRootWindow = (GtkWidget*) NULL; +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- // local functions @@ -59,6 +60,7 @@ GtkWidget *wxRootWindow = (GtkWidget*) NULL; /* forward declaration */ gint wxapp_idle_callback( gpointer WXUNUSED(data) ); +gint wxapp_pending_callback( gpointer WXUNUSED(data) ); void wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -78,27 +80,37 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- +static bool gs_inYield = FALSE; + bool wxYield() { - bool has_idle = (wxTheApp->m_idleTag != 0); +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) + { + // can't call gtk_main_iteration() from other threads like this + return TRUE; + } +#endif // wxUSE_THREADS - if (has_idle) +#ifdef __WXDEBUG__ + if (gs_inYield) + wxFAIL_MSG( wxT("wxYield called recursively" ) ); +#endif + + gs_inYield = TRUE; + + if (!g_isIdle) { - /* We need to temporarily remove idle callbacks or the loop will - never finish. */ + // We need to remove idle callbacks or the loop will + // never finish. gtk_idle_remove( wxTheApp->m_idleTag ); wxTheApp->m_idleTag = 0; + g_isIdle = TRUE; } while (gtk_events_pending()) gtk_main_iteration(); - if (has_idle) - { - /* re-add idle handler (very low priority) */ - wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); - } - // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); @@ -106,15 +118,29 @@ bool wxYield() /* it's necessary to call ProcessIdle() to update the frames sizes which might have been changed (it also will update other things set from OnUpdateUI() which is a nice (and desired) side effect) */ - while (wxTheApp->ProcessIdle()) - ; + while (wxTheApp->ProcessIdle()) { } // let the logs be flashed again wxLog::Resume(); + gs_inYield = FALSE; + return TRUE; } +//----------------------------------------------------------------------------- +// wxYieldIfNeeded +// Like wxYield, but fails silently if the yield is recursive. +//----------------------------------------------------------------------------- + +bool wxYieldIfNeeded() +{ + if (gs_inYield) + return FALSE; + + return wxYield(); +} + //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- @@ -139,7 +165,7 @@ void wxWakeUpIdle() // local functions //----------------------------------------------------------------------------- -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +gint wxapp_pending_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) return TRUE; @@ -148,31 +174,61 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) // thread so we must lock it here ourselves gdk_threads_enter(); - /* we don't want any more idle events until the next event is - sent to wxGTK */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + // Sent idle event to all who request them + wxTheApp->ProcessPendingEvents(); + + g_pendingTag = 0; + + /* flush the logged messages if any */ +#if wxUSE_LOG + wxLog::FlushActive(); +#endif // wxUSE_LOG + + // Release lock again + gdk_threads_leave(); + + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream) + return FALSE; +} + +gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +{ + 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(); - /* indicate that we are now in idle mode - even so deeply + /* Indicate that we are now in idle mode - even so deeply in idle mode that we don't get any idle events anymore. this is like wxMSW where an idle event is sent only once each time after the event queue has been completely emptied */ g_isIdle = TRUE; + wxTheApp->m_idleTag = 0; - /* sent idle event to all who request them */ + // Sent idle event to all who request them while (wxTheApp->ProcessIdle()) { } - // release lock again + // Release lock again gdk_threads_leave(); - return TRUE; + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream) + return FALSE; } void wxapp_install_idle_handler() { wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + g_isIdle = FALSE; + + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) 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 @@ -180,14 +236,18 @@ void wxapp_install_idle_handler() idle time). Very low priority. */ wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); - - g_isIdle = FALSE; } #if wxUSE_THREADS +static int g_threadUninstallLevel = 0; + void wxapp_install_thread_wakeup() { + g_threadUninstallLevel++; + + if (g_threadUninstallLevel != 1) return; + if (wxTheApp->m_wakeUpTimerTag) return; wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL ); @@ -195,6 +255,10 @@ void wxapp_install_thread_wakeup() void wxapp_uninstall_thread_wakeup() { + g_threadUninstallLevel--; + + if (g_threadUninstallLevel != 0) return; + if (!wxTheApp->m_wakeUpTimerTag) return; gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); @@ -245,12 +309,8 @@ END_EVENT_TABLE() wxApp::wxApp() { - wxTheApp = this; - - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - - m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); + m_idleTag = 0; + wxapp_install_idle_handler(); #if wxUSE_THREADS m_wakeUpTimerTag = 0; @@ -258,8 +318,6 @@ wxApp::wxApp() #endif m_colorCube = (unsigned char*) NULL; - - m_useBestVisual = FALSE; } wxApp::~wxApp() @@ -275,6 +333,9 @@ wxApp::~wxApp() bool wxApp::OnInitGui() { + if ( !wxAppBase::OnInitGui() ) + return FALSE; + GdkVisual *visual = gdk_visual_get_system(); /* on some machines, the default visual is just 256 colours, so @@ -390,11 +451,6 @@ void wxApp::OnIdle( wxIdleEvent &event ) event.RequestMore(TRUE); s_inOnIdle = FALSE; - - /* flush the logged messages if any */ -#if wxUSE_LOG - wxLog::FlushActive(); -#endif // wxUSE_LOG } bool wxApp::SendIdleEvents() @@ -489,6 +545,10 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); wxSystemSettings::Init(); + +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif // GL: I'm annoyed ... I don't know where to put this and I don't want to // create a module for that as it's part of the core. @@ -548,7 +608,7 @@ void wxApp::CleanUp() // check for memory leaks #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { wxLogDebug(wxT("There were memory leaks.\n")); wxDebugContext::Dump(); @@ -566,6 +626,19 @@ void wxApp::CleanUp() #endif // wxUSE_LOG } +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- + +GtkWidget* wxGetRootWindow() +{ + if (gs_RootWindow == NULL) { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; +} + //----------------------------------------------------------------------------- // wxEntry //----------------------------------------------------------------------------- @@ -575,16 +648,10 @@ int wxEntryStart( int argc, char *argv[] ) { #if wxUSE_THREADS /* GTK 1.2 up to version 1.2.3 has broken threads */ -#ifdef __VMS__ - if ((vms_gtk_major_version() == 1) && - (vms_gtk_minor_version() == 2) && - (vms_gtk_micro_version() < 4)) -#else if ((gtk_major_version == 1) && (gtk_minor_version == 2) && (gtk_micro_version < 4)) -#endif - { + { printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); } else @@ -595,11 +662,14 @@ int wxEntryStart( int argc, char *argv[] ) gtk_set_locale(); + // We should have the wxUSE_WCHAR_T test on the _outside_ +#if wxUSE_WCHAR_T #if defined(__WXGTK20__) // gtk+ 2.0 supports Unicode through UTF-8 strings wxConvCurrent = &wxConvUTF8; -#elif wxUSE_WCHAR_T +#else if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#endif #else if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; #endif @@ -627,8 +697,7 @@ int wxEntryInitGui() if ( !wxTheApp->OnInitGui() ) retValue = -1; - wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( wxRootWindow ); + wxGetRootWindow(); return retValue; } @@ -659,6 +728,15 @@ void wxEntryCleanup() int wxEntry( int argc, char *argv[] ) { +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + wxDebugContext::SetCheckpoint(); +#endif int err = wxEntryStart(argc, argv); if (err) return err;