X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..6255fac96fb3f2b5bd22f1d84f3716a89a3f5c54:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 56b33401b8..72dd08db41 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" @@ -32,8 +26,16 @@ #include #endif -#include "wx/gtk/win_gtk.h" #include "wx/gtk/private.h" +#include "wx/apptrait.h" + +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON + +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 #include @@ -46,72 +48,6 @@ wxFORCE_LINK_MODULE(gnome_vfs) #endif -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -bool g_mainThreadLocked = false; - -static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; - -//----------------------------------------------------------------------------- -// wxYield -//----------------------------------------------------------------------------- - -// not static because used by textctrl.cpp -// -// MT-FIXME -bool wxIsInsideYield = false; - -bool wxApp::Yield(bool onlyIfNeeded) -{ - if ( wxIsInsideYield ) - { - if ( !onlyIfNeeded ) - { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } - - return false; - } - -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - { - // can't call gtk_main_iteration() from other threads like this - return true; - } -#endif // wxUSE_THREADS - - wxIsInsideYield = true; - -#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 (EventsPending()) - 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; -} - //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- @@ -124,9 +60,9 @@ wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) wxApp* app = wxTheApp; if (app != NULL) app->WakeUpIdle(); - gulong* hook_id = (gulong*)data; + bool* hook_installed = (bool*)data; // record that hook is not installed - *hook_id = 0; + *hook_installed = false; // remove hook return false; } @@ -137,28 +73,30 @@ static void wx_add_idle_hooks() { // "event" hook { - static gulong hook_id = 0; - if (hook_id == 0) + static bool hook_installed; + if (!hook_installed) { - static guint sig_id = 0; + static guint sig_id; if (sig_id == 0) sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); - hook_id = g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_id, NULL); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); } } // "size_allocate" hook // Needed to match the behavior of the old idle system, // but probably not necessary. { - static gulong hook_id = 0; - if (hook_id == 0) + static bool hook_installed; + if (!hook_installed) { - static guint sig_id = 0; + static guint sig_id; if (sig_id == 0) sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); - hook_id = g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_id, NULL); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); } } } @@ -178,12 +116,13 @@ bool wxApp::DoIdle() // Needed if an idle event handler runs a new event loop, // for example by showing a dialog. #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif id_save = m_idleSourceId; m_idleSourceId = 0; wx_add_idle_hooks(); -#ifdef __WXDEBUG__ + +#if wxDEBUG_LEVEL // don't generate the idle events while the assert modal dialog is shown, // this matches the behavior of wxMSW if (m_isInAssert) @@ -194,12 +133,14 @@ bool wxApp::DoIdle() gdk_threads_enter(); bool needMore; do { + ProcessPendingEvents(); + needMore = ProcessIdle(); } while (needMore && gtk_events_pending() == 0); gdk_threads_leave(); #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif // if a new idle source was added during ProcessIdle if (m_idleSourceId != 0) @@ -208,6 +149,12 @@ bool wxApp::DoIdle() g_source_remove(m_idleSourceId); m_idleSourceId = 0; } + + // Pending events can be added asynchronously, + // need to keep idle source if any have appeared + if (HasPendingEvents()) + needMore = true; + // if more idle processing requested if (needMore) { @@ -220,43 +167,20 @@ bool wxApp::DoIdle() return false; } -#if wxUSE_THREADS - -static GPollFunc wxgs_poll_func; - -extern "C" { -static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) -{ - gdk_threads_enter(); - - wxMutexGuiLeave(); - g_mainThreadLocked = true; - - gint res = (*wxgs_poll_func)(ufds, nfds, timeout); - - wxMutexGuiEnter(); - g_mainThreadLocked = false; - - gdk_threads_leave(); - - return res; -} -} - -#endif // wxUSE_THREADS - //----------------------------------------------------------------------------- // Access to the root window global //----------------------------------------------------------------------------- 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; } //----------------------------------------------------------------------------- @@ -265,18 +189,9 @@ 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__ -#if wxUSE_THREADS - m_idleMutex = NULL; -#endif m_idleSourceId = 0; } @@ -284,6 +199,30 @@ wxApp::~wxApp() { } +bool wxApp::SetNativeTheme(const wxString& theme) +{ + 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; +} + bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) @@ -327,53 +266,41 @@ bool wxApp::OnInitGui() } } - return true; -} - -GdkVisual *wxApp::GetGdkVisual() -{ - GdkVisual *visual = NULL; - - XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo(); - if ( xvi ) - visual = gdkx_visual_get( xvi->visualid ); - else - visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); - - wxASSERT( visual ); +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + if ( !GetHildonProgram() ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; + } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - return visual; + return true; } -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_) { - if ( !wxAppBase::Initialize(argc, argv) ) + if ( !wxAppBase::Initialize(argc_, argv_) ) return false; #if wxUSE_THREADS if (!g_thread_supported()) + { g_thread_init(NULL); - - wxgs_poll_func = g_main_context_get_poll_func(NULL); - g_main_context_set_poll_func(NULL, wxapp_poll_func); + gdk_threads_init(); + } #endif // wxUSE_THREADS - // 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 // 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.CmpNoCase(_T("@locale")) == 0) + wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(wxT(',')); + if (encName.CmpNoCase(wxT("@locale")) == 0) encName.clear(); encName.MakeUpper(); #if wxUSE_INTL @@ -383,13 +310,13 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // filenames in this locale too encName = wxLocale::GetSystemEncodingName().Upper(); // (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("US-ASCII")) + encName = wxT("UTF-8"); + wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); } #else if (encName.empty()) - encName = _T("UTF-8"); + encName = wxT("UTF-8"); // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "") @@ -402,19 +329,19 @@ bool wxApp::Initialize(int& argc, wxChar **argv) 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_; #ifdef __WXGPE__ init_result = true; // is there a _check() version of this? @@ -422,19 +349,21 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #else init_result = gtk_init_check( &argcGTK, &argvGTK ); #endif + wxUpdateLocaleIsUtf8(); - 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)*sizeof(*argv)); + 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 @@ -446,28 +375,60 @@ 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?")); + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; + + if ( m_traits ) + { + // 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; } // we can not enter threads before gtk_init is done gdk_threads_enter(); - wxSetDetectableAutoRepeat( true ); - #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif -#if wxUSE_THREADS - m_idleMutex = new wxMutex; -#endif // make sure GtkWidget type is loaded, idle hooks need it g_type_class_ref(GTK_TYPE_WIDGET); WakeUpIdle(); @@ -479,10 +440,7 @@ void wxApp::CleanUp() { if (m_idleSourceId != 0) g_source_remove(m_idleSourceId); -#if wxUSE_THREADS - delete m_idleMutex; - m_idleMutex = NULL; -#endif + // release reference acquired by Initialize() g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); @@ -494,7 +452,7 @@ void wxApp::CleanUp() void wxApp::WakeUpIdle() { #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif if (m_idleSourceId == 0) m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); @@ -505,7 +463,7 @@ void wxApp::WakeUpIdle() bool wxApp::EventsPending() { #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif if (m_idleSourceId != 0) { @@ -516,21 +474,47 @@ bool wxApp::EventsPending() return gtk_events_pending() != 0; } -#ifdef __WXDEBUG__ - void wxApp::OnAssertFailure(const wxChar *file, int line, const wxChar* func, 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 } -#endif // __WXDEBUG__ +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() +{ + gdk_threads_enter(); +} + +void wxGUIAppTraits::MutexGuiLeave() +{ + gdk_threads_leave(); +} +#endif // wxUSE_THREADS + +#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