Changed default cursor to be an arrow rather than the ugly X.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 0bb4f7afed2c4513bfc5e69f54a3b8093f0f029a..2b96d6903305581d984629f02b4dbcc10959026d 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -28,13 +28,15 @@
 #include "wx/module.h"
 #include "wx/image.h"
 
 #include "wx/module.h"
 #include "wx/image.h"
 

+#if wxUSE_THREADS

 #include "wx/thread.h"
 #include "wx/thread.h"

+#endif

 
 #include "unistd.h"
 
 
 #include "unistd.h"
 

-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

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


@@ -42,15 +44,17 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

+extern wxCursor g_globalCursor;
+

 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 

-extern wxList wxPendingDelete;

 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;
 extern wxCriticalSection *wxPendingEventsLocker;
 #endif
 extern wxResourceCache *wxTheResourceCache;
 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;
 extern wxCriticalSection *wxPendingEventsLocker;
 #endif
 extern wxResourceCache *wxTheResourceCache;

+extern bool g_isIdle;

 
 unsigned char g_palette[64*3] =
 {
 
 unsigned char g_palette[64*3] =
 {


@@ -135,14 +139,17 @@ void wxExit()
     gtk_main_quit();
 }
 
     gtk_main_quit();
 }
 

-// forward decl
+/* forward declaration */

 gint wxapp_idle_callback( gpointer WXUNUSED(data) );
 
 bool wxYield()
 {
 gint wxapp_idle_callback( gpointer WXUNUSED(data) );
 
 bool wxYield()
 {

-    // 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)
+    /* 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) */
+    while (wxTheApp->ProcessIdle()) { }
+       
+#if 0

     for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
           node;
           node = node->GetNext() )
     for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
           node;
           node = node->GetNext() )


@@ -150,17 +157,108 @@ bool wxYield()
         wxWindow *win = node->GetData();
         win->OnInternalIdle();
     }
         wxWindow *win = node->GetData();
         win->OnInternalIdle();
     }

+#endif
+
+    if (wxTheApp->m_idleTag)
+    {
+        /* We need to temporarily remove idle callbacks or the loop will
+           never finish. */
+        gtk_idle_remove( wxTheApp->m_idleTag );
+        wxTheApp->m_idleTag = 0;
+
+        while (gtk_events_pending())
+            gtk_main_iteration();

 
 

-    // We need to temporarily remove idle callbacks or the loop will
-    // never finish.
+        /* re-add idle handler */
+        wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+    }
+    else
+    {
+        while (gtk_events_pending())
+            gtk_main_iteration();
+    }
+    
+    return TRUE;
+}
+
+gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+{
+    if (!wxTheApp) return TRUE;
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* 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 ();
+#endif
+    
+    /* 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 );
     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;
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif

 
 

-    while (gtk_events_pending())
-        gtk_main_iteration();
+    return TRUE;
+}
+
+void wxapp_install_idle_handler()
+{
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
+
+    /* this routine gets called by all event handlers
+       indicating that the idle is over. */

 
     wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 
     wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );

+    
+    g_isIdle = FALSE;
+}
+
+#if wxUSE_THREADS
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+    gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
+    wxTheApp->m_wakeUpTimerTag = 0;
+    
+#if (GTK_MINOR_VERSION > 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 ();
+#endif
+    
+    /* unblock other threads wishing to do some GUI things */
+    wxMutexGuiLeave();
+    
+    /* wake up other threads */
+    wxUsleep( 1 );
+    
+    /* block other thread again  */
+    wxMutexGuiEnter();
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+    
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -172,22 +270,6 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
-{
-    if (wxTheApp)
-    {
-        while (wxTheApp->ProcessIdle())
-        {
-        }
-    }
-
-    wxMutexGuiLeave();
-    wxUsleep(10);
-    wxMutexGuiEnter();
-
-    return TRUE;
-}
-

 wxApp::wxApp()
 {
     wxTheApp = this;
 wxApp::wxApp()
 {
     wxTheApp = this;


@@ -196,14 +278,22 @@ wxApp::wxApp()
     m_exitOnFrameDelete = TRUE;
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     m_exitOnFrameDelete = TRUE;
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );

+    
+#if wxUSE_THREADS
+    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+#endif

 
     m_colorCube = (unsigned char*) NULL;
 }
 
 wxApp::~wxApp()
 {
 
     m_colorCube = (unsigned char*) NULL;
 }
 
 wxApp::~wxApp()
 {

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

 
 

+#if wxUSE_THREADS
+    if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+#endif
+    

     if (m_colorCube) free(m_colorCube);
 }
 
     if (m_colorCube) free(m_colorCube);
 }
 


@@ -244,8 +334,8 @@ bool wxApp::OnInitGui()
 
     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 
 
     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 

