X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ee339eecb8c6554d96e93e5c1c6edd112db5c64..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 3f05639ce8..823da625a2 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,284 +7,165 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "app.h" -#endif - -#ifdef __VMS -#include -#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" - -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - -#include "wx/module.h" -#include "wx/image.h" -#ifdef __WXUNIVERSAL__ - #include "wx/univ/theme.h" - #include "wx/univ/renderer.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 -#if wxUSE_THREADS - #include "wx/thread.h" -#endif +#include "wx/thread.h" -#include -#if defined(__DARWIN__) -// FIXME: select must be used instead of poll (GD) -#elif defined(__VMS) -# include -#else -# include +#ifdef __WXGPE__ + #include #endif -#include "wx/gtk/win_gtk.h" - -#include +#include "wx/apptrait.h" +#include "wx/fontmap.h" -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 -bool g_mainThreadLocked = FALSE; -gint g_pendingTag = 0; - -static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; +#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// idle system +// link GnomeVFS //----------------------------------------------------------------------------- -extern bool g_isIdle; - -void wxapp_install_idle_handler(); +#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_vfs) +#endif //----------------------------------------------------------------------------- -// wxExit +// local functions //----------------------------------------------------------------------------- -void wxExit() +// One-shot signal emission hook, to install idle handler. +extern "C" { +static gboolean +wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) { - gtk_main_quit(); + 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; +} } -//----------------------------------------------------------------------------- -// wxYield -//----------------------------------------------------------------------------- - -// not static because used by textctrl.cpp -// -// MT-FIXME -bool wxIsInsideYield = 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() ) - { - // can't call gtk_main_iteration() from other threads like this - return TRUE; } -#endif // wxUSE_THREADS - - wxIsInsideYield = TRUE; - - if (!g_isIdle) + // "size_allocate" hook + // Needed to match the behaviour of the old idle system, + // but probably not necessary. { - // We need to remove idle callbacks or the loop will - // never finish. - gtk_idle_remove( m_idleTag ); - m_idleTag = 0; - g_isIdle = 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); + } } - - // disable log flushing from here because a call to wxYield() shouldn't - // normally result in message boxes popping up &c - wxLog::Suspend(); - - 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(); - - // let the logs be flashed again - wxLog::Resume(); - - wxIsInsideYield = FALSE; - - return TRUE; } -//----------------------------------------------------------------------------- -// wxWakeUpIdle -//----------------------------------------------------------------------------- - -void wxWakeUpIdle() +extern "C" { +static gboolean wxapp_idle_callback(gpointer) { -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiEnter(); -#endif - - if (g_isIdle) - wxapp_install_idle_handler(); - -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiLeave(); -#endif + 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(); - - 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() ) + guint id_save; { - return TRUE; + // 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(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 } -#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(); + bool needMore; + do { + ProcessPendingEvents(); - // 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; - - // 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)) - ; - - // Release lock again + needMore = ProcessIdle(); + } while (needMore && gtk_events_pending() == 0); 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 wxUSE_THREADS - -static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) -{ - gint res; - gdk_threads_enter(); - - wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; - -#ifdef __DARWIN__ - // FIXME: poll is not available under Darwin/Mac OS X and this needs - // to be implemented using select instead (GD) - // what about other BSD derived systems? - res = -1; -#else - res = poll( (struct pollfd*) ufds, nfds, timeout ); + wxMutexLocker lock(m_idleMutex); #endif + // if a new idle source was added during ProcessIdle + if (m_idleSourceId != 0) + { + // remove it + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + } - wxMutexGuiEnter(); - g_mainThreadLocked = FALSE; - - gdk_threads_leave(); - - return res; -} - -#endif // wxUSE_THREADS - -} // extern "C" - -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 ); + // Pending events can be added asynchronously, + // need to keep idle source if any have appeared + if (HasPendingEvents()) + needMore = true; - // 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 ); + // if more idle processing requested + if (needMore) + { + // keep this source installed + m_idleSourceId = id_save; + return true; + } + // add hooks and remove this source + wx_add_idle_hooks(); + return false; } //----------------------------------------------------------------------------- @@ -293,12 +174,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; } //----------------------------------------------------------------------------- @@ -307,555 +190,352 @@ GtkWidget* wxGetRootWindow() IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() - wxApp::wxApp() { - m_initialized = FALSE; -#ifdef __WXDEBUG__ - m_isInAssert = FALSE; -#endif // __WXDEBUG__ - - m_idleTag = 0; - wxapp_install_idle_handler(); - -#if wxUSE_THREADS - g_main_set_poll_func( 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_isInAssert = false; + m_idleSourceId = 0; } wxApp::~wxApp() { - if (m_idleTag) gtk_idle_remove( m_idleTag ); +} + +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); - if (m_colorCube) free(m_colorCube); + return false; + } + + gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE); + + return true; } bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; - - GdkVisual *visual = gdk_visual_get_system(); + 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() ) { -#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 - // we make sure we get the best. This can sometimes be wasteful. - 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++) + // 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) { - for (int b = 0; b < 32; b++) + if (m_forceTrueColour) { - 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) + GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR ); + if (!visual) { - 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; - } - } + wxLogError(wxT("Unable to initialize TrueColor visual.")); + return false; } - else + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else + { + if (gdk_visual_get_best() != gdk_visual_get_system()) { - // 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; + GdkVisual* visual = gdk_visual_get_best(); + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); } - m_colorCube[ (r*1024) + (g*32) + b ] = index; } } } +#endif - return TRUE; -} +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + if ( !GetHildonProgram() ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; + } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 -GdkVisual *wxApp::GetGdkVisual() -{ - GdkVisual *visual = NULL; - - if (m_glVisualInfo) - visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); - else - visual = gdk_window_get_visual( wxGetRootWindow()->window ); - - wxASSERT( visual ); - - return visual; + return true; } -bool wxApp::ProcessIdle() +// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] +bool wxApp::Initialize(int& argc_, wxChar **argv_) { - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; - return event.MoreRequested(); -} +#if wxUSE_THREADS + if (!g_thread_supported()) + { + g_thread_init(NULL); + gdk_threads_init(); + } +#endif // wxUSE_THREADS -void wxApp::OnIdle( wxIdleEvent &event ) -{ - static bool s_inOnIdle = FALSE; + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; - // Avoid recursion (via ProcessEvent default case) - if (s_inOnIdle) - return; +#ifdef __UNIX__ + // decide which conversion to use for the file names - s_inOnIdle = TRUE; + // (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(wxT("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(wxT(',')); + if (encName.CmpNoCase(wxT("@locale")) == 0) + encName.clear(); + encName.MakeUpper(); +#if wxUSE_INTL + if (encName.empty()) + { + // (2) if a non default locale is set, assume that the user wants his + // filenames in this locale too + encName = wxLocale::GetSystemEncodingName().Upper(); - // Resend in the main thread events which have been prepared in other - // threads - ProcessPendingEvents(); + // 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(); + } + } - // 'Garbage' collection of windows deleted with Close() - DeletePendingObjects(); + // (3) finally use UTF-8 by default + if ( encName.empty() ) + encName = wxT("UTF-8"); + wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); + } +#else + if (encName.empty()) + encName = wxT("UTF-8"); - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); + // 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, "") + // from gtk_init_check() as it does by default + gtk_disable_setlocale(); - if (needMore) - event.RequestMore(TRUE); +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; +#endif // __UNIX__ - s_inOnIdle = FALSE; -} -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; + bool init_result; + int i; - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) +#if wxUSE_UNICODE + // gtk_init() wants UTF-8, not wchar_t, so convert + char **argvGTK = new char *[argc_ + 1]; + for ( i = 0; i < argc_; i++ ) { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->GetNext(); + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i])); } - node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - CallInternalIdle( win ); - - node = node->GetNext(); - } - return needMore; -} + argvGTK[argc_] = NULL; -bool wxApp::CallInternalIdle( wxWindow* win ) -{ - win->OnInternalIdle(); + int argcGTK = argc_; + +#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 ) != 0; +#endif + wxUpdateLocaleIsUtf8(); - wxNode* node = win->GetChildren().First(); - while (node) + if ( argcGTK != argc_ ) { - wxWindow* win = (wxWindow*) node->Data(); - CallInternalIdle( win ); + // 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 ) + { + memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_)); + } + } - node = node->Next(); + argc_ = argcGTK; + argv_[argc_] = NULL; } - - return TRUE; -} - -bool wxApp::SendIdleEvents( wxWindow* win ) -{ - bool needMore = FALSE; + //else: gtk_init() didn't modify our parameters - wxIdleEvent event; - event.SetEventObject(win); - - win->GetEventHandler()->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; - - wxNode* node = win->GetChildren().First(); - while (node) + // free our copy + for ( i = 0; i < argcGTK; i++ ) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); + free(argvGTK[i]); } - - return needMore; -} - -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::ExitMainLoop() -{ - if (gtk_main_level() > 0) - gtk_main_quit(); -} -bool wxApp::Initialized() -{ - return m_initialized; -} + delete [] argvGTK; +#else // !wxUSE_UNICODE + // 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_ ); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} - -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) + if ( m_traits ) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + // 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('='); - if (wxPendingDelete.Find(obj)) - delete node; + 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; + } + } + } + } - node = wxPendingDelete.First(); + if ( !init_result ) + { + wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); + return false; } -} -bool wxApp::Initialize() -{ - wxClassInfo::InitializeClasses(); + // we cannot enter threads before gtk_init is done + gdk_threads_enter(); #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - // GL: I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. -#if wxUSE_THREADS - wxPendingEvents = new wxList(); - wxPendingEventsLocker = new wxCriticalSection(); -#endif - - wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); - wxTheColourDatabase->Initialize(); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; + // make sure GtkWidget type is loaded, idle hooks need it + g_type_class_ref(GTK_TYPE_WIDGET); + WakeUpIdle(); - return TRUE; + return true; } void wxApp::CleanUp() { - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - delete wxTheColourDatabase; - wxTheColourDatabase = (wxColourDatabase*) NULL; + if (m_idleSourceId != 0) + g_source_remove(m_idleSourceId); - wxDeleteStockObjects(); + // release reference acquired by Initialize() + g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); - wxDeleteStockLists(); - - delete wxTheApp; - wxTheApp = (wxApp*) NULL; + gdk_threads_leave(); - wxClassInfo::CleanUpClasses(); + wxAppBase::CleanUp(); +} +void wxApp::WakeUpIdle() +{ #if wxUSE_THREADS - delete wxPendingEvents; - delete wxPendingEventsLocker; + wxMutexLocker lock(m_idleMutex); #endif - - // check for memory leaks -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.\n")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -#endif // Debug - -#if wxUSE_LOG - // do this as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); - - wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); - if (oldLog) - delete oldLog; -#endif // wxUSE_LOG + if (m_idleSourceId == 0) + m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); } -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- - -// NB: argc and argv may be changed here, pass by reference! -int wxEntryStart( int& argc, char *argv[] ) +// 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 - // 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" ); - } - else - { - g_thread_init(NULL); - } -#endif - - 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 - if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; + wxMutexLocker lock(m_idleMutex); #endif -#else - if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; -#endif - - gdk_threads_enter(); - - gtk_init( &argc, &argv ); - - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) + if (m_idleSourceId != 0) { - gdk_threads_leave(); - return -1; + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + wx_add_idle_hooks(); } - - return 0; + return gtk_events_pending() != 0; } - -int wxEntryInitGui() +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) { - int retValue = 0; - - if ( !wxTheApp->OnInitGui() ) - retValue = -1; - - wxGetRootWindow(); - - return retValue; + // 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 } - -void wxEntryCleanup() +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() { -#if wxUSE_LOG - // flush the logged messages if any - wxLog *log = wxLog::GetActiveTarget(); - if (log != NULL && log->HasPendingMessages()) - log->Flush(); - - // continuing to use user defined log target is unsafe from now on because - // some resources may be already unavailable, so replace it by something - // more safe - wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); - if ( oldlog ) - delete oldlog; -#endif // wxUSE_LOG - - wxApp::CleanUp(); - - gdk_threads_leave(); + gdk_threads_enter(); } - -int wxEntry( int argc, char *argv[] ) +void wxGUIAppTraits::MutexGuiLeave() { -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // This seems to be necessary since there are 'rogue' - // objects present at this point (perhaps global objects?) - // Setting a checkpoint will ignore them as far as the - // memory checking facility is concerned. - // Of course you may argue that memory allocated in globals should be - // checked, but this is a reasonable compromise. - wxDebugContext::SetCheckpoint(); -#endif - int err = wxEntryStart(argc, argv); - if (err) - return err; - - if (!wxTheApp) - { - wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, - wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); - - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; - } - - wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") ); - - wxTheApp->argc = argc; -#if wxUSE_UNICODE - wxTheApp->argv = new wxChar*[argc+1]; - int mb_argc = 0; - while (mb_argc < argc) - { - wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); - mb_argc++; - } - wxTheApp->argv[mb_argc] = (wxChar *)NULL; -#else - wxTheApp->argv = argv; -#endif - - wxString name(wxFileNameFromPath(argv[0])); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); - - int retValue; - retValue = wxEntryInitGui(); - - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). - if ( retValue == 0 ) - { - if ( !wxTheApp->OnInit() ) - retValue = -1; - } - - if ( retValue == 0 ) - { - // Delete pending toplevel windows - wxTheApp->DeletePendingObjects(); - - // When is the app not initialized ? - wxTheApp->m_initialized = TRUE; - - if (wxTheApp->Initialized()) - { - wxTheApp->OnRun(); - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - - // Delete all pending windows if any - wxTheApp->DeletePendingObjects(); - - // Reset top window - if (topWindow) - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - - retValue = wxTheApp->OnExit(); - } - } - - wxEntryCleanup(); - - return retValue; + gdk_threads_leave(); } +#endif // wxUSE_THREADS -#ifdef __WXDEBUG__ - -void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 +// Maemo-specific method: get the main program object +HildonProgram *wxApp::GetHildonProgram() { - m_isInAssert = TRUE; - - wxAppBase::OnAssert(file, line, msg); - - m_isInAssert = FALSE; + return hildon_program_get_instance(); } -#endif // __WXDEBUG__ - +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2