X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3858bf5614fae70f1cdc11e5f187691ef2a4c4a..a16c6fdcbdcf470b00cddbf8635bb6904fa6e1bb:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index dad9249bc9..8255d6178c 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -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 @@ -34,6 +30,11 @@ #include "wx/filename.h" #include "wx/module.h" #include "wx/image.h" +#include "wx/thread.h" + +#ifdef __WXGPE__ +#include +#endif #ifdef __WXUNIVERSAL__ #include "wx/univ/theme.h" @@ -71,11 +72,11 @@ #include #endif // HAVE_POLL/!HAVE_POLL -#include "wx/gtk/win_gtk.h" +#include "wx/unix/private.h" +#include "wx/gtk1/win_gtk.h" #include - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -93,6 +94,10 @@ extern bool g_isIdle; void wxapp_install_idle_handler(); +#if wxUSE_THREADS +static wxMutex gs_idleTagsMutex; +#endif + //----------------------------------------------------------------------------- // wxYield //----------------------------------------------------------------------------- @@ -124,18 +129,15 @@ bool wxApp::Yield(bool onlyIfNeeded) wxIsInsideYield = TRUE; - if (!g_isIdle) - { - // We need to remove idle callbacks or the loop will - // never finish. - gtk_idle_remove( m_idleTag ); - m_idleTag = 0; - g_isIdle = TRUE; - } + // We need to remove idle callbacks or the loop will + // never finish. + wxTheApp->RemoveIdleTag(); +#if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); +#endif while (gtk_events_pending()) gtk_main_iteration(); @@ -148,8 +150,10 @@ bool wxApp::Yield(bool onlyIfNeeded) // return value of Processidle(). ProcessIdle(); +#if wxUSE_LOG // let the logs be flashed again wxLog::Resume(); +#endif wxIsInsideYield = FALSE; @@ -160,20 +164,26 @@ bool wxApp::Yield(bool onlyIfNeeded) // 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. + void wxApp::WakeUpIdle() { #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiEnter(); -#endif +#endif // wxUSE_THREADS_ - if (g_isIdle) - wxapp_install_idle_handler(); + wxapp_install_idle_handler(); #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiLeave(); -#endif +#endif // wxUSE_THREADS_ } //----------------------------------------------------------------------------- @@ -196,7 +206,12 @@ static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) // Sent idle event to all who request them. wxTheApp->ProcessPendingEvents(); - g_pendingTag = 0; + { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_pendingTag = 0; + } // Flush the logged messages if any. #if wxUSE_LOG @@ -226,11 +241,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) 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; @@ -244,8 +255,13 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) // 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 + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_isIdle = TRUE; + wxTheApp->m_idleTag = 0; + } // Send idle event to all who request them as long as // no events have popped up in the event queue. @@ -283,23 +299,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; @@ -313,13 +329,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; } @@ -353,6 +369,15 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) void wxapp_install_idle_handler() { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + + // Don't install the handler if it's already installed. This test *MUST* + // be done when gs_idleTagsMutex is locked! + if (!g_isIdle) + return; + // GD: this assert is raised when using the thread sample (which works) // so the test is probably not so easy. Can widget callbacks be // triggered from child threads and, if so, for which widgets? @@ -399,12 +424,12 @@ END_EVENT_TABLE() wxApp::wxApp() { - m_initialized = FALSE; #ifdef __WXDEBUG__ m_isInAssert = FALSE; #endif // __WXDEBUG__ m_idleTag = 0; + g_isIdle = TRUE; wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -415,6 +440,7 @@ wxApp::wxApp() // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp m_glVisualInfo = (void *) NULL; + m_glFBCInfo = (void *) NULL; } wxApp::~wxApp() @@ -435,14 +461,9 @@ bool wxApp::OnInitGui() // 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 ); @@ -456,13 +477,8 @@ 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 ); @@ -538,53 +554,22 @@ GdkVisual *wxApp::GetGdkVisual() return visual; } -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::Exit() -{ - // VZ: no idea why is it different from ExitMainLoop() but this is what - // wxExit() used to do - gtk_main_quit(); -} - -void wxApp::ExitMainLoop() -{ - if (gtk_main_level() > 0) - gtk_main_quit(); -} - -bool wxApp::Initialized() -{ - return m_initialized; -} - -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} - -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} - 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( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); + printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" ); } else { - g_thread_init(NULL); + if (!g_thread_supported()) + g_thread_init(NULL); } #endif // wxUSE_THREADS @@ -592,13 +577,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // 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 #else // !wxUSE_WCHAR_T if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; @@ -616,7 +596,13 @@ bool wxApp::Initialize(int& argc, wxChar **argv) argvGTK[argc] = NULL; int argcGTK = argc; - gtk_init( &argcGTK, &argvGTK ); + +#ifdef __WXGPE__ + init_result = true; // is there a _check() version of this? + gpe_application_init( &argcGTK, &argvGTK ); +#else + init_result = gtk_init_check( &argcGTK, &argvGTK ); +#endif if ( argcGTK != argc ) { @@ -643,9 +629,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #else // !wxUSE_UNICODE // gtk_init() shouldn't actually change argv itself (just its contents) so // it's ok to pass pointer to it - gtk_init( &argc, &argv ); + init_result = gtk_init_check( &argc, &argv ); #endif // wxUSE_UNICODE/!wxUSE_UNICODE + if (!init_result) { + 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(); @@ -662,8 +653,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - wxGetRootWindow(); - return true; } @@ -687,3 +676,15 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC #endif // __WXDEBUG__ +void wxApp::RemoveIdleTag() +{ +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + if (!g_isIdle) + { + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = TRUE; + } +}