don't compare invalid iterators/node pointers

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 31c0075cd62df20f2079756252f72469c1e34335..286164ca96f27436a2f4fed2685452f2826aa7c6 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -4,13 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#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 <vms_jackets.h>
 #ifdef __VMS
 // vms_jackets.h should for proper working be included before anything else
 # include <vms_jackets.h>


@@ -34,6 +30,7 @@
 #include "wx/filename.h"
 #include "wx/module.h"
 #include "wx/image.h"
 #include "wx/filename.h"
 #include "wx/module.h"
 #include "wx/image.h"

+#include "wx/thread.h"

 
 #ifdef __WXGPE__
 #include <gpe/init.h>
 
 #ifdef __WXGPE__
 #include <gpe/init.h>


@@ -75,10 +72,20 @@
     #include <unistd.h>
 #endif // HAVE_POLL/!HAVE_POLL
 
     #include <unistd.h>
 #endif // HAVE_POLL/!HAVE_POLL
 

+#include "wx/unix/private.h"

 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/win_gtk.h"

+#include "wx/gtk/private.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

+//-----------------------------------------------------------------------------
+// link GnomeVFS
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBGNOMEVFS
+#include "wx/html/forcelnk.h"
+FORCE_LINK(gnome_vfs)
+#endif

 
 //-----------------------------------------------------------------------------
 // global data
 
 //-----------------------------------------------------------------------------
 // global data


@@ -93,10 +100,12 @@ static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 // idle system
 //-----------------------------------------------------------------------------
 
 // idle system
 //-----------------------------------------------------------------------------
 

-extern bool g_isIdle;
-

 void wxapp_install_idle_handler();
 
 void wxapp_install_idle_handler();
 

+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif
+

 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------


@@ -128,18 +137,15 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxIsInsideYield = TRUE;
 
 
     wxIsInsideYield = TRUE;
 

-    if (!g_isIdle)
-    {
-        // We need to remove idle callbacks or the loop will
-        // never finish.
-        gtk_idle_remove( m_idleTag );
-        m_idleTag = 0;
-        g_isIdle = 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();
     // 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();
 
     while (gtk_events_pending())
         gtk_main_iteration();


@@ -152,8 +158,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // return value of Processidle().
     ProcessIdle();
 
     // return value of Processidle().
     ProcessIdle();
 

+#if wxUSE_LOG

     // let the logs be flashed again
     wxLog::Resume();
     // let the logs be flashed again
     wxLog::Resume();

+#endif

 
     wxIsInsideYield = FALSE;
 
 
     wxIsInsideYield = FALSE;
 


@@ -164,20 +172,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 
 // 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()
 {
 void wxApp::WakeUpIdle()
 {

-#if wxUSE_THREADS
-    if (!wxThread::IsMain())
-        wxMutexGuiEnter();
-#endif
-
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-#if wxUSE_THREADS
-    if (!wxThread::IsMain())
-        wxMutexGuiLeave();
-#endif
+    wxapp_install_idle_handler();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -200,7 +200,12 @@ static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
     // Sent idle event to all who request them.
     wxTheApp->ProcessPendingEvents();
 
     // Sent idle event to all who request them.
     wxTheApp->ProcessPendingEvents();
 

-    g_pendingTag = 0;
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        g_pendingTag = 0;
+    }

 
     // Flush the logged messages if any.
 #if wxUSE_LOG
 
     // Flush the logged messages if any.
 #if wxUSE_LOG


@@ -230,11 +235,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();

-#ifdef __WXGTK20__

             if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
             if (win->IsKindOf(CLASSINFO(wxMessageDialog)))

-#else
-            if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
-#endif

                 win->OnInternalIdle();
         }
         return TRUE;
                 win->OnInternalIdle();
         }
         return TRUE;


@@ -248,20 +249,26 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
     // Indicate that we are now in idle mode and event handlers
     // will have to reinstall the idle handler again.
 
     // Indicate that we are now in idle mode and event handlers
     // will have to reinstall the idle handler again.

-    g_isIdle = TRUE;
-    wxTheApp->m_idleTag = 0;
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        g_isIdle = TRUE;
+        wxTheApp->m_idleTag = 0;
+    }
+
+    bool moreIdles;

 
     // Send idle event to all who request them as long as
     // no events have popped up in the event queue.
 
     // 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))
