X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd7641ef10e8abdb37bca41740c047eef1846400..2121eb69fa8d49f4484f7170159e61f2e8885de4:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 4d25eb73de..8eebbeb35c 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "app.h" -#endif - #ifdef __VMS // vms_jackets.h should for proper working be included before anything else # include @@ -21,23 +17,21 @@ #include "wx/wxprec.h" #include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/settings.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/memory.h" + #include "wx/font.h" +#endif + #include "wx/file.h" #include "wx/filename.h" -#include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ -#include + #include #endif #ifdef __WXUNIVERSAL__ @@ -45,10 +39,6 @@ #include "wx/univ/renderer.h" #endif -#if wxUSE_THREADS - #include "wx/thread.h" -#endif - #include #ifdef HAVE_POLL @@ -74,18 +64,31 @@ #include #include #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif #endif // HAVE_POLL/!HAVE_POLL +#include "wx/unix/private.h" #include "wx/gtk/win_gtk.h" +#include "wx/gtk/private.h" + +#include + +//----------------------------------------------------------------------------- +// link GnomeVFS +//----------------------------------------------------------------------------- -#include +#if wxUSE_LIBGNOMEVFS +#include "wx/html/forcelnk.h" +FORCE_LINK(gnome_vfs) +#endif //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -bool g_mainThreadLocked = FALSE; -gint g_pendingTag = 0; +bool g_mainThreadLocked = false; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; @@ -93,8 +96,6 @@ static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; // idle system //----------------------------------------------------------------------------- -extern bool g_isIdle; - void wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -108,7 +109,7 @@ static wxMutex gs_idleTagsMutex; // not static because used by textctrl.cpp // // MT-FIXME -bool wxIsInsideYield = FALSE; +bool wxIsInsideYield = false; bool wxApp::Yield(bool onlyIfNeeded) { @@ -119,22 +120,22 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } #if wxUSE_THREADS if ( !wxThread::IsMain() ) { // can't call gtk_main_iteration() from other threads like this - return TRUE; + return true; } #endif // wxUSE_THREADS - wxIsInsideYield = TRUE; + wxIsInsideYield = true; // We need to remove idle callbacks or the loop will // never finish. - wxTheApp->RemoveIdleTag(); + RemoveIdleSource(); #if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't @@ -158,39 +159,21 @@ bool wxApp::Yield(bool onlyIfNeeded) wxLog::Resume(); #endif - wxIsInsideYield = FALSE; + wxIsInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- -// RR/KH: The wxMutexGui calls are not needed on GTK2 according to -// the GTK faq, http://www.gtk.org/faq/#AEN500 -// The calls to gdk_threads_enter() and leave() are specifically noted -// as not being necessary. The MutexGui calls are still left in for GTK1. -// Eliminating the MutexGui calls fixes the long-standing "random" lockup -// when using wxPostEvent (which calls WakeUpIdle) from a thread. +// RR/KH: No wxMutexGui calls are needed here according to the GTK faq, +// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent. void wxApp::WakeUpIdle() { -#ifndef __WXGTK20__ -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiEnter(); -#endif // wxUSE_THREADS_ -#endif // __WXGTK2__ - wxapp_install_idle_handler(); - -#ifndef __WXGTK20__ -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiLeave(); -#endif // wxUSE_THREADS_ -#endif // __WXGTK2__ } //----------------------------------------------------------------------------- @@ -201,62 +184,34 @@ void wxApp::WakeUpIdle() extern "C" { -static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) +// One-shot emission hook for "event" signal, to install idle handler. +// This will be called when the "event" signal is issued on any GtkWidget object. +static gboolean +event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer) { - if (!wxTheApp) return TRUE; - - // 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(); - - // Sent idle event to all who request them. - wxTheApp->ProcessPendingEvents(); - - { -#if wxUSE_THREADS - wxMutexLocker lock(gs_idleTagsMutex); -#endif - g_pendingTag = 0; - } - - // Flush the logged messages if any. -#if wxUSE_LOG - wxLog::FlushActive(); -#endif // wxUSE_LOG - - // Release lock again - gdk_threads_leave(); + wxapp_install_idle_handler(); + // remove hook + return false; +} - // Return FALSE to indicate that no more idle events are - // to be sent (single shot instead of continuous stream) - return FALSE; +static inline void wxAddEmissionHook() +{ + // add emission hook for "event" signal, to re-install idle handler when needed + guint sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); + g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL); } static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) - return TRUE; + return false; #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() ) - { - // But repaint the assertion message if necessary - if (wxTopLevelWindows.GetCount() > 0) - { - wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData(); -#ifdef __WXGTK20__ - if (win->IsKindOf(CLASSINFO(wxMessageDialog))) -#else - if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) -#endif - win->OnInternalIdle(); - } - return TRUE; - } + return false; #endif // __WXDEBUG__ // When getting called from GDK's time-out handler @@ -270,21 +225,25 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - g_isIdle = TRUE; + g_isIdle = true; wxTheApp->m_idleTag = 0; } + bool moreIdles; + // 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)) + while ( (moreIdles = 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). - return FALSE; + if (!moreIdles) + wxAddEmissionHook(); + + // Return FALSE if no more idle events are to be sent + return moreIdles; } #if wxUSE_THREADS @@ -310,23 +269,23 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) fd_set readfds; fd_set writefds; fd_set exceptfds; - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); + wxFD_ZERO(&readfds); + wxFD_ZERO(&writefds); + wxFD_ZERO(&exceptfds); unsigned int i; for ( i = 0; i < nfds; i++ ) { - wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") ); + wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") ); if ( ufds[i].events & G_IO_IN ) - FD_SET(ufds[i].fd, &readfds); + wxFD_SET(ufds[i].fd, &readfds); if ( ufds[i].events & G_IO_PRI ) - FD_SET(ufds[i].fd, &exceptfds); + wxFD_SET(ufds[i].fd, &exceptfds); if ( ufds[i].events & G_IO_OUT ) - FD_SET(ufds[i].fd, &writefds); + wxFD_SET(ufds[i].fd, &writefds); if ( ufds[i].fd > fdMax ) fdMax = ufds[i].fd; @@ -340,13 +299,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) { ufds[i].revents = 0; - if ( FD_ISSET(ufds[i].fd, &readfds ) ) + if ( wxFD_ISSET(ufds[i].fd, &readfds ) ) ufds[i].revents |= G_IO_IN; - if ( FD_ISSET(ufds[i].fd, &exceptfds ) ) + if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) ) ufds[i].revents |= G_IO_PRI; - if ( FD_ISSET(ufds[i].fd, &writefds ) ) + if ( wxFD_ISSET(ufds[i].fd, &writefds ) ) ufds[i].revents |= G_IO_OUT; } @@ -360,14 +319,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) gdk_threads_enter(); wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; + g_mainThreadLocked = true; // we rely on the fact that glib GPollFD struct is really just pollfd but // I wonder how wise is this in the long term (VZ) gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout ); wxMutexGuiEnter(); - g_mainThreadLocked = FALSE; + g_mainThreadLocked = false; gdk_threads_leave(); @@ -396,17 +355,14 @@ 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 ); + g_isIdle = false; // 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 ); + wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); } //----------------------------------------------------------------------------- @@ -436,19 +392,17 @@ END_EVENT_TABLE() wxApp::wxApp() { #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; wxapp_install_idle_handler(); #if wxUSE_THREADS - g_main_set_poll_func( wxapp_poll_func ); + g_main_context_set_poll_func( NULL, wxapp_poll_func ); #endif - m_colorCube = (unsigned char*) NULL; - // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp m_glVisualInfo = (void *) NULL; m_glFBCInfo = (void *) NULL; @@ -456,35 +410,24 @@ wxApp::wxApp() wxApp::~wxApp() { - if (m_idleTag) gtk_idle_remove( m_idleTag ); - - if (m_colorCube) free(m_colorCube); + if (m_idleTag) + g_source_remove( m_idleTag ); } bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; - - GdkVisual *visual = gdk_visual_get_system(); + return false; // 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 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 @@ -493,72 +436,14 @@ bool wxApp::OnInitGui() 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 ); - - visual = vis; } - // 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 - - GdkColormap *cmap = gtk_widget_get_default_colormap(); - - m_colorCube = (unsigned char*)malloc(32 * 32 * 32); - - for (int r = 0; r < 32; r++) - { - for (int g = 0; g < 32; g++) - { - for (int b = 0; b < 32; b++) - { - int rr = (r << 3) | (r >> 2); - int gg = (g << 3) | (g >> 2); - int bb = (b << 3) | (b >> 2); - - int index = -1; - - GdkColor *colors = cmap->colors; - if (colors) - { - 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 - { - // 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; - } - m_colorCube[ (r*1024) + (g*32) + b ] = index; - } - } - } - - return TRUE; + return true; } GdkVisual *wxApp::GetGdkVisual() @@ -568,7 +453,7 @@ GdkVisual *wxApp::GetGdkVisual() if (m_glVisualInfo) visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); else - visual = gdk_window_get_visual( wxGetRootWindow()->window ); + visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); wxASSERT( visual ); @@ -578,48 +463,33 @@ GdkVisual *wxApp::GetGdkVisual() bool wxApp::Initialize(int& argc, wxChar **argv) { bool init_result; - + #if wxUSE_THREADS - // 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)) - { - printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" ); - } - else - { - if (!g_thread_supported()) - g_thread_init(NULL); - } + if (!g_thread_supported()) + g_thread_init(NULL); #endif // wxUSE_THREADS 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 // GTK 1.x - if (!wxOKlibc()) - wxConvCurrent = &wxConvLocal; - #endif + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; #else // !wxUSE_WCHAR_T if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T -#ifdef __WXGTK20__ // decide which conversion to use for the file names // (1) this variable exists for the sole purpose of specifying the encoding // of the filenames for GTK+ programs, so use it if it is set wxString encName(wxGetenv(_T("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(_T(',')); if (encName == _T("@locale")) encName.clear(); encName.MakeUpper(); -#if wxUSE_INTL +#if wxUSE_INTL if (encName.empty()) { // (2) if a non default locale is set, assume that the user wants his @@ -636,7 +506,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #endif // wxUSE_INTL static wxConvBrokenFileNames fileconv(encName); wxConvFileName = &fileconv; -#endif // __WXGTK20__ #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert @@ -650,7 +519,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) argvGTK[argc] = NULL; int argcGTK = argc; - + #ifdef __WXGPE__ init_result = true; // is there a _check() version of this? gpe_application_init( &argcGTK, &argvGTK ); @@ -690,7 +559,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?")); return false; } - + // we can not enter threads before gtk_init is done gdk_threads_enter(); @@ -701,7 +570,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return false; } - wxSetDetectableAutoRepeat( TRUE ); + wxSetDetectableAutoRepeat( true ); #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); @@ -719,26 +588,31 @@ void wxApp::CleanUp() #ifdef __WXDEBUG__ -void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; - wxAppBase::OnAssert(file, line, cond, msg); + wxAppBase::OnAssertFailure(file, line, func, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ -void wxApp::RemoveIdleTag() +void wxApp::RemoveIdleSource() { #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - if (!g_isIdle) + if (m_idleTag != 0) { - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; - g_isIdle = TRUE; + g_source_remove(m_idleTag); + m_idleTag = 0; + g_isIdle = true; + wxAddEmissionHook(); } }