#include "wx/font.h"
#endif
-#include "wx/file.h"
-#include "wx/filename.h"
#include "wx/thread.h"
#ifdef __WXGPE__
#include <gpe/init.h>
#endif
-#ifdef __WXUNIVERSAL__
- #include "wx/univ/theme.h"
- #include "wx/univ/renderer.h"
-#endif
-
-#include <unistd.h>
-
-#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>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
-#endif // HAVE_POLL/!HAVE_POLL
-
-#include "wx/unix/private.h"
#include "wx/gtk/win_gtk.h"
#include "wx/gtk/private.h"
// link GnomeVFS
//-----------------------------------------------------------------------------
-#if wxUSE_LIBGNOMEVFS
-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_vfs)
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+ #include "wx/link.h"
+ wxFORCE_LINK_MODULE(gnome_vfs)
#endif
//-----------------------------------------------------------------------------
// We need to remove idle callbacks or the loop will
// never finish.
- RemoveIdleSource();
+ SuspendIdleCallback();
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
+ // this does not look possible, but just in case...
if (!wxTheApp)
return false;
+ bool moreIdles = false;
+
#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() )
- return false;
+ // this matches the behavior of wxMSW
+ if (!wxTheApp->IsInAssert())
#endif // __WXDEBUG__
+ {
+ guint idleID_save;
+ {
+ // Allow another idle source to be added while this one is busy.
+ // Needed if an idle event handler runs a new event loop,
+ // for example by showing a dialog.
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ idleID_save = wxTheApp->m_idleTag;
+ wxTheApp->m_idleTag = 0;
+ g_isIdle = true;
+ wxAddEmissionHook();
+ }
- // 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();
+ // When getting called from GDK's time-out handler
+ // we are no longer within GDK's grab on the GUI
+ // thread so we must lock it here ourselves.
+ gdk_threads_enter();
- bool moreIdles;
+ // Send idle event to all who request them as long as
+ // no events have popped up in the event queue.
+ do {
+ moreIdles = wxTheApp->ProcessIdle();
+ } while (moreIdles && gtk_events_pending() == 0);
- // 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)
- ;
+ // Release lock again
+ gdk_threads_leave();
- // Release lock again
- gdk_threads_leave();
+ {
+ // If another idle source was added, remove it
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ if (wxTheApp->m_idleTag != 0)
+ g_source_remove(wxTheApp->m_idleTag);
+ wxTheApp->m_idleTag = idleID_save;
+ g_isIdle = false;
+ }
+ }
if (!moreIdles)
{
// Return FALSE if no more idle events are to be sent
return moreIdles;
}
+} // extern "C"
#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;
- wxFD_ZERO(&readfds);
- wxFD_ZERO(&writefds);
- wxFD_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 )
- wxFD_SET(ufds[i].fd, &readfds);
-
- if ( ufds[i].events & G_IO_PRI )
- wxFD_SET(ufds[i].fd, &exceptfds);
-
- if ( ufds[i].events & G_IO_OUT )
- wxFD_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 ( wxFD_ISSET(ufds[i].fd, &readfds ) )
- ufds[i].revents |= G_IO_IN;
-
- if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
- ufds[i].revents |= G_IO_PRI;
-
- if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
- ufds[i].revents |= G_IO_OUT;
- }
-
- return res;
-}
-
-#endif // HAVE_POLL/!HAVE_POLL
+static GPollFunc wxgs_poll_func;
+extern "C" {
static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
{
gdk_threads_enter();
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 );
+ gint res = (*wxgs_poll_func)(ufds, nfds, timeout);
wxMutexGuiEnter();
g_mainThreadLocked = false;
return res;
}
+}
#endif // wxUSE_THREADS
-} // extern "C"
-
void wxapp_install_idle_handler()
{
if (wxTheApp == NULL)
g_isIdle = true;
wxapp_install_idle_handler();
-#if wxUSE_THREADS
- g_main_context_set_poll_func( NULL, wxapp_poll_func );
-#endif
-
// this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
m_glVisualInfo = (void *) NULL;
m_glFBCInfo = (void *) NULL;
// 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();
GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
gtk_widget_set_default_colormap( colormap );
}
-
- // 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))
{
- /* seems gtk_widget_set_default_visual no longer exists? */
- GdkVisual* vis = gtk_widget_get_default_visual();
-
- GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
- gtk_widget_set_default_colormap( colormap );
+ // On some machines, the default visual is just 256 colours, so
+ // we make sure we get the best. This can sometimes be wasteful.
+ if (m_useBestVisual)
+ {
+ if (m_forceTrueColour)
+ {
+ GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR );
+ if (!visual)
+ {
+ wxLogError(wxT("Unable to initialize TrueColor visual."));
+ return false;
+ }
+ GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+ gtk_widget_set_default_colormap( colormap );
+ }
+ else
+ {
+ if (gdk_visual_get_best() != gdk_visual_get_system())
+ {
+ GdkVisual* visual = gdk_visual_get_best();
+ GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+ gtk_widget_set_default_colormap( colormap );
+ }
+ }
+ }
}
return true;
bool wxApp::Initialize(int& argc, wxChar **argv)
{
- bool init_result;
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
#if wxUSE_THREADS
if (!g_thread_supported())
g_thread_init(NULL);
-#endif // wxUSE_THREADS
- gtk_set_locale();
+ wxgs_poll_func = g_main_context_get_poll_func(NULL);
+ g_main_context_set_poll_func(NULL, wxapp_poll_func);
+#endif // wxUSE_THREADS
// We should have the wxUSE_WCHAR_T test on the _outside_
#if wxUSE_WCHAR_T
// 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"))
+ if (encName.CmpNoCase(_T("@locale")) == 0)
encName.clear();
encName.MakeUpper();
#if wxUSE_INTL
static wxConvBrokenFileNames fileconv(encName);
wxConvFileName = &fileconv;
+
+ bool init_result;
+
#if wxUSE_UNICODE
// gtk_init() wants UTF-8, not wchar_t, so convert
int i;
{
while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
{
- memmove(argv + i, argv + i + 1, argc - i);
+ memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
}
}
// we can not enter threads before gtk_init is done
gdk_threads_enter();
- if ( !wxAppBase::Initialize(argc, argv) )
- {
- gdk_threads_leave();
-
- return false;
- }
-
wxSetDetectableAutoRepeat( true );
#if wxUSE_INTL
const wxChar* cond,
const wxChar *msg)
{
+
+ // block wx idle events while assert dialog is showing
m_isInAssert = true;
wxAppBase::OnAssertFailure(file, line, func, cond, msg);
#endif // __WXDEBUG__
-void wxApp::RemoveIdleSource()
+void wxApp::SuspendIdleCallback()
{
#if wxUSE_THREADS
wxMutexLocker lock(gs_idleTagsMutex);
projects / wxWidgets.git / blobdiff