Factorize timercmm.cpp code

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c35b4af51d464f6860aba32b88ebb98a7476b902..2bce90acabca0f6ec08a260fd35b0ad3aceb286b 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

+    #pragma implementation "appbase.h"

     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 


@@ -28,13 +29,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"
 


@@ -43,7 +46,7 @@
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;
 
 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;


@@ -140,35 +143,29 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) );
 
 bool wxYield()
 {
 
 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 ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        win->OnInternalIdle();
-    }
-
-    if (wxTheApp->m_idleTag)
+    bool has_idle = (wxTheApp->m_idleTag != 0);
+    
+    if (has_idle)

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

 
 

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

         /* re-add idle handler */
         wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     }
         /* 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;
 }


@@ -177,9 +174,16 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
     
 {
     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()) { }
     /* 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 );
     /* we don't want any more idle events until the next event is
        sent to wxGTK */
     gtk_idle_remove( wxTheApp->m_idleTag );


@@ -191,26 +195,78 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
        once each time after the event queue has been completely
        emptied */
     g_isIdle = TRUE;
        once each time after the event queue has been completely
        emptied */
     g_isIdle = TRUE;

-    
-    /* wake up other threads */

 
 

-    wxMutexGuiLeave();
-    wxUsleep(0);
-    wxMutexGuiEnter();
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif

 
     return TRUE;
 }
 
 void wxapp_install_idle_handler()
 {
 
     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 );
     /* 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;
 }
 
     g_isIdle = FALSE;
 }
 

+#if wxUSE_THREADS
+
+/* forward declaration */
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+
+void wxapp_install_thread_wakeup()
+{
+    if (wxTheApp->m_wakeUpTimerTag) return;
+    
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+}
+
+void wxapp_uninstall_thread_wakeup()
+{
+    if (!wxTheApp->m_wakeUpTimerTag) return;
+    
+    gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
+    wxTheApp->m_wakeUpTimerTag = 0;
+}
+
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+    wxapp_uninstall_thread_wakeup();
+
+#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
+
+    wxapp_install_thread_wakeup();
+
+    return TRUE;
+}
+#endif
+

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


@@ -230,6 +286,11 @@ wxApp::wxApp()
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 

+#if wxUSE_THREADS
+    m_wakeUpTimerTag = 0;
+    wxapp_install_thread_wakeup();
+#endif
+

     m_colorCube = (unsigned char*) NULL;
 }
 
     m_colorCube = (unsigned char*) NULL;
 }
 


@@ -237,14 +298,34 @@ wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 

