X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b90a8f20dd9c1a478f755941795158c38230a80..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index bf7a03b90e..4d25eb73de 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -7,10 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "app.h" #endif +#ifdef __VMS +// vms_jackets.h should for proper working be included before anything else +# include +#undef ConnectionNumber +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/app.h" #include "wx/gdicmn.h" #include "wx/utils.h" @@ -20,227 +29,398 @@ #include "wx/font.h" #include "wx/settings.h" #include "wx/dialog.h" +#include "wx/msgdlg.h" +#include "wx/file.h" +#include "wx/filename.h" +#include "wx/module.h" +#include "wx/image.h" +#include "wx/thread.h" -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" +#ifdef __WXGPE__ +#include #endif -#include "wx/module.h" -#include "wx/image.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif -#include "wx/thread.h" +#if wxUSE_THREADS + #include "wx/thread.h" +#endif -#include "unistd.h" +#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/gtk/win_gtk.h" +#include + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +bool g_mainThreadLocked = FALSE; +gint g_pendingTag = 0; + +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern bool g_isIdle; + +void wxapp_install_idle_handler(); #if wxUSE_THREADS -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; +static wxMutex gs_idleTagsMutex; #endif -extern wxResourceCache *wxTheResourceCache; -extern bool g_isIdle; -unsigned char g_palette[64*3] = +//----------------------------------------------------------------------------- +// wxYield +//----------------------------------------------------------------------------- + +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = FALSE; + +bool wxApp::Yield(bool onlyIfNeeded) { - 0x0, 0x0, 0x0, - 0xff, 0xff, 0xff, - 0xff, 0x0, 0x0, - 0xff, 0xff, 0x0, - 0x0, 0xff, 0x0, - 0x0, 0x0, 0xff, - 0x0, 0xff, 0xff, - 0x99, 0x99, 0x99, - 0xff, 0x88, 0x0, - 0x88, 0x0, 0x0, - 0x0, 0x88, 0x88, - 0x88, 0x88, 0x0, - 0xff, 0xcc, 0x97, - 0xbb, 0xbb, 0xbb, - 0x9f, 0x6b, 0x42, - 0x55, 0x55, 0x55, - 0xdd, 0xdd, 0xdd, - 0x77, 0x77, 0x77, - 0x33, 0x33, 0x33, - 0xcc, 0x0, 0x0, - 0xff, 0x44, 0x0, - 0xff, 0xcc, 0x0, - 0xcc, 0xcc, 0x0, - 0x60, 0x60, 0x0, - 0x0, 0x43, 0x0, - 0x0, 0x7f, 0x0, - 0x0, 0xcc, 0x0, - 0x0, 0x44, 0x44, - 0x0, 0x0, 0x44, - 0x0, 0x0, 0x88, - 0xef, 0xb1, 0x7b, - 0xdf, 0x98, 0x5f, - 0xbf, 0x87, 0x56, - 0x7f, 0x57, 0x26, - 0x5f, 0x39, 0xc, - 0x3f, 0x1c, 0x0, - 0x21, 0x0, 0x0, - 0x0, 0x43, 0x87, - 0x2d, 0x70, 0xaf, - 0x5a, 0x9e, 0xd7, - 0x87, 0xcc, 0xff, - 0xff, 0xe0, 0xba, - 0x21, 0x43, 0xf, - 0x3d, 0x5d, 0x25, - 0x59, 0x78, 0x3a, - 0x75, 0x93, 0x4f, - 0x91, 0xae, 0x64, - 0xad, 0xc8, 0x7a, - 0xf0, 0xa8, 0xef, - 0xd0, 0x88, 0xd0, - 0xaf, 0x66, 0xaf, - 0x8e, 0x44, 0x8e, - 0x6d, 0x22, 0x6d, - 0x4b, 0x0, 0x4b, - 0xff, 0xc0, 0xbc, - 0xff, 0x93, 0x91, - 0xff, 0x66, 0x67, - 0xd8, 0xf2, 0xbf, - 0xff, 0xc9, 0x68, - 0xff, 0x96, 0x67, - 0xa5, 0x60, 0xff, - 0x51, 0xff, 0x99, - 0x3f, 0xa5, 0x63, - 0x98, 0x90, 0x67 -}; + 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; + + // 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; +} //----------------------------------------------------------------------------- -// local functions +// wxWakeUpIdle //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +// RR/KH: The wxMutexGui calls are not needed on GTK2 according to +// the GTK faq, http://www.gtk.org/faq/#AEN500 +// The calls to gdk_threads_enter() and leave() are specifically noted +// as not being necessary. The MutexGui calls are still left in for GTK1. +// Eliminating the MutexGui calls fixes the long-standing "random" lockup +// when using wxPostEvent (which calls WakeUpIdle) from a thread. + +void wxApp::WakeUpIdle() +{ +#ifndef __WXGTK20__ +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiEnter(); +#endif // wxUSE_THREADS_ +#endif // __WXGTK2__ + + wxapp_install_idle_handler(); + +#ifndef __WXGTK20__ +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiLeave(); +#endif // wxUSE_THREADS_ +#endif // __WXGTK2__ +} //----------------------------------------------------------------------------- -// global functions +// local functions //----------------------------------------------------------------------------- -void wxExit() +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" { - gtk_main_quit(); -} -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); +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 -bool wxYield() + // 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) ) { - /* 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) */ - for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) + 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() ) { - wxWindow *win = node->GetData(); - win->OnInternalIdle(); + // But repaint the assertion message if necessary + if (wxTopLevelWindows.GetCount() > 0) + { + wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData(); +#ifdef __WXGTK20__ + if (win->IsKindOf(CLASSINFO(wxMessageDialog))) +#else + if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) +#endif + win->OnInternalIdle(); + } + return TRUE; } +#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(); - if (wxTheApp->m_idleTag) + // Indicate that we are now in idle mode and event handlers + // will have to reinstall the idle handler again. { - /* We need to temporarily remove idle callbacks or the loop will - never finish. */ - gtk_idle_remove( wxTheApp->m_idleTag ); +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + 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 + 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 - while (gtk_events_pending()) - gtk_main_iteration(); +#ifdef HAVE_POLL + #define wxPoll poll + #define wxPollFd pollfd +#else // !HAVE_POLL - /* re-add idle handler */ - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); +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; + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + + unsigned int i; + for ( i = 0; i < nfds; i++ ) + { + wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") ); + + if ( ufds[i].events & G_IO_IN ) + FD_SET(ufds[i].fd, &readfds); + + if ( ufds[i].events & G_IO_PRI ) + FD_SET(ufds[i].fd, &exceptfds); + + if ( ufds[i].events & G_IO_OUT ) + FD_SET(ufds[i].fd, &writefds); + + if ( ufds[i].fd > fdMax ) + fdMax = ufds[i].fd; } - else + + fdMax++; + int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); + + // translate the results back + for ( i = 0; i < nfds; i++ ) { - while (gtk_events_pending()) - gtk_main_iteration(); + ufds[i].revents = 0; + + if ( FD_ISSET(ufds[i].fd, &readfds ) ) + ufds[i].revents |= G_IO_IN; + + if ( FD_ISSET(ufds[i].fd, &exceptfds ) ) + ufds[i].revents |= G_IO_PRI; + + if ( FD_ISSET(ufds[i].fd, &writefds ) ) + ufds[i].revents |= G_IO_OUT; } - - return TRUE; + + return res; } -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +#endif // HAVE_POLL/!HAVE_POLL + +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - if (!wxTheApp) return TRUE; - - /* 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 (); - - /* 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; - - /* release lock again */ - GDK_THREADS_LEAVE (); + gdk_threads_enter(); - return TRUE; + 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; + + gdk_threads_leave(); + + return res; } +#endif // wxUSE_THREADS + +} // extern "C" + void wxapp_install_idle_handler() { - wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" ); +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif - /* this routine gets called by all event handlers - indicating that the idle is over. */ + // 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") ); - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - g_isIdle = FALSE; + + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + + // 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 ); } +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- -static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) +GtkWidget* wxGetRootWindow() { - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; - - /* 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 (); - - /* unblock other threads wishing to do some GUI things */ - wxMutexGuiLeave(); - - /* wake up other threads */ - wxUsleep( 1 ); - - /* block other thread again */ - wxMutexGuiEnter(); - - /* release lock again */ - GDK_THREADS_LEAVE (); - - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL ); - - return TRUE; + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; } //----------------------------------------------------------------------------- @@ -250,64 +430,87 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxAppBase::OnIdle) END_EVENT_TABLE() wxApp::wxApp() { - wxTheApp = this; +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; + m_idleTag = 0; + g_isIdle = TRUE; + wxapp_install_idle_handler(); - m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - - m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL ); +#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_glFBCInfo = (void *) NULL; } wxApp::~wxApp() { if (m_idleTag) gtk_idle_remove( m_idleTag ); - if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag ); - if (m_colorCube) free(m_colorCube); } bool wxApp::OnInitGui() { - /* Nothing to do for 15, 16, 24, 32 bit displays */ + if ( !wxAppBase::OnInitGui() ) + return FALSE; GdkVisual *visual = gdk_visual_get_system(); - if (visual->depth > 8) return TRUE; - /* this initiates the standard palette as defined by GdkImlib - in the GNOME libraries. it ensures that all GNOME applications - use the same 64 colormap entries on 8-bit displays so you - can use several rather graphics-heavy applications at the - same time. - NOTE: this doesn't really seem to work this way... */ + // 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) + { +#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 *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); - for (int i = 0; i < 64; i++) - { - GdkColor col; - col.red = g_palette[i*3 + 0] << 8; - col.green = g_palette[i*3 + 1] << 8; - col.blue = g_palette[i*3 + 2] << 8; - col.pixel = 0; + visual = vis; + } - gdk_color_alloc( cmap, &col ); - } + // 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; + } - gtk_widget_set_default_colormap( cmap ); - */ + // 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 */ + // initialize color cube for 8-bit color reduction dithering GdkColormap *cmap = gtk_widget_get_default_colormap(); @@ -326,7 +529,7 @@ bool wxApp::OnInitGui() int index = -1; GdkColor *colors = cmap->colors; - if(colors) + if (colors) { int max = 3 * 65536; @@ -337,12 +540,19 @@ bool wxApp::OnInitGui() int bdiff = ((bb << 8) - colors[i].blue); int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); if (sum < max) - { + { index = i; max = sum; } } } - + else + { + // 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; + } m_colorCube[ (r*1024) + (g*32) + b ] = index; } } @@ -351,367 +561,184 @@ bool wxApp::OnInitGui() return TRUE; } -bool wxApp::ProcessIdle() +GdkVisual *wxApp::GetGdkVisual() { - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); - - return event.MoreRequested(); -} - -void wxApp::OnIdle( wxIdleEvent &event ) -{ - static bool inOnIdle = FALSE; - - /* Avoid recursion (via ProcessEvent default case) */ - if (inOnIdle) - return; - - inOnIdle = TRUE; - -#if wxUSE_THREADS - /* Resend in the main thread events which have been prepared in other - threads */ - ProcessPendingEvents(); -#endif + GdkVisual *visual = NULL; - /* 'Garbage' collection of windows deleted with Close(). */ - DeletePendingObjects(); - - /* flush the logged messages if any */ - wxLog *log = wxLog::GetActiveTarget(); - if (log != NULL && log->HasPendingMessages()) - log->Flush(); - - /* Send OnIdle events to all windows */ - bool needMore = SendIdleEvents(); + if (m_glVisualInfo) + visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); + else + visual = gdk_window_get_visual( wxGetRootWindow()->window ); - if (needMore) - event.RequestMore(TRUE); + wxASSERT( visual ); - inOnIdle = FALSE; + return visual; } -bool wxApp::SendIdleEvents() +bool wxApp::Initialize(int& argc, wxChar **argv) { - bool needMore = FALSE; - - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) + bool init_result; + +#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)) { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); + printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" ); } - - return needMore; -} - -bool wxApp::SendIdleEvents( wxWindow* win ) -{ - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); - - win->OnInternalIdle(); - - win->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; - - wxNode* node = win->GetChildren().First(); - while (node) + else { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); + if (!g_thread_supported()) + g_thread_init(NULL); } - return needMore ; -} - -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::ExitMainLoop() -{ - gtk_main_quit(); -} - -bool wxApp::Initialized() -{ - return m_initialized; -} - -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} - -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} +#endif // wxUSE_THREADS -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode *node = wxPendingEvents->First(); - wxCriticalSectionLocker locker(*wxPendingEventsLocker); + gtk_set_locale(); - while (node) + // We should have the wxUSE_WCHAR_T test on the _outside_ +#if wxUSE_WCHAR_T + #if defined(__WXGTK20__) + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; + #else // GTK 1.x + if (!wxOKlibc()) + wxConvCurrent = &wxConvLocal; + #endif +#else // !wxUSE_WCHAR_T + if (!wxOKlibc()) + wxConvCurrent = (wxMBConv*) NULL; +#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T + +#ifdef __WXGTK20__ + // 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"))); + if (encName == _T("@locale")) + encName.clear(); + encName.MakeUpper(); +#if wxUSE_INTL + if (encName.empty()) { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; - - node = wxPendingEvents->First(); + // (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 // wxUSE_THREADS - -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) +#else + if (encName.empty()) + encName = _T("UTF-8"); +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; +#endif // __WXGTK20__ + +#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++ ) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; - - if (wxPendingDelete.Find(obj)) - delete node; - - node = wxPendingDelete.First(); + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); } -} -wxWindow *wxApp::GetTopWindow() -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.GetCount() > 0) - return wxTopLevelWindows.GetFirst()->GetData(); - else - return NULL; -} + argvGTK[argc] = NULL; -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; -} + 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 ); +#endif -bool wxApp::Initialize() -{ - wxBuffer = new wxChar[BUFSIZ + 512]; + 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 ) + { + memmove(argv + i, argv + i + 1, argc - i); + } + } - wxClassInfo::InitializeClasses(); + argc = argcGTK; + } + //else: gtk_init() didn't modify our parameters - wxSystemSettings::Init(); + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); + } - // 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 + 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 -/* - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); -*/ + 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(); - wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); - wxTheColourDatabase->Initialize(); + if ( !wxAppBase::Initialize(argc, argv) ) + { + gdk_threads_leave(); - wxInitializeStockLists(); - wxInitializeStockObjects(); + return false; + } -#if wxUSE_WX_RESOURCES - wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); + wxSetDetectableAutoRepeat( TRUE ); - wxInitializeResourceSystem(); +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - wxImage::InitStandardHandlers(); - - /* no global cursor under X - g_globalCursor = new wxCursor; */ - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - return TRUE; + return true; } void wxApp::CleanUp() { - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxFlushResources(); - - if (wxTheResourceCache) - delete wxTheResourceCache; - wxTheResourceCache = (wxResourceCache*) NULL; - - wxCleanUpResourceSystem(); -#endif + gdk_threads_leave(); - if (wxTheColourDatabase) - delete wxTheColourDatabase; - wxTheColourDatabase = (wxColourDatabase*) NULL; - -/* - if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; - wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; -*/ - - wxDeleteStockObjects(); - - wxDeleteStockLists(); - - wxImage::CleanUpHandlers(); - - 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; - - wxClassInfo::CleanUpClasses(); - - // check for memory leaks -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug(_T("There were memory leaks.\n")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -#endif // Debug - - // 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; -} - -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; + wxAppBase::CleanUp(); } -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- +#ifdef __WXDEBUG__ -int wxEntry( int argc, char *argv[] ) +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - gtk_set_locale(); - - gtk_init( &argc, &argv ); - - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) - return -1; - - if (!wxTheApp) - { - wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, - _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); + m_isInAssert = TRUE; - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); + wxAppBase::OnAssert(file, line, cond, msg); - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; - } - - wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - wxString name(wxFileNameFromPath(argv[0])); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); - - int retValue = 0; - - if ( !wxTheApp->OnInitGui() ) - retValue = -1; + m_isInAssert = FALSE; +} - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). - if ( retValue == 0 ) - { - if ( !wxTheApp->OnInit() ) - retValue = -1; - } +#endif // __WXDEBUG__ - if ( retValue == 0 ) +void wxApp::RemoveIdleTag() +{ +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + if (!g_isIdle) { - wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - - if (wxTheApp->Initialized()) - retValue = wxTheApp->OnRun(); - - 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(); + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = TRUE; } - - // 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; - - wxApp::CleanUp(); - - return retValue; } -