#ifdef __VMS
#include <vms_jackets.h>
+#undef ConnectionNumber
#endif
#include "wx/app.h"
#include "wx/settings.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
-
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
-#endif
-
+#include "wx/file.h"
+#include "wx/filename.h"
#include "wx/module.h"
#include "wx/image.h"
#endif
#include <unistd.h>
-#if defined(__DARWIN__)
-// FIXME: select must be used instead of poll (GD)
-#elif defined(__VMS)
-# include <poll.h>
-#else
-# include <sys/poll.h>
-#endif
+
+#ifdef HAVE_POLL
+ #if defined(__VMS)
+ #include <poll.h>
+ #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 <sys/poll.h>
+
+ #ifdef __OPENBSD__
+ };
+ #endif
+ #endif // platform
+#else // !HAVE_POLL
+ // we implement poll() ourselves using select() which is supposed exist in
+ // all modern Unices
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+#endif // HAVE_POLL/!HAVE_POLL
+
#include "wx/gtk/win_gtk.h"
#include <gtk/gtk.h>
// global data
//-----------------------------------------------------------------------------
-wxApp *wxTheApp = (wxApp *) NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
void wxapp_install_idle_handler();
-//-----------------------------------------------------------------------------
-// wxExit
-//-----------------------------------------------------------------------------
-
-void wxExit()
-{
- gtk_main_quit();
-}
-
//-----------------------------------------------------------------------------
// wxYield
//-----------------------------------------------------------------------------
// wxWakeUpIdle
//-----------------------------------------------------------------------------
-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()
{
#if wxUSE_THREADS
if (!wxThread::IsMain())
// But repaint the assertion message if necessary
if (wxTopLevelWindows.GetCount() > 0)
{
- wxWindow* win = (wxWindow*) wxTopLevelWindows.Last()->Data();
+ wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
+#ifdef __WXGTK20__
+ if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
+#else
if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+#endif
win->OnInternalIdle();
}
return TRUE;
#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;
-#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 );
-#endif
+ // 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;
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;
IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
+ EVT_IDLE(wxAppBase::OnIdle)
END_EVENT_TABLE()
wxApp::wxApp()
return visual;
}
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject( this );
- ProcessEvent( event );
-
- return event.MoreRequested();
-}
-
-void wxApp::OnIdle( wxIdleEvent &event )
-{
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if (s_inOnIdle)
- 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();
-
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- s_inOnIdle = FALSE;
-}
-
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
-
- node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- CallInternalIdle( win );
-
- node = node->GetNext();
- }
- return needMore;
-}
-
-bool wxApp::CallInternalIdle( wxWindow* win )
-{
- win->OnInternalIdle();
-
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- CallInternalIdle( win );
-
- node = node->Next();
- }
-
- return TRUE;
-}
-
-bool wxApp::SendIdleEvents( wxWindow* win )
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
-
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->Next();
- }
-
- return needMore;
-}
-
int wxApp::MainLoop()
{
gtk_main();
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)
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()
-{
- 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
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = (wxColourDatabase*) NULL;
-
- wxDeleteStockObjects();
-
- wxDeleteStockLists();
-
- delete wxTheApp;
- wxTheApp = (wxApp*) NULL;
-
- wxClassInfo::CleanUpClasses();
-
-#if wxUSE_THREADS
- delete wxPendingEvents;
- delete wxPendingEventsLocker;
-#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
-}
-
-//-----------------------------------------------------------------------------
-// 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
{
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
+ #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
- gdk_threads_enter();
-
- gtk_init( &argc, &argv );
-
- 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();
+ argvGTK[argc] = NULL;
- gdk_threads_leave();
-}
+ int argcGTK = argc;
+ gtk_init( &argcGTK, &argvGTK );
-
-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;
-
- 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
- wxTheApp->DeletePendingObjects();
-
- // When is the app not initialized ?
- wxTheApp->m_initialized = TRUE;
+ gdk_threads_leave();
- if (wxTheApp->Initialized())
- {
- wxTheApp->OnRun();
+ return false;
+ }
- wxWindow *topWindow = wxTheApp->GetTopWindow();
+ wxSetDetectableAutoRepeat( TRUE );
- // Delete all pending windows if any
- wxTheApp->DeletePendingObjects();
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
- // Reset top window
- if (topWindow)
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
+ wxGetRootWindow();
- retValue = wxTheApp->OnExit();
- }
- }
+ return true;
+}
- wxEntryCleanup();
+void wxApp::CleanUp()
+{
+ gdk_threads_leave();
- return retValue;
+ wxAppBase::CleanUp();
}
#ifdef __WXDEBUG__
projects / wxWidgets.git / blobdiff