+#if wxUSE_THREADS
+    wxapp_uninstall_thread_wakeup();
+#endif
+

     if (m_colorCube) free(m_colorCube);
 }
 
 bool wxApp::OnInitGui()
 {
     if (m_colorCube) free(m_colorCube);
 }
 
 bool wxApp::OnInitGui()
 {

-    /* Nothing to do for 15, 16, 24, 32 bit displays */
-

     GdkVisual *visual = gdk_visual_get_system();
     GdkVisual *visual = gdk_visual_get_system();

+
+    /* on some machines, the default visual is just 256 colours, so
+       we make sure we get the best. this can sometimes be wasteful,
+       of course, but what do these guys pay $30.000 for? */
+/*
+    if (gdk_visual_get_best() != gdk_visual_get_system())
+    {
+        GdkVisual* vis = gdk_visual_get_best();
+        gtk_widget_set_default_visual( vis );
+
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+
+        visual = vis;
+    }
+*/
+
+    /* Nothing to do for 15, 16, 24, 32 bit displays */

     if (visual->depth > 8) return TRUE;
 
         /* this initiates the standard palette as defined by GdkImlib
     if (visual->depth > 8) return TRUE;
 
         /* this initiates the standard palette as defined by GdkImlib


@@ -290,7 +371,7 @@ bool wxApp::OnInitGui()
                 int index = -1;
 
                 GdkColor *colors = cmap->colors;
                 int index = -1;
 
                 GdkColor *colors = cmap->colors;

-                if(colors)
+                if (colors)

                 {
                     int max = 3 * 65536;
 
                 {
                     int max = 3 * 65536;
 


@@ -301,12 +382,24 @@ bool wxApp::OnInitGui()
                         int bdiff = ((bb << 8) - colors[i].blue);
                         int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
                         if (sum < max)
                         int bdiff = ((bb << 8) - colors[i].blue);
                         int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
                         if (sum < max)

-                        { 
+                        {

                             index = i; max = sum;
                         }
                     }
                 }
                             index = i; max = sum;
                         }
                     }
                 }

-
+                else
+                {
+#if (GTK_MINOR_VERSION > 0)
+                    /* 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;
+#else
+                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+#endif
+                }

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


@@ -326,13 +419,13 @@ bool wxApp::ProcessIdle()
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {

-    static bool inOnIdle = FALSE;
+    static bool s_inOnIdle = FALSE;

 
     /* Avoid recursion (via ProcessEvent default case) */
 
     /* Avoid recursion (via ProcessEvent default case) */

-    if (inOnIdle)
+    if (s_inOnIdle)

         return;
 
         return;
 

-    inOnIdle = TRUE;
+    s_inOnIdle = TRUE;

 
 #if wxUSE_THREADS
     /* Resend in the main thread events which have been prepared in other
 
 #if wxUSE_THREADS
     /* Resend in the main thread events which have been prepared in other


@@ -344,9 +437,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();


@@ -354,7 +449,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
     if (needMore)
         event.RequestMore(TRUE);
 
     if (needMore)
         event.RequestMore(TRUE);
 

-    inOnIdle = FALSE;
+    s_inOnIdle = FALSE;

 }
 
 bool wxApp::SendIdleEvents()
 }
 
 bool wxApp::SendIdleEvents()


@@ -380,10 +475,10 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);
 

-    win->OnInternalIdle();
-

     win->ProcessEvent(event);
 
     win->ProcessEvent(event);
 

+    win->OnInternalIdle();
+    

     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 


@@ -460,21 +555,6 @@ void wxApp::DeletePendingObjects()
     }
 }
 
     }
 }
 

-wxWindow *wxApp::GetTopWindow()
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
-    else
-        return NULL;
-}
-
-void wxApp::SetTopWindow( wxWindow *win )
-{
-    m_topWindow = win;
-}
-

 bool wxApp::Initialize()
 {
     wxBuffer = new wxChar[BUFSIZ + 512];
 bool wxApp::Initialize()
 {
     wxBuffer = new wxChar[BUFSIZ + 512];


@@ -507,11 +587,6 @@ bool wxApp::Initialize()
     wxInitializeResourceSystem();
 #endif
 
     wxInitializeResourceSystem();
 #endif
 

-    wxImage::InitStandardHandlers();
-
-    /* no global cursor under X
-       g_globalCursor = new wxCursor; */
-

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


@@ -545,8 +620,6 @@ void wxApp::CleanUp()
 
     wxDeleteStockLists();
 
 
     wxDeleteStockLists();
 

-    wxImage::CleanUpHandlers();
-

     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 


@@ -573,6 +646,7 @@ void wxApp::CleanUp()
     }
 #endif // Debug
 
     }
 #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();
 


@@ -581,10 +655,7 @@ void wxApp::CleanUp()
         delete oldLog;
 }
 
         delete oldLog;
 }
 

-wxLog *wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
+#endif // wxUSE_LOG

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


@@ -594,8 +665,16 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+#if wxUSE_WCHAR_T
+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#else
+    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif
+

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

+    wxSetDetectableAutoRepeat( TRUE );
+

     if (!wxApp::Initialize())
         return -1;
 
     if (!wxApp::Initialize())
         return -1;
 


@@ -614,7 +693,17 @@ int wxEntry( int argc, char *argv[] )
     wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
 
     wxTheApp->argc = argc;
     wxCHECK_MSG( wxTheApp, -1, _T("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) {
+      wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+      mb_argc++;
+    }
+    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else

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

+#endif

 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );
 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );


@@ -635,31 +724,38 @@ int wxEntry( int argc, char *argv[] )
 
     if ( retValue == 0 )
     {
 
     if ( retValue == 0 )
     {

+        /* 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())
         wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
         if (wxTheApp->Initialized())

+        {

             retValue = wxTheApp->OnRun();
 
             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();
-            }
-            else
-            {
-                delete topWindow;
-                wxTheApp->SetTopWindow( (wxWindow*) NULL );
+                /* 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())


@@ -671,9 +767,37 @@ 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();
 
     return retValue;
 }
 
 
     wxApp::CleanUp();
 
     return retValue;
 }
 

+#include "wx/gtk/info.xpm"
+#include "wx/gtk/error.xpm"
+#include "wx/gtk/question.xpm"
+#include "wx/gtk/warning.xpm"
+
+wxIcon
+wxApp::GetStdIcon(int which) const
+{
+    switch(which)
+    {
+        case wxICON_INFORMATION:
+            return wxIcon(info_xpm);
+
+        case wxICON_QUESTION:
+            return wxIcon(question_xpm);
+
+        case wxICON_EXCLAMATION:
+            return wxIcon(warning_xpm);
+
+        default:
+            wxFAIL_MSG(_T("requested non existent standard icon"));
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon(error_xpm);
+    }
+}