X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..c50f1fb9226d9260454ccb9c8a67d0be23c2827f:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 315d37194c..a733aede95 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -28,13 +28,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" @@ -45,7 +47,6 @@ wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; -extern wxList wxPendingDelete; #if wxUSE_THREADS extern wxList *wxPendingEvents; extern wxCriticalSection *wxPendingEventsLocker; @@ -141,9 +142,12 @@ 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) + /* 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() ) @@ -151,6 +155,7 @@ bool wxYield() wxWindow *win = node->GetData(); win->OnInternalIdle(); } +#endif if (wxTheApp->m_idleTag) { @@ -178,6 +183,13 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) return TRUE; +#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 + /* sent idle event to all who request them */ while (wxTheApp->ProcessIdle()) { } @@ -193,15 +205,18 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) emptied */ g_isIdle = TRUE; -/* wxMutexGuiLeave(); - wxUsleep(10); - wxMutexGuiEnter(); */ +#if (GTK_MINOR_VERSION > 0) + /* release lock again */ + GDK_THREADS_LEAVE (); +#endif return TRUE; } void wxapp_install_idle_handler() { + 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. */ @@ -210,6 +225,39 @@ void wxapp_install_idle_handler() 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(); + + /* 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 //----------------------------------------------------------------------------- @@ -228,6 +276,10 @@ wxApp::wxApp() m_exitOnFrameDelete = TRUE; 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; } @@ -236,14 +288,34 @@ wxApp::~wxApp() { 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 @@ -276,8 +348,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++) @@ -286,19 +358,38 @@ 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; + } + } } - + 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; } } @@ -336,9 +427,11 @@ void wxApp::OnIdle( wxIdleEvent &event ) 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(); @@ -445,8 +538,8 @@ void wxApp::DeletePendingObjects() delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } @@ -501,9 +594,6 @@ bool wxApp::Initialize() wxImage::InitStandardHandlers(); - /* no global cursor under X - g_globalCursor = new wxCursor; */ - wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; @@ -565,6 +655,7 @@ void wxApp::CleanUp() } #endif // Debug +#if wxUSE_LOG // do this as the very last thing because everything else can log messages wxLog::DontCreateOnDemand(); @@ -577,6 +668,7 @@ wxLog *wxApp::CreateLogTarget() { return new wxLogGui; } +#endif // wxUSE_LOG //----------------------------------------------------------------------------- // wxEntry @@ -586,8 +678,12 @@ int wxEntry( int argc, char *argv[] ) { gtk_set_locale(); + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; + gtk_init( &argc, &argv ); + wxSetDetectableAutoRepeat( TRUE ); + if (!wxApp::Initialize()) return -1; @@ -627,31 +723,38 @@ int wxEntry( int argc, char *argv[] ) 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(); + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; 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(); } +#if wxUSE_LOG // flush the logged messages if any wxLog *log = wxLog::GetActiveTarget(); if (log != NULL && log->HasPendingMessages()) @@ -663,6 +766,7 @@ int wxEntry( int argc, char *argv[] ) wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); if ( oldlog ) delete oldlog; +#endif // wxUSE_LOG wxApp::CleanUp();