X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ec2881ac5954bad751dbaceedf91fb050f7cee5..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index f656b326eb..c9f6bbc827 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,713 +7,635 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "app.h" +#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" - -#if wxUSE_WX_RESOURCES - #include "wx/resource.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" #endif +#include "wx/file.h" +#include "wx/filename.h" #include "wx/module.h" -#include "wx/image.h" - -#if wxUSE_THREADS #include "wx/thread.h" + +#ifdef __WXGPE__ + #include #endif -#include +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif -#include -#include -#include +#include +#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 +#endif // HAVE_POLL/!HAVE_POLL + +#include "wx/unix/private.h" #include "wx/gtk/win_gtk.h" +#include "wx/gtk/private.h" + +#include //----------------------------------------------------------------------------- -// global data +// link GnomeVFS //----------------------------------------------------------------------------- -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - -extern wxResourceCache *wxTheResourceCache; -extern bool g_isIdle; +#if wxUSE_LIBGNOMEVFS +#include "wx/html/forcelnk.h" +FORCE_LINK(gnome_vfs) +#endif //----------------------------------------------------------------------------- -// local functions +// global data //----------------------------------------------------------------------------- -extern void wxFlushResources(); - -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); -void wxapp_install_idle_handler(); +bool g_mainThreadLocked = false; +gint g_pendingTag = 0; -#if wxUSE_THREADS -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ); -#endif +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- -// wxExit +// idle system //----------------------------------------------------------------------------- -void wxExit() -{ - gtk_main_quit(); -} +void wxapp_install_idle_handler(); + +#if wxUSE_THREADS +static wxMutex gs_idleTagsMutex; +#endif //----------------------------------------------------------------------------- // wxYield //----------------------------------------------------------------------------- -bool wxYield() +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = false; + +bool wxApp::Yield(bool onlyIfNeeded) { - bool has_idle = (wxTheApp->m_idleTag != 0); + if ( wxIsInsideYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return false; + } - if (has_idle) +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) { - /* We need to temporarily remove idle callbacks or the loop will - never finish. */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + // can't call gtk_main_iteration() from other threads like this + return true; } +#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) */ - while (wxTheApp->ProcessIdle()) { } + // 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 (has_idle) - { - /* re-add idle handler */ - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - } +#if wxUSE_LOG + // let the logs be flashed again + wxLog::Resume(); +#endif + + wxIsInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- -void 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() { - if (g_isIdle) - wxapp_install_idle_handler(); + wxapp_install_idle_handler(); } //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" { - if (!wxTheApp) return TRUE; - -#if (GTK_MINOR_VERSION > 0) - /* when getting called from GDK's idle handler we - are no longer within GDK's grab on the GUI - thread so we must lock it here ourselves */ - GDK_THREADS_ENTER (); -#endif - - /* sent idle event to all who request them */ - while (wxTheApp->ProcessIdle()) { } - - /* we don't want any more idle events until the next event is - sent to wxGTK */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; - /* indicate that we are now in idle mode - even so deeply - in idle mode that we don't get any idle events anymore. - this is like wxMSW where an idle event is sent only - once each time after the event queue has been completely - emptied */ - g_isIdle = TRUE; - -#if (GTK_MINOR_VERSION > 0) - /* release lock again */ - GDK_THREADS_LEAVE (); -#endif - - return TRUE; -} - -void wxapp_install_idle_handler() +static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) { - wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - - /* 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). */ + if (!wxTheApp) return TRUE; -#if wxUSE_THREADS - if (!wxThread::IsMain()) - GDK_THREADS_ENTER (); -#endif + // 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(); - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + // Sent idle event to all who request them. + wxTheApp->ProcessPendingEvents(); - g_isIdle = FALSE; - + { #if wxUSE_THREADS - if (!wxThread::IsMain()) - GDK_THREADS_LEAVE (); + wxMutexLocker lock(gs_idleTagsMutex); #endif -} + g_pendingTag = 0; + } -#if wxUSE_THREADS + // Flush the logged messages if any. +#if wxUSE_LOG + wxLog::FlushActive(); +#endif // wxUSE_LOG -void wxapp_install_thread_wakeup() -{ - if (wxTheApp->m_wakeUpTimerTag) return; + // Release lock again + gdk_threads_leave(); - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL ); + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream) + return FALSE; } -void wxapp_uninstall_thread_wakeup() +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (!wxTheApp->m_wakeUpTimerTag) return; - - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; -} + if (!wxTheApp) + return TRUE; -gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) -{ - wxapp_uninstall_thread_wakeup(); +#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__ -#if (GTK_MINOR_VERSION > 0) - // when getting called from GDK's time-out handler + // 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 (); -#endif - - // unblock other threads wishing to do some GUI things - wxMutexGuiLeave(); + // thread so we must lock it here ourselves. + gdk_threads_enter(); - // wake up other threads - wxUsleep( 1 ); + // Indicate that we are now in idle mode and event handlers + // will have to reinstall the idle handler again. + { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_isIdle = true; + wxTheApp->m_idleTag = 0; + } - // block other thread again - wxMutexGuiEnter(); + bool moreIdles; -#if (GTK_MINOR_VERSION > 0) - // release lock again - GDK_THREADS_LEAVE (); -#endif + // 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) + ; - wxapp_install_thread_wakeup(); + // Release lock again + gdk_threads_leave(); - return TRUE; + // Return FALSE if no more idle events are to be sent + return moreIdles; } -#endif // wxUSE_THREADS - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- +#if wxUSE_THREADS -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +#ifdef HAVE_POLL + #define wxPoll poll + #define wxPollFd pollfd +#else // !HAVE_POLL -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() +typedef GPollFD wxPollFd; -wxApp::wxApp() +int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) { - wxTheApp = this; + // 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") ); - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; + if ( ufds[i].events & G_IO_IN ) + wxFD_SET(ufds[i].fd, &readfds); - m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + if ( ufds[i].events & G_IO_PRI ) + wxFD_SET(ufds[i].fd, &exceptfds); -#if wxUSE_THREADS - m_wakeUpTimerTag = 0; - wxapp_install_thread_wakeup(); -#endif + if ( ufds[i].events & G_IO_OUT ) + wxFD_SET(ufds[i].fd, &writefds); - m_colorCube = (unsigned char*) NULL; -} + if ( ufds[i].fd > fdMax ) + fdMax = ufds[i].fd; + } -wxApp::~wxApp() -{ - if (m_idleTag) gtk_idle_remove( m_idleTag ); + fdMax++; + int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); -#if wxUSE_THREADS - wxapp_uninstall_thread_wakeup(); -#endif + // translate the results back + for ( i = 0; i < nfds; i++ ) + { + ufds[i].revents = 0; - if (m_colorCube) free(m_colorCube); -} + if ( wxFD_ISSET(ufds[i].fd, &readfds ) ) + ufds[i].revents |= G_IO_IN; -bool wxApp::OnInitGui() -{ - GdkVisual *visual = gdk_visual_get_system(); + if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) ) + ufds[i].revents |= G_IO_PRI; - /* on some machines, the default visual is just 256 colours, so - we make sure we get the best. this can sometimes be wasteful, - of course, but what do these guys pay $30.000 for? */ -/* - if (gdk_visual_get_best() != gdk_visual_get_system()) - { - GdkVisual* vis = gdk_visual_get_best(); - gtk_widget_set_default_visual( vis ); + if ( wxFD_ISSET(ufds[i].fd, &writefds ) ) + ufds[i].revents |= G_IO_OUT; + } - GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); - gtk_widget_set_default_colormap( colormap ); + return res; +} - visual = vis; - } -*/ +#endif // HAVE_POLL/!HAVE_POLL - /* Nothing to do for 15, 16, 24, 32 bit displays */ - if (visual->depth > 8) return TRUE; +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) +{ + gdk_threads_enter(); - /* initialize color cube for 8-bit color reduction dithering */ + wxMutexGuiLeave(); + g_mainThreadLocked = true; - GdkColormap *cmap = gtk_widget_get_default_colormap(); + // 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 ); - m_colorCube = (unsigned char*)malloc(32 * 32 * 32); + wxMutexGuiEnter(); + g_mainThreadLocked = false; - for (int r = 0; r < 32; r++) - { - for (int g = 0; g < 32; g++) - { - for (int b = 0; b < 32; b++) - { - 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) - { - 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; - } - } - } - else - { -#if (GTK_MINOR_VERSION > 0) - /* 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; -#else - wxFAIL_MSG( wxT("Unsupported graphics hardware") ); -#endif - } - m_colorCube[ (r*1024) + (g*32) + b ] = index; - } - } - } + gdk_threads_leave(); - return TRUE; + return res; } -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); +#endif // wxUSE_THREADS - return event.MoreRequested(); -} +} // extern "C" -void wxApp::OnIdle( wxIdleEvent &event ) +void wxapp_install_idle_handler() { - static bool s_inOnIdle = FALSE; +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif - /* Avoid recursion (via ProcessEvent default case) */ - if (s_inOnIdle) + // Don't install the handler if it's already installed. This test *MUST* + // be done when gs_idleTagsMutex is locked! + if (!g_isIdle) return; - s_inOnIdle = TRUE; - - /* Resend in the main thread events which have been prepared in other - threads */ - ProcessPendingEvents(); - - /* 'Garbage' collection of windows deleted with Close(). */ - DeletePendingObjects(); + // 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)") ); - /* flush the logged messages if any */ -#if wxUSE_LOG - wxLog *log = wxLog::GetActiveTarget(); - if (log != NULL && log->HasPendingMessages()) - log->Flush(); -#endif // wxUSE_LOG + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - /* Send OnIdle events to all windows */ - bool needMore = SendIdleEvents(); + g_isIdle = false; - if (needMore) - event.RequestMore(TRUE); + if (g_pendingTag == 0) + g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL ); - s_inOnIdle = FALSE; + // 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 ); } -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) +GtkWidget* wxGetRootWindow() +{ + if (gs_RootWindow == NULL) { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); } - - return needMore; + return gs_RootWindow; } -bool wxApp::SendIdleEvents( wxWindow* win ) -{ - bool needMore = FALSE; +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- - wxIdleEvent event; - event.SetEventObject(win); +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) - win->ProcessEvent(event); +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxAppBase::OnIdle) +END_EVENT_TABLE() - win->OnInternalIdle(); +wxApp::wxApp() +{ +#ifdef __WXDEBUG__ + m_isInAssert = false; +#endif // __WXDEBUG__ - if (event.MoreRequested()) - needMore = TRUE; + m_idleTag = 0; + g_isIdle = true; + wxapp_install_idle_handler(); - wxNode* node = win->GetChildren().First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; +#if wxUSE_THREADS + g_main_context_set_poll_func( NULL, wxapp_poll_func ); +#endif - node = node->Next(); - } - return needMore ; + // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp + m_glVisualInfo = (void *) NULL; + m_glFBCInfo = (void *) NULL; } -int wxApp::MainLoop() +wxApp::~wxApp() { - gtk_main(); - return 0; + if (m_idleTag) + g_source_remove( m_idleTag ); } -void wxApp::ExitMainLoop() +bool wxApp::OnInitGui() { - if (gtk_main_level() > 0) - gtk_main_quit(); -} + if ( !wxAppBase::OnInitGui() ) + return false; -bool wxApp::Initialized() -{ - return m_initialized; -} + // 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) + { + // seems gtk_widget_set_default_visual no longer exists? + GdkVisual* vis = gtk_widget_get_default_visual(); -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) + else + if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + /* seems gtk_widget_set_default_visual no longer exists? */ + GdkVisual* vis = gtk_widget_get_default_visual(); - if (wxPendingDelete.Find(obj)) - delete node; - - node = wxPendingDelete.First(); + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); } + + return true; } -bool wxApp::Initialize() +GdkVisual *wxApp::GetGdkVisual() { - wxBuffer = new wxChar[BUFSIZ + 512]; + GdkVisual *visual = NULL; - wxClassInfo::InitializeClasses(); + if (m_glVisualInfo) + visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); + else + visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); - wxSystemSettings::Init(); + wxASSERT( visual ); - // 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 - -/* - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); -*/ - - wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); - wxTheColourDatabase->Initialize(); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); - - wxInitializeResourceSystem(); -#endif - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - return TRUE; + return visual; } -void wxApp::CleanUp() +bool wxApp::Initialize(int& argc, wxChar **argv) { - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxFlushResources(); - - if (wxTheResourceCache) - delete wxTheResourceCache; - wxTheResourceCache = (wxResourceCache*) NULL; - - wxCleanUpResourceSystem(); -#endif + bool init_result; - if (wxTheColourDatabase) - delete wxTheColourDatabase; - wxTheColourDatabase = (wxColourDatabase*) NULL; - -/* - if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; - wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; -*/ - - wxDeleteStockObjects(); - - wxDeleteStockLists(); - - delete wxTheApp; - wxTheApp = (wxApp*) NULL; - - // 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 - delete wxPendingEvents; - delete wxPendingEventsLocker; -#endif - - wxSystemSettings::Done(); - - delete[] wxBuffer; + if (!g_thread_supported()) + g_thread_init(NULL); +#endif // wxUSE_THREADS - wxClassInfo::CleanUpClasses(); + gtk_set_locale(); - // check for memory leaks -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) + // 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 == _T("@locale")) + encName.clear(); + encName.MakeUpper(); +#if wxUSE_INTL + if (encName.empty()) { - wxLogDebug(wxT("There were memory leaks.\n")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + // (2) if a non default locale is set, assume that the user wants his + // 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); } -#endif // Debug - -#if wxUSE_LOG - // do this as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); +#else + if (encName.empty()) + encName = _T("UTF-8"); +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; - wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); - if (oldLog) - delete oldLog; -#endif // wxUSE_LOG -} +#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++ ) + { + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); + } -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + argvGTK[argc] = NULL; -int wxEntry( int argc, char *argv[] ) -{ - gtk_set_locale(); + int argcGTK = argc; -#if wxUSE_WCHAR_T - if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#ifdef __WXGPE__ + init_result = true; // is there a _check() version of this? + gpe_application_init( &argcGTK, &argvGTK ); #else - if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; + init_result = gtk_init_check( &argcGTK, &argvGTK ); #endif - gtk_init( &argc, &argv ); - - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) - return -1; - - if (!wxTheApp) + if ( argcGTK != argc ) { - 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(); + // 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); + } + } - wxTheApp = (wxApp*) test_app; + argc = argcGTK; } + //else: gtk_init() didn't modify our parameters - 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++; + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); } - wxTheApp->argv[mb_argc] = (wxChar *)NULL; -#else - wxTheApp->argv = argv; -#endif - wxString name(wxFileNameFromPath(argv[0])); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); + 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 - int retValue = 0; - - if ( !wxTheApp->OnInitGui() ) - retValue = -1; - - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). - if ( retValue == 0 ) - { - if ( !wxTheApp->OnInit() ) - retValue = -1; + if (!init_result) { + wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?")); + return false; } - if ( retValue == 0 ) + // we can not enter threads before gtk_init is done + gdk_threads_enter(); + + if ( !wxAppBase::Initialize(argc, argv) ) { - /* delete pending toplevel windows (typically a single - dialog) so that, if there isn't any left, we don't - call OnRun() */ - wxTheApp->DeletePendingObjects(); + gdk_threads_leave(); - wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; + return false; + } - if (wxTheApp->Initialized()) - { - retValue = wxTheApp->OnRun(); + wxSetDetectableAutoRepeat( true ); - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if (topWindow) - { - /* Forcibly delete the window. */ - if (topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close( TRUE ); - wxTheApp->DeletePendingObjects(); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - } - } - wxTheApp->OnExit(); - } - } +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif -#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 + return true; +} - wxApp::CleanUp(); +void wxApp::CleanUp() +{ + gdk_threads_leave(); - return retValue; + wxAppBase::CleanUp(); } -#include "wx/gtk/info.xpm" -#include "wx/gtk/error.xpm" -#include "wx/gtk/question.xpm" -#include "wx/gtk/warning.xpm" +#ifdef __WXDEBUG__ -wxIcon -wxApp::GetStdIcon(int which) const +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - switch(which) - { - case wxICON_INFORMATION: - return wxIcon(info_xpm); + m_isInAssert = true; - case wxICON_QUESTION: - return wxIcon(question_xpm); + wxAppBase::OnAssert(file, line, cond, msg); - case wxICON_EXCLAMATION: - return wxIcon(warning_xpm); + m_isInAssert = false; +} - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through +#endif // __WXDEBUG__ - case wxICON_HAND: - return wxIcon(error_xpm); +void wxApp::RemoveIdleTag() +{ +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + if (!g_isIdle) + { + g_source_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = true; } }