X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27df579a6fee15c771a6020ec856dff64422151f..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 17732ceb90..65710bb24d 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -11,6 +11,10 @@ #pragma implementation "app.h" #endif +#ifdef __VMS +#include +#endif + #include "wx/app.h" #include "wx/gdicmn.h" #include "wx/utils.h" @@ -28,17 +32,25 @@ #include "wx/module.h" #include "wx/image.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif + #if wxUSE_THREADS -#include "wx/thread.h" + #include "wx/thread.h" #endif #include +#ifdef __VMS +# include +#else +# include +#endif +#include "wx/gtk/win_gtk.h" -#include -#include #include -#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- // global data @@ -47,23 +59,18 @@ wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; -extern bool g_isIdle; - -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = FALSE; +gint g_pendingTag = 0; -GtkWidget *wxRootWindow = (GtkWidget*) NULL; +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- -// local functions +// idle system //----------------------------------------------------------------------------- -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); -void wxapp_install_idle_handler(); +extern bool g_isIdle; -#if wxUSE_THREADS -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ); -#endif +void wxapp_install_idle_handler(); //----------------------------------------------------------------------------- // wxExit @@ -78,40 +85,60 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- -bool wxYield() +bool wxApp::Yield(bool onlyIfNeeded) { - bool has_idle = (wxTheApp->m_idleTag != 0); + // MT-FIXME + static bool s_inYield = FALSE; - if (has_idle) + if ( s_inYield ) { - /* We need to temporarily remove idle callbacks or the loop will - never finish. */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; } - while (gtk_events_pending()) - gtk_main_iteration(); +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) + { + // can't call gtk_main_iteration() from other threads like this + return TRUE; + } +#endif // wxUSE_THREADS + + s_inYield = TRUE; - if (has_idle) + if (!g_isIdle) { - /* re-add idle handler (very low priority) */ - wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL ); + // We need to remove idle callbacks or the loop will + // never finish. + gtk_idle_remove( m_idleTag ); + m_idleTag = 0; + g_isIdle = TRUE; } // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); - /* 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()) - ; + while (gtk_events_pending()) + 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). But we + // call ProcessIdle() only once since this is not meant for longish + // background jobs (controlled by wxIdleEvent::RequestMore() and the + // return value of Processidle(). + ProcessIdle(); // let the logs be flashed again wxLog::Resume(); + s_inYield = FALSE; + return TRUE; } @@ -139,100 +166,130 @@ void wxWakeUpIdle() // local functions //----------------------------------------------------------------------------- -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" +{ + +static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) return TRUE; - // when getting called from GDK's time-out handler + // 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 + // thread so we must lock it here ourselves. gdk_threads_enter(); - /* 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; + // Sent idle event to all who request them. + wxTheApp->ProcessPendingEvents(); - /* 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; + g_pendingTag = 0; - /* sent idle event to all who request them */ - while (wxTheApp->ProcessIdle()) { } + // Flush the logged messages if any. +#if wxUSE_LOG + wxLog::FlushActive(); +#endif // wxUSE_LOG - // release lock again + // Release lock again gdk_threads_leave(); - return TRUE; + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream) + return FALSE; } -void wxapp_install_idle_handler() +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + if (!wxTheApp) + return TRUE; - /* This routine gets called by all event handlers - indicating that the idle is over. It may also - get called from other thread for sending events - to the main thread (and processing these in - idle time). Very low priority. */ +#ifdef __WXDEBUG__ + // don't generate the idle events while the assert modal dialog is shown, + // this completely confuses the apps which don't expect to be reentered + // from some safely-looking functions + if ( wxTheApp->IsInAssert() ) + { + return TRUE; + } +#endif // __WXDEBUG__ - wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL ); + // 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(); - g_isIdle = FALSE; -} + // Indicate that we are now in idle mode and event handlers + // will have to reinstall the idle handler again. + g_isIdle = TRUE; + wxTheApp->m_idleTag = 0; -#if wxUSE_THREADS + // Send idle event to all who request them as long as + // no events have popped up in the event queue. + while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0)) + ; -void wxapp_install_thread_wakeup() -{ - if (wxTheApp->m_wakeUpTimerTag) return; + // Release lock again + gdk_threads_leave(); - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL ); + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream). + return FALSE; } -void wxapp_uninstall_thread_wakeup() -{ - if (!wxTheApp->m_wakeUpTimerTag) return; - - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; -} +#if wxUSE_THREADS -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - // 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 + gint res; gdk_threads_enter(); - wxapp_uninstall_thread_wakeup(); - - // unblock other threads wishing to do some GUI things wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; - // wake up other threads - wxUsleep( 1 ); + res = poll( (struct pollfd*) ufds, nfds, timeout ); - // block other thread again wxMutexGuiEnter(); - g_mainThreadLocked = FALSE; - wxapp_install_thread_wakeup(); - - // release lock again gdk_threads_leave(); - return TRUE; + return res; } #endif // wxUSE_THREADS +} // extern "C" + +void wxapp_install_idle_handler() +{ + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + + g_isIdle = FALSE; + + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + + // This routine gets called by all event handlers + // indicating that the idle is over. It may also + // get called from other thread for sending events + // to the main thread (and processing these in + // idle time). Very low priority. + wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); +} + +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- + +GtkWidget* wxGetRootWindow() +{ + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; +} + //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- @@ -245,47 +302,70 @@ END_EVENT_TABLE() wxApp::wxApp() { - wxTheApp = this; - - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; + m_initialized = FALSE; +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ - m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + m_idleTag = 0; + wxapp_install_idle_handler(); #if wxUSE_THREADS - m_wakeUpTimerTag = 0; - wxapp_install_thread_wakeup(); + g_main_set_poll_func( wxapp_poll_func ); #endif m_colorCube = (unsigned char*) NULL; - - m_useBestVisual = FALSE; + + // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp + m_glVisualInfo = (void *) NULL; } wxApp::~wxApp() { if (m_idleTag) gtk_idle_remove( m_idleTag ); -#if wxUSE_THREADS - wxapp_uninstall_thread_wakeup(); -#endif - if (m_colorCube) free(m_colorCube); } bool wxApp::OnInitGui() { + if ( !wxAppBase::OnInitGui() ) + return FALSE; + 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 this is a wxGLApp (derived from wxApp), and we've already + // chosen a specific visual, then derive the GdkVisual from that + if (m_glVisualInfo != NULL) + { +#ifdef __WXGTK20__ + // seems gtk_widget_set_default_visual no longer exists? + GdkVisual* vis = gtk_widget_get_default_visual(); +#else + GdkVisual* vis = gdkx_visual_get( + ((XVisualInfo *) m_glVisualInfo) ->visualid ); + gtk_widget_set_default_visual( vis ); +#endif - if ((gdk_visual_get_best() != gdk_visual_get_system()) && - (m_useBestVisual)) + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + + visual = vis; + } + + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. + + else + if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) { +#ifdef __WXGTK20__ + /* seems gtk_widget_set_default_visual no longer exists? */ + GdkVisual* vis = gtk_widget_get_default_visual(); +#else GdkVisual* vis = gdk_visual_get_best(); gtk_widget_set_default_visual( vis ); +#endif GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); @@ -293,10 +373,10 @@ bool wxApp::OnInitGui() visual = vis; } - /* Nothing to do for 15, 16, 24, 32 bit displays */ + // Nothing to do for 15, 16, 24, 32 bit displays if (visual->depth > 8) return TRUE; - /* initialize color cube for 8-bit color reduction dithering */ + // initialize color cube for 8-bit color reduction dithering GdkColormap *cmap = gtk_widget_get_default_colormap(); @@ -333,16 +413,11 @@ bool wxApp::OnInitGui() } else { -#if (GTK_MINOR_VERSION > 0) - /* assume 8-bit true or static colors. this really - exists. */ + // 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( wxT("Unsupported graphics hardware") ); -#endif } m_colorCube[ (r*1024) + (g*32) + b ] = index; } @@ -352,6 +427,20 @@ bool wxApp::OnInitGui() return TRUE; } +GdkVisual *wxApp::GetGdkVisual() +{ + GdkVisual *visual = NULL; + + if (m_glVisualInfo) + visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); + else + visual = gdk_window_get_visual( wxGetRootWindow()->window ); + + wxASSERT( visual ); + + return visual; +} + bool wxApp::ProcessIdle() { wxIdleEvent event; @@ -365,31 +454,26 @@ void wxApp::OnIdle( wxIdleEvent &event ) { static bool s_inOnIdle = FALSE; - /* Avoid recursion (via ProcessEvent default case) */ + // Avoid recursion (via ProcessEvent default case) if (s_inOnIdle) return; s_inOnIdle = TRUE; - /* Resend in the main thread events which have been prepared in other - threads */ + // Resend in the main thread events which have been prepared in other + // threads ProcessPendingEvents(); - /* 'Garbage' collection of windows deleted with Close(). */ + // 'Garbage' collection of windows deleted with Close() DeletePendingObjects(); - /* Send OnIdle events to all windows */ + // Send OnIdle events to all windows bool needMore = SendIdleEvents(); if (needMore) event.RequestMore(TRUE); s_inOnIdle = FALSE; - - /* flush the logged messages if any */ -#if wxUSE_LOG - wxLog::FlushActive(); -#endif // wxUSE_LOG } bool wxApp::SendIdleEvents() @@ -415,7 +499,7 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); - win->ProcessEvent(event); + win->GetEventHandler()->ProcessEvent(event); win->OnInternalIdle(); @@ -431,7 +515,8 @@ bool wxApp::SendIdleEvents( wxWindow* win ) node = node->Next(); } - return needMore ; + + return needMore; } int wxApp::MainLoop() @@ -479,11 +564,11 @@ void wxApp::DeletePendingObjects() bool wxApp::Initialize() { - wxBuffer = new wxChar[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); - wxSystemSettings::Init(); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif // 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. @@ -516,9 +601,7 @@ void wxApp::CleanUp() wxCleanUpResourceSystem(); #endif - if (wxTheColourDatabase) - delete wxTheColourDatabase; - + delete wxTheColourDatabase; wxTheColourDatabase = (wxColourDatabase*) NULL; wxDeleteStockObjects(); @@ -528,22 +611,16 @@ 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. + wxClassInfo::CleanUpClasses(); + #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) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { wxLogDebug(wxT("There were memory leaks.\n")); wxDebugContext::Dump(); @@ -565,21 +642,15 @@ void wxApp::CleanUp() // wxEntry //----------------------------------------------------------------------------- - -int wxEntryStart( int argc, char *argv[] ) +// NB: argc and argv may be changed here, pass by reference! +int wxEntryStart( int& argc, char *argv[] ) { #if wxUSE_THREADS - /* GTK 1.2 up to version 1.2.3 has broken threads */ -#ifdef __VMS__ - if ((vms_gtk_major_version() == 1) && - (vms_gtk_minor_version() == 2) && - (vms_gtk_micro_version() < 4)) -#else - if ((gtk_major_version == 1) && + // GTK 1.2 up to version 1.2.3 has broken threads + if ((gtk_major_version == 1) && (gtk_minor_version == 2) && (gtk_micro_version < 4)) -#endif - { + { printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); } else @@ -590,8 +661,14 @@ int wxEntryStart( int argc, char *argv[] ) gtk_set_locale(); + // We should have the wxUSE_WCHAR_T test on the _outside_ #if wxUSE_WCHAR_T +#if defined(__WXGTK20__) + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; +#else if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#endif #else if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; #endif @@ -619,8 +696,7 @@ int wxEntryInitGui() if ( !wxTheApp->OnInitGui() ) retValue = -1; - wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( wxRootWindow ); + wxGetRootWindow(); return retValue; } @@ -648,12 +724,18 @@ void wxEntryCleanup() } - int wxEntry( int argc, char *argv[] ) { - int err; - - err = wxEntryStart(argc, argv); +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + wxDebugContext::SetCheckpoint(); +#endif + int err = wxEntryStart(argc, argv); if (err) return err; @@ -739,13 +821,19 @@ int wxEntry( int argc, char *argv[] ) return retValue; } +#ifndef __WXUNIVERSAL__ + +// XPM hack: make the arrays const +#define static static const + #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 +#undef static + +wxIcon wxApp::GetStdIcon(int which) const { switch(which) { @@ -766,3 +854,24 @@ wxApp::GetStdIcon(int which) const return wxIcon(error_xpm); } } +#else +wxIcon wxApp::GetStdIcon(int which) const +{ + return wxTheme::Get()->GetRenderer()->GetStdIcon(which); +} +#endif // !__WXUNIVERSAL__ + + +#ifdef __WXDEBUG__ + +void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +{ + m_isInAssert = TRUE; + + wxAppBase::OnAssert(file, line, msg); + + m_isInAssert = FALSE; +} + +#endif // __WXDEBUG__ +