X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8461e4c253d4cec65e8f0320246a56d22555eb5e..1c405bb51093fc7812fb66e7d47faac5707e02b5:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 0ef365ec05..86a0258e1b 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -61,14 +61,15 @@ static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; // local functions //----------------------------------------------------------------------------- -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); -gint wxapp_pending_callback( gpointer WXUNUSED(data) ); -void wxapp_install_idle_handler(); +extern "C" +{ + gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + gint wxapp_pending_callback( gpointer WXUNUSED(data) ); +} -#if wxUSE_THREADS -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ); -#endif +void wxapp_install_thread_wakeup(); +void wxapp_uninstall_thread_wakeup(); +void wxapp_install_idle_handler(); //----------------------------------------------------------------------------- // wxExit @@ -163,6 +164,28 @@ 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) ) { if (!wxTheApp) return TRUE; @@ -230,24 +253,42 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) return FALSE; } -void wxapp_install_idle_handler() +#if wxUSE_THREADS + +gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) { - wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + // 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; + wxapp_uninstall_thread_wakeup(); - if (g_pendingTag == 0) - g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + // unblock other threads wishing to do some GUI things + wxMutexGuiLeave(); - /* 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. */ + g_mainThreadLocked = TRUE; - wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); + // wake up other threads + wxUsleep( 1 ); + + // block other thread again + wxMutexGuiEnter(); + + g_mainThreadLocked = FALSE; + + wxapp_install_thread_wakeup(); + + // release lock again + gdk_threads_leave(); + + return TRUE; } +#endif // wxUSE_THREADS + +} // extern "C" + #if wxUSE_THREADS static int g_threadUninstallLevel = 0; @@ -275,38 +316,22 @@ void wxapp_uninstall_thread_wakeup() wxTheApp->m_wakeUpTimerTag = 0; } -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(); - - g_mainThreadLocked = TRUE; - - // wake up other threads - wxUsleep( 1 ); - - // block other thread again - wxMutexGuiEnter(); - - g_mainThreadLocked = FALSE; - - wxapp_install_thread_wakeup(); +#endif // wxUSE_THREADS - // 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 //----------------------------------------------------------------------------- @@ -358,9 +383,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( @@ -374,12 +400,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? */ @@ -395,10 +420,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(); @@ -435,16 +460,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; } @@ -454,6 +474,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; @@ -580,8 +614,6 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); - wxSystemSettings::Init(); - #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif @@ -636,8 +668,6 @@ void wxApp::CleanUp() delete wxPendingEventsLocker; #endif - wxSystemSettings::Done(); - delete[] wxBuffer; wxClassInfo::CleanUpClasses(); @@ -662,29 +692,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)) { @@ -761,7 +778,6 @@ void wxEntryCleanup() } - int wxEntry( int argc, char *argv[] ) { #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT @@ -861,11 +877,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)