X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903506828b7d042350eae97b5014a63ffca17ef5..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index daa4e27b35..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" @@ -38,6 +42,11 @@ #endif #include +#ifdef __VMS +# include +#else +# include +#endif #include "wx/gtk/win_gtk.h" #include @@ -50,25 +59,17 @@ 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 //----------------------------------------------------------------------------- -extern "C" -{ - gint wxapp_idle_callback( gpointer WXUNUSED(data) ); - gint wxapp_pending_callback( gpointer WXUNUSED(data) ); -} +extern bool g_isIdle; -void wxapp_install_thread_wakeup(); -void wxapp_uninstall_thread_wakeup(); void wxapp_install_idle_handler(); //----------------------------------------------------------------------------- @@ -125,12 +126,13 @@ bool wxApp::Yield(bool onlyIfNeeded) 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 ( 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(); @@ -164,43 +166,25 @@ void wxWakeUpIdle() // local functions //----------------------------------------------------------------------------- -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 ); -} - // the callback functions must be extern "C" to comply with GTK+ declarations extern "C" { -gint wxapp_pending_callback( gpointer WXUNUSED(data) ) +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 @@ -213,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; @@ -228,96 +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; } #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" -#if wxUSE_THREADS - -static int g_threadUninstallLevel = 0; - -void wxapp_install_thread_wakeup() +void wxapp_install_idle_handler() { - g_threadUninstallLevel++; + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - if (g_threadUninstallLevel != 1) return; + g_isIdle = FALSE; - if (wxTheApp->m_wakeUpTimerTag) return; + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_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 ); } -void wxapp_uninstall_thread_wakeup() -{ - g_threadUninstallLevel--; - - if (g_threadUninstallLevel != 0) return; - - if (!wxTheApp->m_wakeUpTimerTag) return; +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; +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 //----------------------------------------------------------------------------- @@ -339,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; @@ -353,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); } @@ -369,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( @@ -385,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? */ @@ -406,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(); @@ -446,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; } @@ -465,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; @@ -478,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) @@ -539,7 +515,8 @@ bool wxApp::SendIdleEvents( wxWindow* win ) node = node->Next(); } - return needMore ; + + return needMore; } int wxApp::MainLoop() @@ -587,8 +564,6 @@ void wxApp::DeletePendingObjects() bool wxApp::Initialize() { - wxBuffer = new wxChar[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); #if wxUSE_INTL @@ -626,9 +601,7 @@ void wxApp::CleanUp() wxCleanUpResourceSystem(); #endif - if (wxTheColourDatabase) - delete wxTheColourDatabase; - + delete wxTheColourDatabase; wxTheColourDatabase = (wxColourDatabase*) NULL; wxDeleteStockObjects(); @@ -638,17 +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 - delete[] wxBuffer; - - wxClassInfo::CleanUpClasses(); - // check for memory leaks #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT if (wxDebugContext::CountObjectsLeft(TRUE) > 0) @@ -669,19 +638,6 @@ 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 //----------------------------------------------------------------------------- @@ -690,8 +646,8 @@ GtkWidget* wxGetRootWindow() 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)) { @@ -768,7 +724,6 @@ void wxEntryCleanup() } - int wxEntry( int argc, char *argv[] ) { #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT @@ -868,11 +823,16 @@ int wxEntry( int argc, char *argv[] ) #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" +#undef static + wxIcon wxApp::GetStdIcon(int which) const { switch(which)