X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..c27eab7e9ce512e052046886a33c5f5002d42573:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index dec83867a0..93459c373d 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" @@ -19,19 +19,23 @@ #include "wx/memory.h" #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" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -42,11 +46,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; -GdkVisual *wxVisualSetByExternal = (GdkVisual*) NULL; -GdkColormap *wxColormapSetByExternal = (GdkColormap*) NULL; - unsigned char g_palette[64*3] = { 0x0, 0x0, 0x0, @@ -125,14 +130,27 @@ extern void wxFlushResources(void); // global functions //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { gtk_main_quit(); } -bool wxYield(void) +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 ( wxNode *node = wxTopLevelWindows.GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = ((wxWindow*)node->GetData()); + win->OnInternalIdle(); + } + + while (gtk_events_pending() > 0) + gtk_main_iteration(); + return TRUE; } @@ -148,56 +166,54 @@ END_EVENT_TABLE() gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} -#if wxUSE_THREADS + if (wxTheApp) + { + while (wxTheApp->ProcessIdle()) + { + } + } + wxMutexGuiLeave(); -#endif - usleep(10000); -#if wxUSE_THREADS + wxUsleep(10); wxMutexGuiEnter(); -#endif + return TRUE; } wxApp::wxApp() { - m_idleTag = 0; + wxTheApp = this; + m_topWindow = (wxWindow *) NULL; m_exitOnFrameDelete = TRUE; - wxTheApp = this; + + 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_colorCube) free(m_colorCube); } -bool wxApp::InitVisual() +bool wxApp::OnInitGui() { - if (wxVisualSetByExternal) - { - /* this happens in the wxModule code of the OpenGl canvas. - it chooses the best display for OpenGl and stores it - in wxDisplaySetByExternal. we then have to make it the - default for the system */ - - gtk_widget_set_default_visual( wxVisualSetByExternal ); - } - - if (wxColormapSetByExternal) - { - /* OpenGl also gives us a colormap */ - - gtk_widget_set_default_colormap( wxColormapSetByExternal ); - } - else - { + /* Nothing to do for 15, 16, 24, 32 bit displays */ + + 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 */ - + 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... */ + + /* GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); for (int i = 0; i < 64; i++) @@ -210,31 +226,49 @@ bool wxApp::InitVisual() 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); + int index = -1; + + 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; + } + } } - - return TRUE; -} -bool wxApp::OnInitGui(void) -{ - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - - return TRUE; -} -bool wxApp::OnInit(void) -{ return TRUE; } -int wxApp::OnRun(void) -{ - return MainLoop(); -} - -bool wxApp::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject( this ); @@ -253,6 +287,10 @@ void wxApp::OnIdle( wxIdleEvent &event ) inOnIdle = TRUE; + /* Resend in the main thread events which have been prepared in other + threads */ + ProcessPendingEvents(); + /* 'Garbage' collection of windows deleted with Close(). */ DeletePendingObjects(); @@ -270,7 +308,7 @@ void wxApp::OnIdle( wxIdleEvent &event ) inOnIdle = FALSE; } -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; @@ -291,6 +329,9 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); + + win->OnInternalIdle(); + win->ProcessEvent(event); if (event.MoreRequested()) @@ -308,37 +349,51 @@ bool wxApp::SendIdleEvents( wxWindow* win ) return needMore ; } -int wxApp::OnExit(void) -{ - return 0; -} - -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; } -void wxApp::Dispatch(void) +void wxApp::Dispatch() { } -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 + +void wxApp::DeletePendingObjects() { wxNode *node = wxPendingDelete.First(); while (node) @@ -354,7 +409,7 @@ void wxApp::DeletePendingObjects(void) } } -wxWindow *wxApp::GetTopWindow(void) +wxWindow *wxApp::GetTopWindow() { if (m_topWindow) return m_topWindow; wxNode *node = wxTopLevelWindows.First(); @@ -367,59 +422,101 @@ void wxApp::SetTopWindow( wxWindow *win ) m_topWindow = win; } -void wxApp::CommonInit(void) +bool wxApp::Initialize() { - wxSystemSettings::Init(); - - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + wxBuffer = new char[BUFSIZ + 512]; + + wxClassInfo::InitializeClasses(); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + wxSystemSettings::Init(); - wxInitializeStockLists(); - wxInitializeStockObjects(); +/* + wxTheFontNameDirectory = new wxFontNameDirectory; + wxTheFontNameDirectory->Initialize(); +*/ + + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); #if wxUSE_WX_RESOURCES - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - - wxInitializeResourceSystem(); + wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); + + wxInitializeResourceSystem(); #endif - wxImage::InitStandardHandlers(); + wxImage::InitStandardHandlers(); + + /* no global cursor under X + g_globalCursor = new wxCursor; */ + + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; -// g_globalCursor = new wxCursor; + return TRUE; } -void wxApp::CommonCleanUp(void) +void wxApp::CleanUp() { - if (wxTheColourDatabase) delete wxTheColourDatabase; - wxTheColourDatabase = (wxColourDatabase*) NULL; - - if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; - wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; - - wxDeleteStockObjects(); + wxModule::CleanUpModules(); #if wxUSE_WX_RESOURCES wxFlushResources(); - if (wxTheResourceCache) delete wxTheResourceCache; + if (wxTheResourceCache) + delete wxTheResourceCache; wxTheResourceCache = (wxResourceCache*) NULL; - + wxCleanUpResourceSystem(); #endif + if (wxTheColourDatabase) + delete wxTheColourDatabase; + wxTheColourDatabase = (wxColourDatabase*) NULL; + +/* + if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; + wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; +*/ + + wxDeleteStockObjects(); + wxDeleteStockLists(); wxImage::CleanUpHandlers(); + delete wxTheApp; + wxTheApp = (wxApp*) NULL; + 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"); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); + } +#endif + + // 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; } wxLog *wxApp::CreateLogTarget() { - return new wxLogGui; + return new wxLogGui; } //----------------------------------------------------------------------------- @@ -428,18 +525,17 @@ wxLog *wxApp::CreateLogTarget() int wxEntry( int argc, char *argv[] ) { - wxBuffer = new char[BUFSIZ + 512]; + gtk_set_locale(); - wxClassInfo::InitializeClasses(); + gtk_init( &argc, &argv ); + 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, + "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -448,11 +544,7 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - } + wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" ); wxTheApp->argc = argc; wxTheApp->argv = argv; @@ -463,59 +555,55 @@ int wxEntry( int argc, char *argv[] ) wxStripExtension( name ); wxTheApp->SetAppName( name ); - gtk_set_locale(); - - gtk_init( &argc, &argv ); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - if (!wxTheApp->InitVisual()) return 0; - - wxApp::CommonInit(); - - if (!wxTheApp->OnInitGui()) return 0; + if (!wxTheApp->OnInitGui()) + return 0; - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). + /* Here frames insert themselves automatically + * into wxTopLevelWindows by getting created + * in OnInit(). */ - if (!wxTheApp->OnInit()) return 0; + if (!wxTheApp->OnInit()) + return 0; wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); int retValue = 0; - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + if (wxTheApp->Initialized()) + retValue = wxTheApp->OnRun(); - wxTheApp->DeletePendingObjects(); + 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 + { + delete topWindow; + wxTheApp->SetTopWindow( (wxWindow*) NULL ); + } + } wxTheApp->OnExit(); - wxModule::CleanUpModules(); - - wxApp::CommonCleanUp(); - - delete wxTheApp; - wxTheApp = (wxApp*) NULL; - - wxClassInfo::CleanUpClasses(); - - delete[] wxBuffer; - -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } + // flush the logged messages if any + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); -#endif + // 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; - wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); - if (oldLog) delete oldLog; + wxApp::CleanUp(); return retValue; }