X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df744f4d6d1f9d093822980915b7802f95cb98fa..c3b0c2c3dc1e2a76af69082f63149174525d97d5:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index eb7f991c51..b598da0307 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -13,6 +13,7 @@ #ifdef __VMS #include +#undef ConnectionNumber #endif #include "wx/app.h" @@ -24,11 +25,9 @@ #include "wx/font.h" #include "wx/settings.h" #include "wx/dialog.h" - -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - +#include "wx/msgdlg.h" +#include "wx/file.h" +#include "wx/filename.h" #include "wx/module.h" #include "wx/image.h" @@ -42,11 +41,32 @@ #endif #include -#ifdef __VMS -# include -#else -# include -#endif + +#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 @@ -56,9 +76,6 @@ // global data //----------------------------------------------------------------------------- -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - bool g_mainThreadLocked = FALSE; gint g_pendingTag = 0; @@ -72,25 +89,18 @@ extern bool g_isIdle; void wxapp_install_idle_handler(); -//----------------------------------------------------------------------------- -// wxExit -//----------------------------------------------------------------------------- - -void wxExit() -{ - gtk_main_quit(); -} - //----------------------------------------------------------------------------- // wxYield //----------------------------------------------------------------------------- +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = FALSE; + bool wxApp::Yield(bool onlyIfNeeded) { - // MT-FIXME - static bool s_inYield = FALSE; - - if ( s_inYield ) + if ( wxIsInsideYield ) { if ( !onlyIfNeeded ) { @@ -108,7 +118,7 @@ bool wxApp::Yield(bool onlyIfNeeded) } #endif // wxUSE_THREADS - s_inYield = TRUE; + wxIsInsideYield = TRUE; if (!g_isIdle) { @@ -128,7 +138,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // 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 + // 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(). @@ -137,7 +147,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // let the logs be flashed again wxLog::Resume(); - s_inYield = FALSE; + wxIsInsideYield = FALSE; return TRUE; } @@ -146,7 +156,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // wxWakeUpIdle //----------------------------------------------------------------------------- -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { #if wxUSE_THREADS if (!wxThread::IsMain()) @@ -208,6 +218,17 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) // 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(); +#ifdef __WXGTK20__ + if (win->IsKindOf(CLASSINFO(wxMessageDialog))) +#else + if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) +#endif + win->OnInternalIdle(); + } return TRUE; } #endif // __WXDEBUG__ @@ -237,15 +258,82 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) #if wxUSE_THREADS +#ifdef HAVE_POLL + #define wxPoll poll + #define wxPollFd pollfd +#else // !HAVE_POLL + +typedef GPollFD wxPollFd; + +int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) +{ + // convert timeout from ms to struct timeval (s/us) + timeval tv_timeout; + tv_timeout.tv_sec = timeout/1000; + tv_timeout.tv_usec = (timeout%1000)*1000; + + // remember the highest fd used here + int fdMax = -1; + + // and fill the sets for select() + fd_set readfds; + fd_set writefds; + fd_set exceptfds; + 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; + } + + fdMax++; + int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); + + // translate the results back + for ( i = 0; i < nfds; i++ ) + { + ufds[i].revents = 0; + + if ( 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 res; +} + +#endif // HAVE_POLL/!HAVE_POLL + static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - gint res; gdk_threads_enter(); wxMutexGuiLeave(); g_mainThreadLocked = TRUE; - res = poll( (struct pollfd*) ufds, nfds, timeout ); + // 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; @@ -261,6 +349,11 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) void wxapp_install_idle_handler() { + // GD: this assert is raised when using the thread sample (which works) + // so the test is probably not so easy. Can widget callbacks be + // triggered from child threads and, if so, for which widgets? + // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") ); + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); g_isIdle = FALSE; @@ -315,7 +408,7 @@ wxApp::wxApp() #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; } @@ -342,7 +435,7 @@ bool wxApp::OnInitGui() // seems gtk_widget_set_default_visual no longer exists? GdkVisual* vis = gtk_widget_get_default_visual(); #else - GdkVisual* vis = gdkx_visual_get( + GdkVisual* vis = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo) ->visualid ); gtk_widget_set_default_visual( vis ); #endif @@ -352,7 +445,7 @@ bool wxApp::OnInitGui() 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. @@ -430,23 +523,35 @@ bool wxApp::OnInitGui() 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; } bool wxApp::ProcessIdle() { + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); + node = wxTopLevelWindows.GetFirst(); + while (node) + { + wxWindow* win = node->GetData(); + CallInternalIdle( win ); + + node = node->GetNext(); + } + wxIdleEvent event; event.SetEventObject( this ); ProcessEvent( event ); + wxUpdateUIEvent::ResetUpdateTime(); + return event.MoreRequested(); } @@ -486,12 +591,29 @@ bool wxApp::SendIdleEvents() wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; + node = node->GetNext(); } return needMore; } +bool wxApp::CallInternalIdle( wxWindow* win ) +{ + win->OnInternalIdle(); + + wxWindowList::Node *node = win->GetChildren().GetFirst(); + while (node) + { + wxWindow *win = node->GetData(); + + CallInternalIdle( win ); + node = node->GetNext(); + } + + return TRUE; +} + bool wxApp::SendIdleEvents( wxWindow* win ) { bool needMore = FALSE; @@ -501,21 +623,20 @@ bool wxApp::SendIdleEvents( wxWindow* win ) win->GetEventHandler()->ProcessEvent(event); - win->OnInternalIdle(); - if (event.MoreRequested()) needMore = TRUE; - wxNode* node = win->GetChildren().First(); + wxWindowList::Node *node = win->GetChildren().GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow *win = node->GetData(); + if (SendIdleEvents(win)) needMore = TRUE; - - node = node->Next(); + node = node->GetNext(); } - return needMore ; + + return needMore; } int wxApp::MainLoop() @@ -524,6 +645,13 @@ int wxApp::MainLoop() return 0; } +void wxApp::Exit() +{ + // VZ: no idea why is it different from ExitMainLoop() but this is what + // wxExit() used to do + gtk_main_quit(); +} + void wxApp::ExitMainLoop() { if (gtk_main_level() > 0) @@ -545,112 +673,7 @@ void wxApp::Dispatch() gtk_main_iteration(); } -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; - - if (wxPendingDelete.Find(obj)) - delete node; - - node = wxPendingDelete.First(); - } -} - -bool wxApp::Initialize() -{ - wxBuffer = new wxChar[BUFSIZ + 512]; - - wxClassInfo::InitializeClasses(); - -#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; - - return TRUE; -} - -void wxApp::CleanUp() -{ - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - if (wxTheColourDatabase) - delete wxTheColourDatabase; - - wxTheColourDatabase = (wxColourDatabase*) 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 - - delete[] wxBuffer; - - wxClassInfo::CleanUpClasses(); - - // 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 -} - -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- - -// NB: argc and argv may be changed here, pass by reference! -int wxEntryStart( int& argc, char *argv[] ) +bool wxApp::Initialize(int& argc, wxChar **argv) { #if wxUSE_THREADS // GTK 1.2 up to version 1.2.3 has broken threads @@ -664,218 +687,101 @@ int wxEntryStart( int& argc, char *argv[] ) { g_thread_init(NULL); } -#endif +#endif // wxUSE_THREADS 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; -#endif -#else - if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; -#endif - - gdk_threads_enter(); - - gtk_init( &argc, &argv ); + #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 - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) +#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++ ) { - gdk_threads_leave(); - return -1; + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); } - return 0; -} - - -int wxEntryInitGui() -{ - int retValue = 0; - - if ( !wxTheApp->OnInitGui() ) - retValue = -1; - - wxGetRootWindow(); - - return retValue; -} - - -void wxEntryCleanup() -{ -#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(); -} - + argvGTK[argc] = NULL; -int wxEntry( int argc, char *argv[] ) -{ -#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; + int argcGTK = argc; + gtk_init( &argcGTK, &argvGTK ); - 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) + // free our copy + for ( i = 0; i < argcGTK; i++ ) { - wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); - mb_argc++; + free(argvGTK[i]); } - 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(); + 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 + gtk_init( &argc, &argv ); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). - if ( retValue == 0 ) - { - if ( !wxTheApp->OnInit() ) - retValue = -1; - } + // we can not enter threads before gtk_init is done + gdk_threads_enter(); - if ( retValue == 0 ) + 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(); - - wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - - if (wxTheApp->Initialized()) - { - 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 ); - } - } + gdk_threads_leave(); - retValue = wxTheApp->OnExit(); - } + return false; } - wxEntryCleanup(); - - return retValue; -} - -#ifndef __WXUNIVERSAL__ + wxSetDetectableAutoRepeat( TRUE ); -// XPM hack: make the arrays const -#define static static const +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif -#include "wx/gtk/info.xpm" -#include "wx/gtk/error.xpm" -#include "wx/gtk/question.xpm" -#include "wx/gtk/warning.xpm" + wxGetRootWindow(); -#undef static + return true; +} -wxIcon wxApp::GetStdIcon(int which) const +void wxApp::CleanUp() { - switch(which) - { - case wxICON_INFORMATION: - return wxIcon(info_xpm); - - case wxICON_QUESTION: - return wxIcon(question_xpm); - - case wxICON_EXCLAMATION: - return wxIcon(warning_xpm); - - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through + gdk_threads_leave(); - case wxICON_HAND: - return wxIcon(error_xpm); - } + wxAppBase::CleanUp(); } -#else -wxIcon wxApp::GetStdIcon(int which) const -{ - return wxTheme::Get()->GetRenderer()->GetStdIcon(which); -} -#endif // !__WXUNIVERSAL__ - #ifdef __WXDEBUG__ -void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { m_isInAssert = TRUE; - wxAppBase::OnAssert(file, line, msg); + wxAppBase::OnAssert(file, line, cond, msg); m_isInAssert = FALSE; }