+    while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)

         ;
 
     // Release lock again
     gdk_threads_leave();
 
         ;
 
     // 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;
+    // Return FALSE if no more idle events are to be sent
+    return moreIdles;

 }
 
 #if wxUSE_THREADS
 }
 
 #if wxUSE_THREADS


@@ -287,23 +294,23 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;

-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
+    wxFD_ZERO(&readfds);
+    wxFD_ZERO(&writefds);
+    wxFD_ZERO(&exceptfds);

 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {
 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {

-        wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
+        wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );

 
         if ( ufds[i].events & G_IO_IN )
 
         if ( ufds[i].events & G_IO_IN )

-            FD_SET(ufds[i].fd, &readfds);
+            wxFD_SET(ufds[i].fd, &readfds);

 
         if ( ufds[i].events & G_IO_PRI )
 
         if ( ufds[i].events & G_IO_PRI )

-            FD_SET(ufds[i].fd, &exceptfds);
+            wxFD_SET(ufds[i].fd, &exceptfds);

 
         if ( ufds[i].events & G_IO_OUT )
 
         if ( ufds[i].events & G_IO_OUT )

-            FD_SET(ufds[i].fd, &writefds);
+            wxFD_SET(ufds[i].fd, &writefds);

 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;
 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;


@@ -317,13 +324,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     {
         ufds[i].revents = 0;
 
     {
         ufds[i].revents = 0;
 

-        if ( FD_ISSET(ufds[i].fd, &readfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )

             ufds[i].revents |= G_IO_IN;
 
             ufds[i].revents |= G_IO_IN;
 

-        if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )

             ufds[i].revents |= G_IO_PRI;
 
             ufds[i].revents |= G_IO_PRI;
 

-        if ( FD_ISSET(ufds[i].fd, &writefds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )

             ufds[i].revents |= G_IO_OUT;
     }
 
             ufds[i].revents |= G_IO_OUT;
     }
 


@@ -357,6 +364,15 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 
 void wxapp_install_idle_handler()
 {
 
 void wxapp_install_idle_handler()
 {

+#if wxUSE_THREADS
+    wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+
+    // 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?
     // 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?


@@ -367,14 +383,14 @@ void wxapp_install_idle_handler()
     g_isIdle = FALSE;
 
     if (g_pendingTag == 0)
     g_isIdle = FALSE;
 
     if (g_pendingTag == 0)

-        g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
+        g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, 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.
 
     // 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 );
+    wxTheApp->m_idleTag = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -408,23 +424,27 @@ wxApp::wxApp()
 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;

+    g_isIdle = TRUE;

     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS

-    g_main_set_poll_func( wxapp_poll_func );
+    g_main_context_set_poll_func( NULL, 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;
 #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()
 {
 }
 
 wxApp::~wxApp()
 {

-    if (m_idleTag) gtk_idle_remove( m_idleTag );
+    if (m_idleTag)
+        g_source_remove( m_idleTag );

 
 

-    if (m_colorCube) free(m_colorCube);
+    if (m_colorCube)
+        free(m_colorCube);

 }
 
 bool wxApp::OnInitGui()
 }
 
 bool wxApp::OnInitGui()


@@ -438,14 +458,8 @@ bool wxApp::OnInitGui()
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {
     // 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();
         // 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 *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );


@@ -459,13 +473,8 @@ bool wxApp::OnInitGui()
     else
     if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
     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();
         /* 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 );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );


@@ -544,7 +553,7 @@ GdkVisual *wxApp::GetGdkVisual()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     bool init_result;
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     bool init_result;

-    
+

 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&
 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&


@@ -564,18 +573,40 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // We should have the wxUSE_WCHAR_T test on the _outside_
 #if wxUSE_WCHAR_T
 
     // 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
+    // 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
 
 #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())
+    {
+        // (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);
+    }
+#else
+    if (encName.empty())
+        encName = _T("UTF-8");
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;
+

 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;


@@ -588,7 +619,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;

-    
+

 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );


@@ -628,7 +659,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
         return false;
     }
         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();
 
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();
 


@@ -645,8 +676,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

-    wxGetRootWindow();
-

     return true;
 }
 
     return true;
 }
 


@@ -670,3 +699,15 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

+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;
+    }
+}