-     for (int r = 0; r < 32; r++)
-     {
+    for (int r = 0; r < 32; r++)
+    {

         for (int g = 0; g < 32; g++)
         {
             for (int b = 0; b < 32; b++)
         for (int g = 0; g < 32; g++)
         {
             for (int b = 0; b < 32; b++)


@@ -254,25 +344,40 @@ bool wxApp::OnInitGui()
                 int gg = (g << 3) | (g >> 2);
                 int bb = (b << 3) | (b >> 2);
 
                 int gg = (g << 3) | (g >> 2);
                 int bb = (b << 3) | (b >> 2);
 

-                GdkColor *colors = cmap->colors;
-                int max = 3 * (65536);

                 int index = -1;
 
                 int index = -1;
 

-                for (int i = 0; i < cmap->size; i++)
+                GdkColor *colors = cmap->colors;
+                if (colors)

                 {
                 {

-                    int rdiff = ((rr << 8) - colors[i].red);
-                    int gdiff = ((gg << 8)- colors[i].green);
-                    int bdiff = ((bb << 8)- colors[i].blue);
-                    int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                    if (sum < max) { index = i; max = sum; }
+                    int max = 3 * 65536;
+
+                    for (int i = 0; i < cmap->size; i++)
+                    {
+                        int rdiff = ((rr << 8) - colors[i].red);
+                        int gdiff = ((gg << 8) - colors[i].green);
+                        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;
             }
         }
     }
 
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }
     }
 

-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -305,9 +410,11 @@ void wxApp::OnIdle( wxIdleEvent &event )
     DeletePendingObjects();
 
     /* flush the logged messages if any */
     DeletePendingObjects();
 
     /* flush the logged messages if any */

+#if wxUSE_LOG

     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();

+#endif // wxUSE_LOG

 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();


@@ -378,7 +485,7 @@ bool wxApp::Initialized()
 
 bool wxApp::Pending()
 {
 
 bool wxApp::Pending()
 {

-    return gtk_events_pending();
+    return (gtk_events_pending() > 0);

 }
 
 void wxApp::Dispatch()
 }
 
 void wxApp::Dispatch()


@@ -414,8 +521,8 @@ void wxApp::DeletePendingObjects()
 
         delete obj;
 
 
         delete obj;
 

-        if (wxPendingDelete.Member(obj))
-        delete node;
+        if (wxPendingDelete.Find(obj))
+            delete node;

 
         node = wxPendingDelete.First();
     }
 
         node = wxPendingDelete.First();
     }


@@ -438,7 +545,7 @@ void wxApp::SetTopWindow( wxWindow *win )
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

-    wxBuffer = new char[BUFSIZ + 512];
+    wxBuffer = new wxChar[BUFSIZ + 512];

 
     wxClassInfo::InitializeClasses();
 
 
     wxClassInfo::InitializeClasses();
 


@@ -470,8 +577,7 @@ bool wxApp::Initialize()
 
     wxImage::InitStandardHandlers();
 
 
     wxImage::InitStandardHandlers();
 

-    /* no global cursor under X
-       g_globalCursor = new wxCursor; */
+    g_globalCursor = wxCursor(wxCURSOR_DEFAULT);

 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;


@@ -528,12 +634,13 @@ void wxApp::CleanUp()
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug(_T("There were memory leaks.\n"));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
 #endif // Debug
 
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
 #endif // Debug
 

+#if wxUSE_LOG

     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 


@@ -546,6 +653,7 @@ wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
 {
     return new wxLogGui;
 }

+#endif // wxUSE_LOG

 
 //-----------------------------------------------------------------------------
 // wxEntry
 
 //-----------------------------------------------------------------------------
 // wxEntry


@@ -555,15 +663,19 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+

     gtk_init( &argc, &argv );
 
     gtk_init( &argc, &argv );
 

+    wxSetDetectableAutoRepeat( TRUE );
+    

     if (!wxApp::Initialize())
         return -1;
 
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
     if (!wxApp::Initialize())
         return -1;
 
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,

-                     "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+                     _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 


@@ -572,7 +684,7 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
         wxTheApp = (wxApp*) test_app;
     }
 

-    wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" );
+    wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );

 
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;
 
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;


@@ -581,40 +693,53 @@ int wxEntry( int argc, char *argv[] )
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 

-    if (!wxTheApp->OnInitGui())
-        return 0;
+    int retValue = 0;
+
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;

 
     // Here frames insert themselves automatically into wxTopLevelWindows by
     // getting created in OnInit().
 
     // Here frames insert themselves automatically into wxTopLevelWindows by
     // getting created in OnInit().

-    if (!wxTheApp->OnInit())
-        return 0;
-
-    wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
-
-    int retValue = 0;
-
-    if (wxTheApp->Initialized())
-        retValue = wxTheApp->OnRun();
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if (topWindow)
+    if ( retValue == 0 )

     {
     {

-        // 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 );
+        /* 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())
+       {
+            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();

         }
     }
 
         }
     }
 

-    wxTheApp->OnExit();
-
+#if wxUSE_LOG

     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())


@@ -626,6 +751,7 @@ int wxEntry( int argc, char *argv[] )
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;

+#endif // wxUSE_LOG

 
     wxApp::CleanUp();
 
 
     wxApp::CleanUp();