X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..07fa75bc31fd49da3e4bd4a8bf056a96493bf26b:/src/gtk/app.cpp?ds=inline diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 6b3be61991..e3bb20d00d 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,16 +19,23 @@ #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/resource.h" +#include "wx/dialog.h" + +#if wxUSE_WX_RESOURCES + #include "wx/resource.h" +#endif + #include "wx/module.h" #include "wx/image.h" + #include "wx/thread.h" #include "unistd.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -39,6 +46,10 @@ 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; unsigned char g_palette[64*3] = @@ -119,14 +130,35 @@ extern void wxFlushResources(void); // global functions //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { gtk_main_quit(); } -bool wxYield(void) +// forward decl +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(); + } + + // We need to temporarily remove idle callbacks or the loop will + // never finish. + gtk_idle_remove( wxTheApp->m_idleTag ); + + while (gtk_events_pending()) + gtk_main_iteration(); + + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); return TRUE; } @@ -142,43 +174,109 @@ END_EVENT_TABLE() gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} + if (wxTheApp) + { + while (wxTheApp->ProcessIdle()) + { + } + } + wxMutexGuiLeave(); - usleep(10000); + wxUsleep(10); wxMutexGuiEnter(); + 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 ); -} -bool wxApp::OnInit(void) -{ - return TRUE; + if (m_colorCube) free(m_colorCube); } -bool wxApp::OnInitGui(void) +bool wxApp::OnInitGui() { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; -} + /* Nothing to do for 15, 16, 24, 32 bit displays */ -int wxApp::OnRun(void) -{ - return MainLoop(); + 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... */ + + /* + GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + + for (int i = 0; i < 64; i++) + { + GdkColor col; + col.red = g_palette[i*3 + 0] << 8; + col.green = g_palette[i*3 + 1] << 8; + col.blue = g_palette[i*3 + 2] << 8; + col.pixel = 0; + + 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::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject( this ); @@ -191,21 +289,27 @@ void wxApp::OnIdle( wxIdleEvent &event ) { static bool inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) + /* Avoid recursion (via ProcessEvent default case) */ if (inOnIdle) return; inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). +#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(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); + /* flush the logged messages if any */ + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - // Send OnIdle events to all windows + /* Send OnIdle events to all windows */ bool needMore = SendIdleEvents(); if (needMore) @@ -214,18 +318,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; } @@ -235,6 +340,9 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); + + win->OnInternalIdle(); + win->ProcessEvent(event); if (event.MoreRequested()) @@ -252,37 +360,52 @@ 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; + return gtk_events_pending(); } -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) @@ -298,12 +421,14 @@ void wxApp::DeletePendingObjects(void) } } -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 ) @@ -311,55 +436,115 @@ void wxApp::SetTopWindow( wxWindow *win ) m_topWindow = win; } -void wxApp::CommonInit(void) +bool wxApp::Initialize() { + wxBuffer = new wxChar[BUFSIZ + 512]; -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + 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(); */ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); +#if wxUSE_WX_RESOURCES + wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); + + wxInitializeResourceSystem(); +#endif - wxInitializeStockLists(); - wxInitializeStockObjects(); + wxImage::InitStandardHandlers(); - wxInitializeResourceSystem(); + /* no global cursor under X + g_globalCursor = new wxCursor; */ - wxImage::InitStandardHandlers(); + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; -// g_globalCursor = new wxCursor; + return TRUE; } -void wxApp::CommonCleanUp(void) +void wxApp::CleanUp() { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); + wxModule::CleanUpModules(); +#if wxUSE_WX_RESOURCES wxFlushResources(); - wxDELETE(wxTheResourceCache); - - wxDeleteStockLists(); + 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; + + // 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(_T("There were memory leaks.\n")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); + } +#endif // Debug + + // 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; } //----------------------------------------------------------------------------- @@ -368,26 +553,17 @@ wxLog *wxApp::CreateLogTarget() int wxEntry( int argc, char *argv[] ) { - wxBuffer = new char[BUFSIZ + 512]; - - wxClassInfo::InitializeClasses(); + gtk_set_locale(); - /* Debug stream no longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + gtk_init( &argc, &argv ); - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); -#endif -*/ + 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(); @@ -396,93 +572,69 @@ 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 ); - gtk_set_locale(); - - gtk_init( &argc, &argv ); + int retValue = 0; - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + if ( !wxTheApp->OnInitGui() ) + retValue = -1; - for (int i = 0; i < 64; i++) + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) { - GdkColor col; - col.red = g_palette[i*3 + 0] << 8; - col.green = g_palette[i*3 + 1] << 8; - col.blue = g_palette[i*3 + 2] << 8; - col.pixel = 0; - - gdk_color_alloc( cmap, &col ); + if ( !wxTheApp->OnInit() ) + retValue = -1; } - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); - - wxApp::CommonInit(); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - wxTheApp->OnInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - if (!wxTheApp->OnInit()) return 0; - - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); - - int retValue = 0; - - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - - wxTheApp->DeletePendingObjects(); - - wxTheApp->OnExit(); - - wxModule::CleanUpModules(); - - wxApp::CommonCleanUp(); - - delete wxTheApp; - wxTheApp = (wxApp*) NULL; - - wxClassInfo::CleanUpClasses(); + if ( retValue == 0 ) + { + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - delete[] wxBuffer; + if (wxTheApp->Initialized()) + retValue = wxTheApp->OnRun(); -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + 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 ); + } + } - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + wxTheApp->OnExit(); } -// wxDebugContext::SetStream(NULL, NULL); -#endif + // 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; - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); - if (oldLog) delete oldLog; + wxApp::CleanUp(); return retValue; } -//----------------------------------------------------------------------------- -