X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24178e4a14a3d10e5f389ce7d8eb35f6636df001..eb082a088a77e8afb3c5a87880a42b9ec9a487e3:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 2c0b307922..b7ed1c12ce 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif #include "wx/app.h" @@ -20,27 +20,24 @@ #include "wx/font.h" #include "wx/settings.h" #include "wx/dialog.h" + #if wxUSE_WX_RESOURCES -#include "wx/resource.h" + #include "wx/resource.h" #endif + #include "wx/module.h" #include "wx/image.h" -#if wxUSE_THREADS + #include "wx/thread.h" -#endif + #include "unistd.h" -#ifdef __SUN__ -int usleep(unsigned int useconds); -#endif +#include +#include +#include -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" -#include // usleep() on solaris - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -48,8 +45,12 @@ int usleep(unsigned int useconds); 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] = { @@ -129,17 +130,86 @@ extern void wxFlushResources(void); // global functions //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { gtk_main_quit(); } -bool wxYield(void) +/* forward declaration */ +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + +bool wxYield() { - while (gtk_events_pending() > 0) gtk_main_iteration(); + // 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) + for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = node->GetData(); + win->OnInternalIdle(); + } + + 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(); + 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 ); + + g_isIdle = FALSE; +} + //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- @@ -150,35 +220,22 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) -{ - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} -#if wxUSE_THREADS - wxMutexGuiLeave(); -#endif - usleep(10000); -#if wxUSE_THREADS - wxMutexGuiEnter(); -#endif - return TRUE; -} - wxApp::wxApp() { wxTheApp = this; - + m_topWindow = (wxWindow *) NULL; m_exitOnFrameDelete = TRUE; - + m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - + m_colorCube = (unsigned char*) NULL; } -wxApp::~wxApp(void) +wxApp::~wxApp() { - gtk_idle_remove( m_idleTag ); - + if (m_idleTag) gtk_idle_remove( m_idleTag ); + if (m_colorCube) free(m_colorCube); } @@ -188,13 +245,13 @@ bool wxApp::OnInitGui() GdkVisual *visual = gdk_visual_get_system(); if (visual->depth > 8) return TRUE; - + /* this initiates the standard palette as defined by GdkImlib in the GNOME libraries. it ensures that all GNOME applications use the same 64 colormap entries on 8-bit displays so you can use several rather graphics-heavy applications at the same time. - NOTE: this doesn't really seem to work this way... */ + NOTE: this doesn't really seem to work this way... */ /* GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); @@ -209,49 +266,55 @@ bool wxApp::OnInitGui() gdk_color_alloc( cmap, &col ); } - + gtk_widget_set_default_colormap( cmap ); */ - + /* 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); - - GdkColor *colors = cmap->colors; - int max = 3 * (65536); + 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; - 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; - } - } + + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } } - return TRUE; } -bool wxApp::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject( this ); @@ -270,6 +333,12 @@ void wxApp::OnIdle( wxIdleEvent &event ) inOnIdle = TRUE; +#if wxUSE_THREADS + /* Resend in the main thread events which have been prepared in other + threads */ + ProcessPendingEvents(); +#endif + /* 'Garbage' collection of windows deleted with Close(). */ DeletePendingObjects(); @@ -287,18 +356,19 @@ void wxApp::OnIdle( wxIdleEvent &event ) inOnIdle = FALSE; } -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } + return needMore; } @@ -308,9 +378,9 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); - + win->OnInternalIdle(); - + win->ProcessEvent(event); if (event.MoreRequested()) @@ -328,32 +398,52 @@ bool wxApp::SendIdleEvents( wxWindow* win ) return needMore ; } -int wxApp::MainLoop(void) +int wxApp::MainLoop() { gtk_main(); return 0; } -void wxApp::ExitMainLoop(void) +void wxApp::ExitMainLoop() { gtk_main_quit(); } -bool wxApp::Initialized(void) +bool wxApp::Initialized() { return m_initialized; } -bool wxApp::Pending(void) +bool wxApp::Pending() { - return FALSE; + return (gtk_events_pending() > 0); } -void wxApp::Dispatch(void) +void wxApp::Dispatch() { + gtk_main_iteration(); } -void wxApp::DeletePendingObjects(void) +#if wxUSE_THREADS +void wxApp::ProcessPendingEvents() +{ + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); + + while (node) + { + wxEvtHandler *handler = (wxEvtHandler *)node->Data(); + + handler->ProcessPendingEvents(); + + delete node; + + node = wxPendingEvents->First(); + } +} +#endif // wxUSE_THREADS + +void wxApp::DeletePendingObjects() { wxNode *node = wxPendingDelete.First(); while (node) @@ -362,19 +452,21 @@ void wxApp::DeletePendingObjects(void) delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } } -wxWindow *wxApp::GetTopWindow(void) +wxWindow *wxApp::GetTopWindow() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); + if (m_topWindow) + return m_topWindow; + else if (wxTopLevelWindows.GetCount() > 0) + return wxTopLevelWindows.GetFirst()->GetData(); + else + return NULL; } void wxApp::SetTopWindow( wxWindow *win ) @@ -382,14 +474,21 @@ void wxApp::SetTopWindow( wxWindow *win ) m_topWindow = win; } -bool wxApp::Initialize(void) +bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; + wxBuffer = new wxChar[BUFSIZ + 512]; wxClassInfo::InitializeClasses(); - + wxSystemSettings::Init(); - + + // 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. +#if wxUSE_THREADS + wxPendingEvents = new wxList(); + wxPendingEventsLocker = new wxCriticalSection(); +#endif + /* wxTheFontNameDirectory = new wxFontNameDirectory; wxTheFontNameDirectory->Initialize(); @@ -403,7 +502,7 @@ bool wxApp::Initialize(void) #if wxUSE_WX_RESOURCES wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); - + wxInitializeResourceSystem(); #endif @@ -411,34 +510,36 @@ bool wxApp::Initialize(void) /* no global cursor under X g_globalCursor = new wxCursor; */ - + wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; - + return TRUE; } -void wxApp::CleanUp(void) +void wxApp::CleanUp() { wxModule::CleanUpModules(); #if wxUSE_WX_RESOURCES wxFlushResources(); - if (wxTheResourceCache) delete wxTheResourceCache; + if (wxTheResourceCache) + delete wxTheResourceCache; wxTheResourceCache = (wxResourceCache*) NULL; - + wxCleanUpResourceSystem(); #endif - if (wxTheColourDatabase) delete wxTheColourDatabase; + if (wxTheColourDatabase) + delete wxTheColourDatabase; wxTheColourDatabase = (wxColourDatabase*) NULL; - + /* if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; */ - + wxDeleteStockObjects(); wxDeleteStockLists(); @@ -448,27 +549,35 @@ void wxApp::CleanUp(void) delete wxTheApp; wxTheApp = (wxApp*) NULL; - /* check for memory leaks */ + // 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. +#if wxUSE_THREADS + delete wxPendingEvents; + delete wxPendingEventsLocker; +#endif + + wxSystemSettings::Done(); + + delete[] wxBuffer; + + wxClassInfo::CleanUpClasses(); + + // check for memory leaks #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(); } -#endif +#endif // Debug - /* do this as the very last thing because everything else can log messages */ + // do this as the very last thing because everything else can log messages wxLog::DontCreateOnDemand(); - - wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); - if (oldLog) delete oldLog; - wxSystemSettings::Done(); - - wxClassInfo::CleanUpClasses(); - - delete[] wxBuffer; + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); + if (oldLog) + delete oldLog; } wxLog *wxApp::CreateLogTarget() @@ -486,15 +595,13 @@ int wxEntry( int argc, char *argv[] ) gtk_init( &argc, &argv ); - if (!wxApp::Initialize()) return 0; + if (!wxApp::Initialize()) + return -1; if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - } + wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, + _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -503,59 +610,67 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - } + wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); wxTheApp->argc = argc; wxTheApp->argv = argv; - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); + wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); wxTheApp->SetAppName( name ); - if (!wxTheApp->OnInitGui()) return 0; - - /* Here frames insert themselves automatically - * into wxTopLevelWindows by getting created - * in OnInit(). */ + int retValue = 0; - if (!wxTheApp->OnInit()) return 0; + if ( !wxTheApp->OnInitGui() ) + retValue = -1; - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + 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 */ + // flush the logged messages if any wxLog *log = wxLog::GetActiveTarget(); if (log != NULL && log->HasPendingMessages()) log->Flush(); + // continuing to use user defined log target is unsafe from now on because + // some resources may be already unavailable, so replace it by something + // more safe + wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); + if ( oldlog ) + delete oldlog; + wxApp::CleanUp(); return retValue;