X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d97237dac7f35e78f4a1ce1877dafc7b05ffb4f..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/gtk/app.cpp?ds=inline diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 160deeaba1..3754531c01 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -7,12 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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" @@ -22,378 +16,153 @@ #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" #endif -#include "wx/file.h" -#include "wx/filename.h" -#include "wx/module.h" #include "wx/thread.h" #ifdef __WXGPE__ #include #endif -#ifdef __WXUNIVERSAL__ - #include "wx/univ/theme.h" - #include "wx/univ/renderer.h" -#endif +#include "wx/apptrait.h" +#include "wx/fontmap.h" -#include +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -#ifdef HAVE_POLL - #if defined(__VMS) - #include - #else - // bug in the OpenBSD headers: at least in 3.1 there is no extern "C" - // in neither poll.h nor sys/poll.h which results in link errors later - #ifdef __OPENBSD__ - extern "C" - { - #endif - - #include - - #ifdef __OPENBSD__ - }; - #endif - #endif // platform -#else // !HAVE_POLL - // we implement poll() ourselves using select() which is supposed exist in - // all modern Unices - #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" +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 -#include +#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // link GnomeVFS //----------------------------------------------------------------------------- -#if wxUSE_LIBGNOMEVFS -#include "wx/html/forcelnk.h" -FORCE_LINK(gnome_vfs) +#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_vfs) #endif //----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -bool g_mainThreadLocked = false; -gint g_pendingTag = 0; - -static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -void wxapp_install_idle_handler(); - -#if wxUSE_THREADS -static wxMutex gs_idleTagsMutex; -#endif - -//----------------------------------------------------------------------------- -// wxYield +// local functions //----------------------------------------------------------------------------- -// not static because used by textctrl.cpp -// -// MT-FIXME -bool wxIsInsideYield = false; +// One-shot signal emission hook, to install idle handler. +extern "C" { +static gboolean +wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) +{ + wxApp* app = wxTheApp; + if (app != NULL) + app->WakeUpIdle(); + bool* hook_installed = (bool*)data; + // record that hook is not installed + *hook_installed = false; + // remove hook + return false; +} +} -bool wxApp::Yield(bool onlyIfNeeded) +// Add signal emission hooks, to re-install idle handler when needed. +static void wx_add_idle_hooks() { - if ( wxIsInsideYield ) + // "event" hook { - if ( !onlyIfNeeded ) + static bool hook_installed; + if (!hook_installed) { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); + static guint sig_id; + if (sig_id == 0) + sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); } - - return false; } - -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) + // "size_allocate" hook + // Needed to match the behaviour of the old idle system, + // but probably not necessary. { - // can't call gtk_main_iteration() from other threads like this - return true; + static bool hook_installed; + if (!hook_installed) + { + static guint sig_id; + if (sig_id == 0) + sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); + } } -#endif // wxUSE_THREADS - - wxIsInsideYield = 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(); - - // 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(); - -#if wxUSE_LOG - // let the logs be flashed again - wxLog::Resume(); -#endif - - wxIsInsideYield = false; - - return true; } -//----------------------------------------------------------------------------- -// wxWakeUpIdle -//----------------------------------------------------------------------------- - -// 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() +extern "C" { +static gboolean wxapp_idle_callback(gpointer) { - wxapp_install_idle_handler(); + return wxTheApp->DoIdle(); } - -//----------------------------------------------------------------------------- -// local functions -//----------------------------------------------------------------------------- - -// the callback functions must be extern "C" to comply with GTK+ declarations -extern "C" -{ - -static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) -{ - 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(); - - // Return FALSE to indicate that no more idle events are - // to be sent (single shot instead of continuous stream) - return FALSE; } -static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +bool wxApp::DoIdle() { - if (!wxTheApp) - return TRUE; - -#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(); - if (win->IsKindOf(CLASSINFO(wxMessageDialog))) - win->OnInternalIdle(); - } - return TRUE; - } -#endif // __WXDEBUG__ - - // 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(); - - // Indicate that we are now in idle mode and event handlers - // will have to reinstall the idle handler again. + guint id_save; { + // Allow another idle source to be added while this one is busy. + // Needed if an idle event handler runs a new event loop, + // for example by showing a dialog. #if wxUSE_THREADS - wxMutexLocker lock(gs_idleTagsMutex); + wxMutexLocker lock(m_idleMutex); +#endif + id_save = m_idleSourceId; + m_idleSourceId = 0; + wx_add_idle_hooks(); + +#if wxDEBUG_LEVEL + // don't generate the idle events while the assert modal dialog is shown, + // this matches the behaviour of wxMSW + if (m_isInAssert) + return false; #endif - 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 ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0) - ; - - // Release lock again - gdk_threads_leave(); - - // Return FALSE if no more idle events are to be sent - return moreIdles; -} - -#if wxUSE_THREADS - -#ifdef HAVE_POLL - #define wxPoll poll - #define wxPollFd pollfd -#else // !HAVE_POLL - -typedef GPollFD wxPollFd; - -int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) -{ - // convert timeout from ms to struct timeval (s/us) - timeval tv_timeout; - tv_timeout.tv_sec = timeout/1000; - tv_timeout.tv_usec = (timeout%1000)*1000; - - // remember the highest fd used here - int fdMax = -1; - - // and fill the sets for select() - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - wxFD_ZERO(&readfds); - wxFD_ZERO(&writefds); - wxFD_ZERO(&exceptfds); - - unsigned int i; - for ( i = 0; i < nfds; i++ ) - { - wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") ); - - if ( ufds[i].events & G_IO_IN ) - wxFD_SET(ufds[i].fd, &readfds); - - if ( ufds[i].events & G_IO_PRI ) - wxFD_SET(ufds[i].fd, &exceptfds); - - if ( ufds[i].events & G_IO_OUT ) - wxFD_SET(ufds[i].fd, &writefds); - - if ( ufds[i].fd > fdMax ) - fdMax = ufds[i].fd; - } - - fdMax++; - int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); - - // translate the results back - for ( i = 0; i < nfds; i++ ) - { - ufds[i].revents = 0; - - if ( wxFD_ISSET(ufds[i].fd, &readfds ) ) - ufds[i].revents |= G_IO_IN; - - if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) ) - ufds[i].revents |= G_IO_PRI; - - if ( wxFD_ISSET(ufds[i].fd, &writefds ) ) - ufds[i].revents |= G_IO_OUT; } - return res; -} - -#endif // HAVE_POLL/!HAVE_POLL - -static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) -{ gdk_threads_enter(); + bool needMore; + do { + ProcessPendingEvents(); - wxMutexGuiLeave(); - 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; - + needMore = ProcessIdle(); + } while (needMore && gtk_events_pending() == 0); gdk_threads_leave(); - return res; -} - -#endif // wxUSE_THREADS - -} // extern "C" - -void wxapp_install_idle_handler() -{ #if wxUSE_THREADS - wxMutexLocker lock(gs_idleTagsMutex); + wxMutexLocker lock(m_idleMutex); #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? - // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") ); - - wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - - g_isIdle = false; - - if (g_pendingTag == 0) - g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL ); + bool keepSource = false; + // if a new idle source has not been added, either as a result of idle + // processing above or by another thread calling WakeUpIdle() + if (m_idleSourceId == 0) + { + // if more idle processing was requested or pending events have appeared + if (needMore || HasPendingEvents()) + { + // keep this source installed + m_idleSourceId = id_save; + keepSource = true; + } + else // add hooks and remove this source + wx_add_idle_hooks(); + } + // else remove this source, leave new one installed + // we must keep an idle source, otherwise a wakeup could be lost - // 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 = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL ); + return keepSource; } //----------------------------------------------------------------------------- @@ -402,12 +171,14 @@ void wxapp_install_idle_handler() GtkWidget* wxGetRootWindow() { - if (gs_RootWindow == NULL) + static GtkWidget *s_RootWindow = NULL; + + if (s_RootWindow == NULL) { - gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( gs_RootWindow ); + s_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( s_RootWindow ); } - return gs_RootWindow; + return s_RootWindow; } //----------------------------------------------------------------------------- @@ -416,33 +187,43 @@ 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; -#endif // __WXDEBUG__ - - m_idleTag = 0; - g_isIdle = true; - wxapp_install_idle_handler(); - -#if wxUSE_THREADS - g_main_context_set_poll_func( NULL, wxapp_poll_func ); -#endif - - // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp - m_glVisualInfo = (void *) NULL; - m_glFBCInfo = (void *) NULL; + m_idleSourceId = 0; } wxApp::~wxApp() { - if (m_idleTag) - g_source_remove( m_idleTag ); +} + +bool wxApp::SetNativeTheme(const wxString& theme) +{ +#ifdef __WXGTK3__ + wxUnusedVar(theme); + return false; +#else + wxString path; + path = gtk_rc_get_theme_dir(); + path += "/"; + path += theme.utf8_str(); + path += "/gtk-2.0/gtkrc"; + + if ( wxFileExists(path.utf8_str()) ) + gtk_rc_add_default_file(path.utf8_str()); + else if ( wxFileExists(theme.utf8_str()) ) + gtk_rc_add_default_file(theme.utf8_str()); + else + { + wxLogWarning("Theme \"%s\" not available.", theme); + + return false; + } + + gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE); + + return true; +#endif } bool wxApp::OnInitGui() @@ -450,126 +231,158 @@ bool wxApp::OnInitGui() if ( !wxAppBase::OnInitGui() ) return false; +#ifndef __WXGTK3__ // 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 ( GetXVisualInfo() ) { - // seems gtk_widget_set_default_visual no longer exists? GdkVisual* vis = gtk_widget_get_default_visual(); GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); } - - // 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)) { - /* seems gtk_widget_set_default_visual no longer exists? */ - GdkVisual* vis = gtk_widget_get_default_visual(); + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. + if (m_useBestVisual) + { + if (m_forceTrueColour) + { + GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR ); + if (!visual) + { + wxLogError(wxT("Unable to initialize TrueColor visual.")); + return false; + } + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else + { + if (gdk_visual_get_best() != gdk_visual_get_system()) + { + GdkVisual* visual = gdk_visual_get_best(); + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + } + } + } +#endif - GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); - gtk_widget_set_default_colormap( colormap ); +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + if ( !GetHildonProgram() ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 return true; } -GdkVisual *wxApp::GetGdkVisual() -{ - GdkVisual *visual = NULL; - - if (m_glVisualInfo) - visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); - else - visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); - - wxASSERT( visual ); - - return visual; -} - -bool wxApp::Initialize(int& argc, wxChar **argv) +// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] +bool wxApp::Initialize(int& argc_, wxChar **argv_) { - bool init_result; + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; #if wxUSE_THREADS if (!g_thread_supported()) + { g_thread_init(NULL); + gdk_threads_init(); + } #endif // wxUSE_THREADS - gtk_set_locale(); - - // We should have the wxUSE_WCHAR_T test on the _outside_ -#if wxUSE_WCHAR_T // 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 __UNIX__ // 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")) + wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(wxT(',')); + if (encName.CmpNoCase(wxT("@locale")) == 0) encName.clear(); encName.MakeUpper(); -#if wxUSE_INTL if (encName.empty()) { +#if wxUSE_INTL // (2) if a non default locale is set, assume that the user wants his // filenames in this locale too encName = wxLocale::GetSystemEncodingName().Upper(); + + // But don't consider ASCII in this case. + if ( !encName.empty() ) + { +#if wxUSE_FONTMAP + wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encName); + if ( enc == wxFONTENCODING_DEFAULT ) +#else // !wxUSE_FONTMAP + if ( encName == wxT("US-ASCII") ) +#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP + { + // This means US-ASCII when returned from GetEncodingFromName(). + encName.clear(); + } + } +#endif // wxUSE_INTL + // (3) finally use UTF-8 by default - if (encName.empty() || encName == _T("US-ASCII")) - encName = _T("UTF-8"); - wxSetEnv(_T("G_FILENAME_ENCODING"), encName); + if ( encName.empty() ) + encName = wxT("UTF-8"); + wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); } -#else - if (encName.empty()) - encName = _T("UTF-8"); -#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); wxConvFileName = &fileconv; +#endif // __UNIX__ + + + bool init_result; + int i; #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert - int i; - char **argvGTK = new char *[argc + 1]; - for ( i = 0; i < argc; i++ ) + char **argvGTK = new char *[argc_ + 1]; + for ( i = 0; i < argc_; i++ ) { - argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i])); } - argvGTK[argc] = NULL; + argvGTK[argc_] = NULL; + + int argcGTK = argc_; - int argcGTK = argc; + // Prevent gtk_init_check() from changing the locale automatically for + // consistency with the other ports that don't do it. If necessary, + // wxApp::SetCLocale() may be explicitly called. + gtk_disable_setlocale(); #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 ); + init_result = gtk_init_check( &argcGTK, &argvGTK ) != 0; #endif - if ( argcGTK != argc ) + if ( argcGTK != argc_ ) { // we have to drop the parameters which were consumed by GTK+ for ( i = 0; i < argcGTK; i++ ) { - while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 ) + while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 ) { - memmove(argv + i, argv + i + 1, argc - i); + memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_)); } } - argc = argcGTK; + argc_ = argcGTK; + argv_[argc_] = NULL; } //else: gtk_init() didn't modify our parameters @@ -581,43 +394,104 @@ bool wxApp::Initialize(int& argc, wxChar **argv) delete [] argvGTK; #else // !wxUSE_UNICODE - // gtk_init() shouldn't actually change argv itself (just its contents) so + // gtk_init() shouldn't actually change argv_ itself (just its contents) so // it's ok to pass pointer to it - init_result = gtk_init_check( &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(); + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; - if ( !wxAppBase::Initialize(argc, argv) ) + if ( m_traits ) { - gdk_threads_leave(); + // if there are still GTK+ standard options unparsed in the command + // line, it means that they were not syntactically correct and GTK+ + // already printed a warning on the command line and we should now + // exit: + wxArrayString opt, desc; + m_traits->GetStandardCmdLineOptions(opt, desc); + + for ( i = 0; i < argc_; i++ ) + { + // leave just the names of the options with values + const wxString str = wxString(argv_[i]).BeforeFirst('='); + + for ( size_t j = 0; j < opt.size(); j++ ) + { + // remove the leading spaces from the option string as it does + // have them + if ( opt[j].Trim(false).BeforeFirst('=') == str ) + { + // a GTK+ option can be left on the command line only if + // there was an error in (or before, in another standard + // options) it, so abort, just as we do if incorrect + // program option is given + wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""), + argv_[0]); + return false; + } + } + } + } + if ( !init_result ) + { + wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); return false; } - wxSetDetectableAutoRepeat( true ); + // we cannot enter threads before gtk_init is done + gdk_threads_enter(); #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif + // make sure GtkWidget type is loaded, idle hooks need it + g_type_class_ref(GTK_TYPE_WIDGET); + WakeUpIdle(); + return true; } void wxApp::CleanUp() { + if (m_idleSourceId != 0) + g_source_remove(m_idleSourceId); + + // release reference acquired by Initialize() + g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); + gdk_threads_leave(); wxAppBase::CleanUp(); } -#ifdef __WXDEBUG__ +void wxApp::WakeUpIdle() +{ +#if wxUSE_THREADS + wxMutexLocker lock(m_idleMutex); +#endif + if (m_idleSourceId == 0) + m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); +} + +// Checking for pending events requires first removing our idle source, +// otherwise it will cause the check to always return true. +bool wxApp::EventsPending() +{ +#if wxUSE_THREADS + wxMutexLocker lock(m_idleMutex); +#endif + if (m_idleSourceId != 0) + { + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + wx_add_idle_hooks(); + } + return gtk_events_pending() != 0; +} void wxApp::OnAssertFailure(const wxChar *file, int line, @@ -625,24 +499,60 @@ void wxApp::OnAssertFailure(const wxChar *file, const wxChar* cond, const wxChar *msg) { + // there is no need to do anything if asserts are disabled in this build + // anyhow +#if wxDEBUG_LEVEL + // block wx idle events while assert dialog is showing m_isInAssert = true; wxAppBase::OnAssertFailure(file, line, func, cond, msg); m_isInAssert = false; +#else // !wxDEBUG_LEVEL + wxUnusedVar(file); + wxUnusedVar(line); + wxUnusedVar(func); + wxUnusedVar(cond); + wxUnusedVar(msg); +#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL +} + +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() +{ + gdk_threads_enter(); } -#endif // __WXDEBUG__ +void wxGUIAppTraits::MutexGuiLeave() +{ + gdk_threads_leave(); +} +#endif // wxUSE_THREADS -void wxApp::RemoveIdleTag() +/* static */ +bool wxApp::GTKIsUsingGlobalMenu() { -#if wxUSE_THREADS - wxMutexLocker lock(gs_idleTagsMutex); -#endif - if (!g_isIdle) + static int s_isUsingGlobalMenu = -1; + if ( s_isUsingGlobalMenu == -1 ) { - g_source_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; - g_isIdle = true; + // Currently we just check for this environment variable because this + // is how support for the global menu is implemented under Ubuntu. + // + // If we ever get false positives, we could also check for + // XDG_CURRENT_DESKTOP env var being set to "Unity". + wxString proxy; + s_isUsingGlobalMenu = wxGetEnv("UBUNTU_MENUPROXY", &proxy) && + !proxy.empty() && proxy != "0"; } + + return s_isUsingGlobalMenu == 1; } + +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 +// Maemo-specific method: get the main program object +HildonProgram *wxApp::GetHildonProgram() +{ + return hildon_program_get_instance(); +} + +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2