X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe593cc504195a3c91281eae4edf5e852a51a59c..a653c966d4dfdb2e0b404ed7991c9c1abf0dcada:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 5aa26126a7..449a0f2a0b 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk1/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,33 +7,27 @@ // 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 -#undef ConnectionNumber -#endif - // For compilers that support precompilation, includes "wx.h". #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/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/memory.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/image.h" + #include "wx/module.h" +#endif + #include "wx/file.h" #include "wx/filename.h" -#include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ @@ -74,21 +68,24 @@ #include #include #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif #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 //----------------------------------------------------------------------------- -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = false; gint g_pendingTag = 0; -static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; +static GtkWidget *gs_RootWindow = NULL; //----------------------------------------------------------------------------- // idle system @@ -106,44 +103,37 @@ static wxMutex gs_idleTagsMutex; // wxYield //----------------------------------------------------------------------------- -// not static because used by textctrl.cpp -// -// MT-FIXME -bool wxIsInsideYield = FALSE; - bool wxApp::Yield(bool onlyIfNeeded) { - if ( wxIsInsideYield ) + if ( m_isInsideYield ) { if ( !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; + m_isInsideYield = true; - if (!g_isIdle) - { - // We need to remove idle callbacks or the loop will - // never finish. - wxTheApp->RemoveIdleTag(); - 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(); @@ -156,12 +146,14 @@ bool wxApp::Yield(bool onlyIfNeeded) // return value of Processidle(). ProcessIdle(); +#if wxUSE_LOG // let the logs be flashed again wxLog::Resume(); +#endif - wxIsInsideYield = FALSE; + m_isInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- @@ -177,22 +169,17 @@ bool wxApp::Yield(bool onlyIfNeeded) void wxApp::WakeUpIdle() { -#ifndef __WXGTK20__ #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiEnter(); -#endif // wxUSE_THREADS_ -#endif // __WXGTK2__ +#endif // wxUSE_THREADS - if (g_isIdle) - wxapp_install_idle_handler(); + wxapp_install_idle_handler(); -#ifndef __WXGTK20__ #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiLeave(); -#endif // wxUSE_THREADS_ -#endif // __WXGTK2__ +#endif // wxUSE_THREADS } //----------------------------------------------------------------------------- @@ -250,11 +237,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; @@ -312,9 +295,9 @@ 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++ ) @@ -322,13 +305,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) wxASSERT_MSG( ufds[i].fd < FD_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; @@ -342,13 +325,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; } @@ -362,14 +345,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(); @@ -386,6 +369,11 @@ void wxapp_install_idle_handler() 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? @@ -393,7 +381,7 @@ void wxapp_install_idle_handler() wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - g_isIdle = FALSE; + g_isIdle = false; if (g_pendingTag == 0) g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); @@ -406,6 +394,28 @@ void wxapp_install_idle_handler() wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); } +static bool wxOKlibc() +{ +#if defined(__UNIX__) && defined(__GLIBC__) + // glibc 2.0 uses UTF-8 even when it shouldn't + wchar_t res = 0; + if ((MB_CUR_MAX == 2) && + (wxMB2WC(&res, "\xdd\xa5", 1) == 1) && + (res==0x765)) + { + // this is UTF-8 allright, check whether that's what we want + char *cur_locale = setlocale(LC_CTYPE, NULL); + if ((strlen(cur_locale) < 4) || + (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) || + (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) { + // nope, don't use libc conversion + return false; + } + } +#endif + return true; +} + //----------------------------------------------------------------------------- // Access to the root window global //----------------------------------------------------------------------------- @@ -426,17 +436,14 @@ GtkWidget* wxGetRootWindow() IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -END_EVENT_TABLE() - wxApp::wxApp() { #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ m_idleTag = 0; + g_isIdle = TRUE; wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -446,7 +453,8 @@ wxApp::wxApp() 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_glVisualInfo = NULL; + m_glFBCInfo = NULL; } wxApp::~wxApp() @@ -459,7 +467,7 @@ wxApp::~wxApp() bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; + return false; GdkVisual *visual = gdk_visual_get_system(); @@ -467,14 +475,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 ); @@ -488,13 +491,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 ); @@ -553,7 +551,7 @@ bool wxApp::OnInitGui() } } - return TRUE; + return true; } GdkVisual *wxApp::GetGdkVisual() @@ -573,7 +571,7 @@ 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) && @@ -592,18 +590,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) 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 -#else // !wxUSE_WCHAR_T if (!wxOKlibc()) - wxConvCurrent = (wxMBConv*) NULL; -#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T + wxConvCurrent = &wxConvLocal; #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert @@ -617,7 +605,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 ); @@ -657,7 +645,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(); @@ -688,11 +676,11 @@ void wxApp::CleanUp() void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ @@ -702,6 +690,10 @@ void wxApp::RemoveIdleTag() #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + if (!g_isIdle) + { + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = true; + } }