X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8801832d0ae2e78fa24af7f9f4b2c34a0874fa79..58654ed0f2b9f7888c80840ce3d526c98a9bf05f:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 0bb4f7afed..b7ed1c12ce 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -45,12 +45,12 @@ wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; -extern wxList wxPendingDelete; #if wxUSE_THREADS extern wxList *wxPendingEvents; extern wxCriticalSection *wxPendingEventsLocker; #endif extern wxResourceCache *wxTheResourceCache; +extern bool g_isIdle; unsigned char g_palette[64*3] = { @@ -135,7 +135,7 @@ void wxExit() gtk_main_quit(); } -// forward decl +/* forward declaration */ gint wxapp_idle_callback( gpointer WXUNUSED(data) ); bool wxYield() @@ -151,15 +151,63 @@ bool wxYield() win->OnInternalIdle(); } - // We need to temporarily remove idle callbacks or the loop will - // never finish. + if (wxTheApp->m_idleTag) + { + /* We need to temporarily remove idle callbacks or the loop will + never finish. */ + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + + while (gtk_events_pending()) + gtk_main_iteration(); + + /* re-add idle handler */ + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + } + else + { + while (gtk_events_pending()) + gtk_main_iteration(); + } + + return TRUE; +} + +gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +{ + if (!wxTheApp) return TRUE; + + /* sent idle event to all who request them */ + while (wxTheApp->ProcessIdle()) { } + + /* 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; + + /* 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; + + /* wake up other threads */ + wxMutexGuiLeave(); + wxUsleep(0); + wxMutexGuiEnter(); - while (gtk_events_pending()) - gtk_main_iteration(); + return TRUE; +} + +void wxapp_install_idle_handler() +{ + /* this routine gets called by all event handlers + indicating that the idle is over. */ wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - return TRUE; + + g_isIdle = FALSE; } //----------------------------------------------------------------------------- @@ -172,22 +220,6 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) -{ - if (wxTheApp) - { - while (wxTheApp->ProcessIdle()) - { - } - } - - wxMutexGuiLeave(); - wxUsleep(10); - wxMutexGuiEnter(); - - return TRUE; -} - wxApp::wxApp() { wxTheApp = this; @@ -202,7 +234,7 @@ wxApp::wxApp() wxApp::~wxApp() { - gtk_idle_remove( m_idleTag ); + if (m_idleTag) gtk_idle_remove( m_idleTag ); if (m_colorCube) free(m_colorCube); } @@ -244,8 +276,8 @@ bool wxApp::OnInitGui() m_colorCube = (unsigned char*)malloc(32 * 32 * 32); - for (int r = 0; r < 32; r++) - { + for (int r = 0; r < 32; r++) + { for (int g = 0; g < 32; g++) { for (int b = 0; b < 32; b++) @@ -254,17 +286,24 @@ bool wxApp::OnInitGui() int gg = (g << 3) | (g >> 2); int bb = (b << 3) | (b >> 2); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); int index = -1; - for (int i = 0; i < cmap->size; i++) + GdkColor *colors = cmap->colors; + if(colors) { - 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; } + 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; + } + } } m_colorCube[ (r*1024) + (g*32) + b ] = index; @@ -272,7 +311,6 @@ bool wxApp::OnInitGui() } } - return TRUE; } @@ -378,7 +416,7 @@ bool wxApp::Initialized() bool wxApp::Pending() { - return gtk_events_pending(); + return (gtk_events_pending() > 0); } void wxApp::Dispatch() @@ -414,8 +452,8 @@ void wxApp::DeletePendingObjects() delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } @@ -438,7 +476,7 @@ void wxApp::SetTopWindow( wxWindow *win ) bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; + wxBuffer = new wxChar[BUFSIZ + 512]; wxClassInfo::InitializeClasses(); @@ -528,7 +566,7 @@ void wxApp::CleanUp() #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT if (wxDebugContext::CountObjectsLeft() > 0) { - wxLogDebug("There were memory leaks.\n"); + wxLogDebug(_T("There were memory leaks.\n")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -563,7 +601,7 @@ int wxEntry( int argc, char *argv[] ) if (!wxTheApp) { wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, - "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); + _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -572,7 +610,7 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" ); + wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); wxTheApp->argc = argc; wxTheApp->argv = argv; @@ -581,39 +619,45 @@ int wxEntry( int argc, char *argv[] ) wxStripExtension( name ); wxTheApp->SetAppName( name ); - if (!wxTheApp->OnInitGui()) - return 0; + int retValue = 0; + + if ( !wxTheApp->OnInitGui() ) + retValue = -1; // Here frames insert themselves automatically into wxTopLevelWindows by // getting created in OnInit(). - if (!wxTheApp->OnInit()) - return 0; - - wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; + if ( retValue == 0 ) + { + if ( !wxTheApp->OnInit() ) + retValue = -1; + } - int retValue = 0; + if ( retValue == 0 ) + { + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - if (wxTheApp->Initialized()) - retValue = wxTheApp->OnRun(); + if (wxTheApp->Initialized()) + retValue = wxTheApp->OnRun(); - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if (topWindow) - { - // Forcibly delete the window. - if (topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close( TRUE ); - wxTheApp->DeletePendingObjects(); - } - else + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if (topWindow) { - delete topWindow; - wxTheApp->SetTopWindow( (wxWindow*) NULL ); + // Forcibly delete the window. + if (topWindow->IsKindOf(CLASSINFO(wxFrame)) || + topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + { + topWindow->Close( TRUE ); + wxTheApp->DeletePendingObjects(); + } + else + { + delete topWindow; + wxTheApp->SetTopWindow( (wxWindow*) NULL ); + } } - } - wxTheApp->OnExit(); + wxTheApp->OnExit(); + } // flush the logged messages if any wxLog *log = wxLog::GetActiveTarget();