X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f12ae5cd76b3e9157bdf29e1df4f875cbd6d3e3..e7b3d6babbc006f2936be6827d0b826adbbc82e4:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index afe49ce3c1..a690ab53a4 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -8,6 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ + #pragma implementation "appbase.h" #pragma implementation "app.h" #endif @@ -28,13 +29,15 @@ #include "wx/module.h" #include "wx/image.h" +#if wxUSE_THREADS #include "wx/thread.h" +#endif #include "unistd.h" -#include -#include -#include +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" @@ -43,10 +46,14 @@ //----------------------------------------------------------------------------- wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::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] = { @@ -131,50 +138,138 @@ void wxExit() gtk_main_quit(); } +/* forward declaration */ +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + 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) - for ( wxNode *node = wxTopLevelWindows.GetFirst(); + /* 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()) { } + +#if 0 + for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { - wxWindow *win = ((wxWindow*)node->GetData()); + wxWindow *win = node->GetData(); win->OnInternalIdle(); } +#endif - while (gtk_events_pending() > 0) - gtk_main_iteration(); + 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; } -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- +gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +{ + if (!wxTheApp) return TRUE; -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +#if (GTK_MINOR_VERSION > 0) + /* when getting called from GDK's idle handler we + are no longer within GDK's grab on the GUI + thread so we must lock it here ourselves */ + GDK_THREADS_ENTER (); +#endif -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() + /* sent idle event to all who request them */ + while (wxTheApp->ProcessIdle()) { } -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) + /* 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; + +#if (GTK_MINOR_VERSION > 0) + /* release lock again */ + GDK_THREADS_LEAVE (); +#endif + + return TRUE; +} + +void wxapp_install_idle_handler() { - if (wxTheApp) - { - while (wxTheApp->ProcessIdle()) - { - } - } + wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") ); + + /* 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; +} + +/* +#if wxUSE_THREADS +static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) +{ + gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); + wxTheApp->m_wakeUpTimerTag = 0; + +#if (GTK_MINOR_VERSION > 0) + // 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 (); +#endif + // unblock other threads wishing to do some GUI things wxMutexGuiLeave(); - wxUsleep(10); + + // wake up other threads + wxUsleep( 1 ); + + // block other thread again wxMutexGuiEnter(); +#if (GTK_MINOR_VERSION > 0) + // release lock again + GDK_THREADS_LEAVE (); +#endif + + wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); + return TRUE; } +#endif +*/ + +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() wxApp::wxApp() { @@ -185,21 +280,49 @@ wxApp::wxApp() m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); +/* +#if wxUSE_THREADS + m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); +#endif +*/ + m_colorCube = (unsigned char*) NULL; } wxApp::~wxApp() { - gtk_idle_remove( m_idleTag ); + if (m_idleTag) gtk_idle_remove( m_idleTag ); + +/* +#if wxUSE_THREADS + if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag ); +#endif +*/ if (m_colorCube) free(m_colorCube); } bool wxApp::OnInitGui() { - /* Nothing to do for 15, 16, 24, 32 bit displays */ - GdkVisual *visual = gdk_visual_get_system(); + + /* on some machines, the default visual is just 256 colours, so + we make sure we get the best. this can sometimes be wasteful, + of course, but what do these guys pay $30.000 for? */ +/* + if (gdk_visual_get_best() != gdk_visual_get_system()) + { + GdkVisual* vis = gdk_visual_get_best(); + gtk_widget_set_default_visual( vis ); + + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + + visual = vis; + } +*/ + + /* Nothing to do for 15, 16, 24, 32 bit displays */ if (visual->depth > 8) return TRUE; /* this initiates the standard palette as defined by GdkImlib @@ -207,7 +330,7 @@ bool wxApp::OnInitGui() 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 ); @@ -232,35 +355,53 @@ bool wxApp::OnInitGui() 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); + 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++) + 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; - } - } + else + { +#if (GTK_MINOR_VERSION > 0) + /* assume 8-bit true or static colors. this really + exists. */ + GdkVisual* vis = gdk_colormap_get_visual( cmap ); + index = (r >> (5 - vis->red_prec)) << vis->red_shift; + index |= (g >> (5 - vis->green_prec)) << vis->green_shift; + index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift; +#else + wxFAIL_MSG( _T("Unsupported graphics hardware") ); +#endif + } + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } } - return TRUE; } @@ -283,13 +424,21 @@ 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(); /* flush the logged messages if any */ +#if wxUSE_LOG wxLog *log = wxLog::GetActiveTarget(); if (log != NULL && log->HasPendingMessages()) log->Flush(); +#endif // wxUSE_LOG /* Send OnIdle events to all windows */ bool needMore = SendIdleEvents(); @@ -304,14 +453,15 @@ 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; } @@ -359,50 +509,64 @@ bool wxApp::Initialized() bool wxApp::Pending() { - return FALSE; + return (gtk_events_pending() > 0); } void wxApp::Dispatch() { + gtk_main_iteration(); } -void wxApp::DeletePendingObjects() +#if wxUSE_THREADS +void wxApp::ProcessPendingEvents() { - wxNode *node = wxPendingDelete.First(); + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); + while (node) { - wxObject *obj = (wxObject *)node->Data(); + wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - delete obj; + handler->ProcessPendingEvents(); - if (wxPendingDelete.Member(obj)) delete node; - node = wxPendingDelete.First(); + node = wxPendingEvents->First(); } } +#endif // wxUSE_THREADS -wxWindow *wxApp::GetTopWindow() +void wxApp::DeletePendingObjects() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); -} + wxNode *node = wxPendingDelete.First(); + while (node) + { + wxObject *obj = (wxObject *)node->Data(); -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; + delete obj; + + if (wxPendingDelete.Find(obj)) + delete node; + + node = wxPendingDelete.First(); + } } 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(); @@ -422,9 +586,6 @@ bool wxApp::Initialize() wxImage::InitStandardHandlers(); - /* no global cursor under X - g_globalCursor = new wxCursor; */ - wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; @@ -463,6 +624,13 @@ void wxApp::CleanUp() 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; @@ -473,12 +641,13 @@ 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(); } -#endif +#endif // Debug +#if wxUSE_LOG // do this as the very last thing because everything else can log messages wxLog::DontCreateOnDemand(); @@ -487,10 +656,7 @@ void wxApp::CleanUp() delete oldLog; } -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} +#endif // wxUSE_LOG //----------------------------------------------------------------------------- // wxEntry @@ -500,15 +666,19 @@ int wxEntry( int argc, char *argv[] ) { gtk_set_locale(); + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; + gtk_init( &argc, &argv ); + wxSetDetectableAutoRepeat( TRUE ); + if (!wxApp::Initialize()) return -1; 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(); @@ -517,53 +687,62 @@ 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; - 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 ) + { + /* delete pending toplevel windows (typically a single + dialog) so that, if there isn't any left, we don't + call OnRun() */ + wxTheApp->DeletePendingObjects(); - if (wxTheApp->Initialized()) - retValue = wxTheApp->OnRun(); + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - 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 + if (wxTheApp->Initialized()) { - delete topWindow; - wxTheApp->SetTopWindow( (wxWindow*) NULL ); + 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 + { + delete topWindow; + wxTheApp->SetTopWindow( (wxWindow*) NULL ); + } + } + wxTheApp->OnExit(); } } - wxTheApp->OnExit(); - +#if wxUSE_LOG // flush the logged messages if any wxLog *log = wxLog::GetActiveTarget(); if (log != NULL && log->HasPendingMessages()) @@ -575,9 +754,37 @@ int wxEntry( int argc, char *argv[] ) wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); if ( oldlog ) delete oldlog; +#endif // wxUSE_LOG wxApp::CleanUp(); return retValue; } +#include "wx/gtk/info.xpm" +#include "wx/gtk/error.xpm" +#include "wx/gtk/question.xpm" +#include "wx/gtk/warning.xpm" + +wxIcon +wxApp::GetStdIcon(int which) const +{ + switch(which) + { + case wxICON_INFORMATION: + return wxIcon(info_xpm); + + case wxICON_QUESTION: + return wxIcon(question_xpm); + + case wxICON_EXCLAMATION: + return wxIcon(warning_xpm); + + default: + wxFAIL_MSG("requested non existent standard icon"); + // still fall through + + case wxICON_HAND: + return wxIcon(error_xpm); + } +}