More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 93459c373dd053f08384a0e8cb5d2e4e48f3b8a0..d70f078447afd483af0ffbeac21343333eb2b032 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -47,10 +47,11 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS

-extern wxList wxPendingEvents;
-extern wxCriticalSection wxPendingEventsLocker;
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;

 #endif
 extern wxResourceCache *wxTheResourceCache;
 #endif
 extern wxResourceCache *wxTheResourceCache;

+extern bool g_isIdle;

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


@@ -135,25 +136,81 @@ void wxExit()
     gtk_main_quit();
 }
 
     gtk_main_quit();
 }
 

+/* forward declaration */
+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)
 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)

-    for ( wxNode *node = wxTopLevelWindows.GetFirst();
+    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {

-        wxWindow *win = ((wxWindow*)node->GetData());
+        wxWindow *win = node->GetData();

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

-    while (gtk_events_pending() > 0)
-        gtk_main_iteration();
+    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();

 
 

+        /* 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;
 }
 
     return TRUE;
 }
 

+gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+{
+    if (!wxTheApp) return TRUE;
+    
+    /* 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 );
+    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;
+    
+    /* wake up other threads */
+    wxMutexGuiLeave();
+    wxUsleep(0);
+    wxMutexGuiEnter();
+
+    return TRUE;
+}
+
+void wxapp_install_idle_handler()
+{
+    /* 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 );
+    
+    g_isIdle = FALSE;
+}
+

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


@@ -164,22 +221,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;


@@ -194,7 +235,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

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

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


@@ -211,7 +252,7 @@ bool wxApp::OnInitGui()
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.

-          NOTE: this doesn't really seem to work this way... */
+           NOTE: this doesn't really seem to work this way... */

 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );


@@ -238,33 +279,32 @@ bool wxApp::OnInitGui()
 
      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++)
-           {
-               int rr = (r << 3) | (r >> 2);
-               int gg = (g << 3) | (g >> 2);
-               int bb = (b << 3) | (b >> 2);
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);

 
                 GdkColor *colors = cmap->colors;
 
                 GdkColor *colors = cmap->colors;

-                int max = 3 * (65536);
+                int max = 3 * 65536;

                 int index = -1;
 
                 for (int i = 0; i < cmap->size; i++)
                 {
                     int rdiff = ((rr << 8) - colors[i].red);
                 int index = -1;
 
                 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 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 sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
                     if (sum < max) { index = i; max = sum; }
                 }
 

-               m_colorCube[ (r*1024) + (g*32) + b ] = index;
-           }
-       }
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }

     }
 
     }
 

-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -287,9 +327,11 @@ void wxApp::OnIdle( wxIdleEvent &event )
 
     inOnIdle = TRUE;
 
 
     inOnIdle = TRUE;
 

+#if wxUSE_THREADS

     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();
     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();

+#endif

 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();


@@ -312,14 +354,15 @@ bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 
 {
     bool needMore = FALSE;
 

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

+

     return needMore;
 }
 
     return needMore;
 }
 


@@ -367,31 +410,32 @@ bool wxApp::Initialized()
 
 bool wxApp::Pending()
 {
 
 bool wxApp::Pending()
 {

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

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

+    gtk_main_iteration();

 }
 
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {
 }
 
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {

-    wxNode *node = wxPendingEvents.First();
-    wxCriticalSectionLocker locker(wxPendingEventsLocker);
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);

 
     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->Data();
 
         handler->ProcessPendingEvents();
 
     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->Data();
 
         handler->ProcessPendingEvents();

-       
+

         delete node;
 
         delete node;
 

-        node = wxPendingEvents.First();
+        node = wxPendingEvents->First();

     }
 }
     }
 }

-#endif
+#endif // wxUSE_THREADS

 
 void wxApp::DeletePendingObjects()
 {
 
 void wxApp::DeletePendingObjects()
 {


@@ -411,10 +455,12 @@ void wxApp::DeletePendingObjects()
 
 wxWindow *wxApp::GetTopWindow()
 {
 
 wxWindow *wxApp::GetTopWindow()
 {

-    if (m_topWindow) return m_topWindow;
-    wxNode *node = wxTopLevelWindows.First();
-    if (!node) return (wxWindow *) NULL;
-    return (wxWindow*)node->Data();
+    if (m_topWindow)
+        return m_topWindow;
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();
+    else
+        return NULL;

 }
 
 void wxApp::SetTopWindow( wxWindow *win )
 }
 
 void wxApp::SetTopWindow( wxWindow *win )


@@ -424,12 +470,19 @@ void wxApp::SetTopWindow( wxWindow *win )
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

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

 
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
 
 
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
 

+    // 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
+

 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();


@@ -490,6 +543,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     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
+

     wxSystemSettings::Done();
 
     delete[] wxBuffer;
     wxSystemSettings::Done();
 
     delete[] wxBuffer;


@@ -500,11 +560,11 @@ 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();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }

-#endif
+#endif // Debug

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


@@ -535,7 +595,7 @@ int wxEntry( int argc, char *argv[] )
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -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();
 


@@ -544,52 +604,54 @@ 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;
 

-    char name[200];
-    strcpy( name, argv[0] );
-    strcpy( name, wxFileNameFromPath(name) );
+    wxString name(wxFileNameFromPath(argv[0]));

     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 

-    if (!wxTheApp->OnInitGui())
-        return 0;
-
-    /* Here frames insert themselves automatically
-     * into wxTopLevelWindows by getting created
-     * in OnInit(). */
+    int retValue = 0;

 
 

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

 
 

-    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }

 
 

-    int retValue = 0;
+    if ( retValue == 0 )
+    {
+        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;

 
 

-    if (wxTheApp->Initialized())
-        retValue = wxTheApp->OnRun();
+        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)) )
+        wxWindow *topWindow = wxTheApp->GetTopWindow();
+        if (topWindow)

         {
         {

-            topWindow->Close( TRUE );
-            wxTheApp->DeletePendingObjects();
+            // 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 );
+            }

         }
         }

-        else
-        {
-            delete topWindow;
-            wxTheApp->SetTopWindow( (wxWindow*) NULL );
-        }
-    }

 
 

-    wxTheApp->OnExit();
+        wxTheApp->OnExit();
+    }

 
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
 
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();