X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6f5aa49cf93fc19c776bcce0a7872bdc9707afb..cb7acf9cc78c309026bed1038631f2663cd90bda:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 38d4d1e75f..65710bb24d 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/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,18 +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" #endif #include +#ifdef __VMS +# include +#else +# include +#endif +#include "wx/gtk/win_gtk.h" -#include -#include #include -#include -#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- // global data @@ -48,25 +59,18 @@ wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; -extern bool g_isIdle; - bool g_mainThreadLocked = FALSE; gint g_pendingTag = 0; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- -// local functions +// idle system //----------------------------------------------------------------------------- -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); -gint wxapp_pending_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 @@ -81,10 +85,21 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- -static bool gs_inYield = FALSE; - -bool wxYield() +bool wxApp::Yield(bool onlyIfNeeded) { + // MT-FIXME + static bool s_inYield = FALSE; + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; + } + #if wxUSE_THREADS if ( !wxThread::IsMain() ) { @@ -93,19 +108,14 @@ bool wxYield() } #endif // wxUSE_THREADS -#ifdef __WXDEBUG__ - if (gs_inYield) - wxFAIL_MSG( wxT("wxYield called recursively" ) ); -#endif - - gs_inYield = TRUE; + s_inYield = TRUE; if (!g_isIdle) { // We need to remove idle callbacks or the loop will // never finish. - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + gtk_idle_remove( m_idleTag ); + m_idleTag = 0; g_isIdle = TRUE; } @@ -116,32 +126,22 @@ bool wxYield() 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) */ - while (wxTheApp->ProcessIdle()) { } + // 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(); - gs_inYield = FALSE; + s_inYield = FALSE; return TRUE; } -//----------------------------------------------------------------------------- -// wxYieldIfNeeded -// Like wxYield, but fails silently if the yield is recursive. -//----------------------------------------------------------------------------- - -bool wxYieldIfNeeded() -{ - if (gs_inYield) - return FALSE; - - return wxYield(); -} - //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- @@ -166,21 +166,25 @@ void wxWakeUpIdle() // local functions //----------------------------------------------------------------------------- -gint wxapp_pending_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(); - // Sent idle event to all who request them + // Sent idle event to all who request them. wxTheApp->ProcessPendingEvents(); g_pendingTag = 0; - /* flush the logged messages if any */ + // Flush the logged messages if any. #if wxUSE_LOG wxLog::FlushActive(); #endif // wxUSE_LOG @@ -193,7 +197,7 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) ) return FALSE; } -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) return TRUE; @@ -208,108 +212,84 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) } #endif // __WXDEBUG__ - // 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(); - /* 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 */ + // 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; - // Sent idle event to all who request them as long as they do - while (wxTheApp->ProcessIdle()) + // 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)) ; // Release lock again gdk_threads_leave(); // Return FALSE to indicate that no more idle events are - // to be sent (single shot instead of continuous stream) + // to be sent (single shot instead of continuous stream). return FALSE; } -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 ); -} - #if wxUSE_THREADS -static int g_threadUninstallLevel = 0; - -void wxapp_install_thread_wakeup() +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - g_threadUninstallLevel++; - - if (g_threadUninstallLevel != 1) return; - - if (wxTheApp->m_wakeUpTimerTag) return; + gint res; + gdk_threads_enter(); - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL ); -} + wxMutexGuiLeave(); + g_mainThreadLocked = TRUE; -void wxapp_uninstall_thread_wakeup() -{ - g_threadUninstallLevel--; + res = poll( (struct pollfd*) ufds, nfds, timeout ); - if (g_threadUninstallLevel != 0) return; + wxMutexGuiEnter(); + g_mainThreadLocked = FALSE; - if (!wxTheApp->m_wakeUpTimerTag) return; + gdk_threads_leave(); - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; + return res; } -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) -{ - // 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(); - - wxapp_uninstall_thread_wakeup(); - - // unblock other threads wishing to do some GUI things - wxMutexGuiLeave(); +#endif // wxUSE_THREADS - g_mainThreadLocked = TRUE; +} // extern "C" - // wake up other threads - wxUsleep( 1 ); +void wxapp_install_idle_handler() +{ + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - // block other thread again - wxMutexGuiEnter(); + g_isIdle = FALSE; - g_mainThreadLocked = FALSE; + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); - wxapp_install_thread_wakeup(); + // 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 ); +} - // release lock again - gdk_threads_leave(); +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- - return TRUE; +GtkWidget* wxGetRootWindow() +{ + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; } -#endif // wxUSE_THREADS - //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- @@ -331,8 +311,7 @@ wxApp::wxApp() 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; @@ -345,10 +324,6 @@ wxApp::~wxApp() { if (m_idleTag) gtk_idle_remove( m_idleTag ); -#if wxUSE_THREADS - wxapp_uninstall_thread_wakeup(); -#endif - if (m_colorCube) free(m_colorCube); } @@ -361,9 +336,10 @@ bool wxApp::OnInitGui() // 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) { + if (m_glVisualInfo != NULL) + { #ifdef __WXGTK20__ - /* seems gtk_widget_set_default_visual no longer exists? */ + // seems gtk_widget_set_default_visual no longer exists? GdkVisual* vis = gtk_widget_get_default_visual(); #else GdkVisual* vis = gdkx_visual_get( @@ -377,12 +353,11 @@ bool wxApp::OnInitGui() 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, - of course, but what do these guys pay $30.000 for? */ + // 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)) + else + if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) { #ifdef __WXGTK20__ /* seems gtk_widget_set_default_visual no longer exists? */ @@ -398,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(); @@ -438,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; } @@ -457,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; @@ -470,20 +454,20 @@ 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) @@ -531,7 +515,8 @@ bool wxApp::SendIdleEvents( wxWindow* win ) node = node->Next(); } - return needMore ; + + return needMore; } int wxApp::MainLoop() @@ -579,12 +564,8 @@ void wxApp::DeletePendingObjects() bool wxApp::Initialize() { - wxBuffer = new wxChar[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); - wxSystemSettings::Init(); - #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif @@ -620,9 +601,7 @@ void wxApp::CleanUp() wxCleanUpResourceSystem(); #endif - if (wxTheColourDatabase) - delete wxTheColourDatabase; - + delete wxTheColourDatabase; wxTheColourDatabase = (wxColourDatabase*) NULL; wxDeleteStockObjects(); @@ -632,19 +611,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. + 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(TRUE) > 0) @@ -665,29 +638,16 @@ void wxApp::CleanUp() #endif // wxUSE_LOG } -//----------------------------------------------------------------------------- -// 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; -} - //----------------------------------------------------------------------------- // 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 */ - 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)) { @@ -764,7 +724,6 @@ void wxEntryCleanup() } - int wxEntry( int argc, char *argv[] ) { #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT @@ -862,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) { @@ -889,6 +854,13 @@ 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__