initial attempts to get raw bitmaps working under Mac

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index b5045c14bb29d3d53993d86e782feddf8e17a27d..1bf855421b6b23cfeb3d90ea707a3168b2fadaa3 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -13,6 +13,7 @@
 
 #ifdef __VMS
 #include <vms_jackets.h>
 
 #ifdef __VMS
 #include <vms_jackets.h>

+#undef ConnectionNumber

 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"


@@ -24,11 +25,9 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"

-
-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
-
+#include "wx/msgdlg.h"
+#include "wx/file.h"
+#include "wx/filename.h"

 #include "wx/module.h"
 #include "wx/image.h"
 
 #include "wx/module.h"
 #include "wx/image.h"
 


@@ -42,13 +41,32 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

-#if defined(__DARWIN__)
-// FIXME: select must be used instead of poll (GD)
-#elif defined(__VMS)
-# include <poll.h>
-#else
-# include <sys/poll.h>
-#endif
+
+#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>
+#endif // HAVE_POLL/!HAVE_POLL
+

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


@@ -150,6 +168,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 

+static bool gs_WakeUpIdle = false;
+

 void wxWakeUpIdle()
 {
 #if wxUSE_THREADS
 void wxWakeUpIdle()
 {
 #if wxUSE_THREADS


@@ -157,8 +177,11 @@ void wxWakeUpIdle()
         wxMutexGuiEnter();
 #endif
 
         wxMutexGuiEnter();
 #endif
 

-    if (g_isIdle)
+    if (g_isIdle) {
+        gs_WakeUpIdle = true;

         wxapp_install_idle_handler();
         wxapp_install_idle_handler();

+        gs_WakeUpIdle = false;
+    }

 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())


@@ -212,6 +235,17 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // from some safely-looking functions
     if ( wxTheApp->IsInAssert() )
     {
     // from some safely-looking functions
     if ( wxTheApp->IsInAssert() )
     {

+        // But repaint the assertion message if necessary
+        if (wxTopLevelWindows.GetCount() > 0)
+        {
+            wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
+#ifdef __WXGTK20__
+            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
+#else
+            if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+#endif
+                win->OnInternalIdle();
+        }

         return TRUE;
     }
 #endif // __WXDEBUG__
         return TRUE;
     }
 #endif // __WXDEBUG__


@@ -241,22 +275,82 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 #if wxUSE_THREADS
 
 
 #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;
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_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 )
+            FD_SET(ufds[i].fd, &readfds);
+
+        if ( ufds[i].events & G_IO_PRI )
+            FD_SET(ufds[i].fd, &exceptfds);
+
+        if ( ufds[i].events & G_IO_OUT )
+            FD_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 ( FD_ISSET(ufds[i].fd, &readfds ) )
+            ufds[i].revents |= G_IO_IN;
+
+        if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+            ufds[i].revents |= G_IO_PRI;
+
+        if ( FD_ISSET(ufds[i].fd, &writefds ) )
+            ufds[i].revents |= G_IO_OUT;
+    }
+
+    return res;
+}
+
+#endif // HAVE_POLL/!HAVE_POLL
+

 static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 {
 static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 {

-    gint res;

     gdk_threads_enter();
 
     wxMutexGuiLeave();
     g_mainThreadLocked = TRUE;
 
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     g_mainThreadLocked = TRUE;
 

-#ifdef __DARWIN__
-    // FIXME: poll is not available under Darwin/Mac OS X and this needs
-    //        to be implemented using select instead (GD)
-    //        what about other BSD derived systems?
-    res = -1;
-#else
-    res = poll( (struct pollfd*) ufds, nfds, timeout );
-#endif
+    // 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 );

 
     wxMutexGuiEnter();
     g_mainThreadLocked = FALSE;
 
     wxMutexGuiEnter();
     g_mainThreadLocked = FALSE;


@@ -272,6 +366,11 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 
 void wxapp_install_idle_handler()
 {
 
 void wxapp_install_idle_handler()
 {

+    // 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?
+    // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") );
+

     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
     g_isIdle = FALSE;
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
     g_isIdle = FALSE;


@@ -454,6 +553,16 @@ GdkVisual *wxApp::GetGdkVisual()
 
 bool wxApp::ProcessIdle()
 {
 
 bool wxApp::ProcessIdle()
 {

+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+    node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        CallInternalIdle( win );
+
+        node = node->GetNext();
+    }
+

     wxIdleEvent event;
     event.SetEventObject( this );
     ProcessEvent( event );
     wxIdleEvent event;
     event.SetEventObject( this );
     ProcessEvent( event );


@@ -501,14 +610,6 @@ bool wxApp::SendIdleEvents()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        CallInternalIdle( win );
-
-        node = node->GetNext();
-    }

     return needMore;
 }
 
     return needMore;
 }
 


@@ -516,13 +617,13 @@ bool wxApp::CallInternalIdle( wxWindow* win )
 {
     win->OnInternalIdle();
 
 {
     win->OnInternalIdle();
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowList::Node  *node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

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

 
 

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

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -540,14 +641,14 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowList::Node  *node = win->GetChildren().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;


@@ -582,17 +683,17 @@ void wxApp::Dispatch()
 
 void wxApp::DeletePendingObjects()
 {
 
 void wxApp::DeletePendingObjects()
 {

-    wxNode *node = wxPendingDelete.First();
+    wxNode *node = wxPendingDelete.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxObject *obj = (wxObject *)node->Data();
+        wxObject *obj = (wxObject *)node->GetData();

 
         delete obj;
 
         if (wxPendingDelete.Find(obj))
             delete node;
 
 
         delete obj;
 
         if (wxPendingDelete.Find(obj))
             delete node;
 

-        node = wxPendingDelete.First();
+        node = wxPendingDelete.GetFirst();

     }
 }
 
     }
 }
 


@@ -600,10 +701,6 @@ bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();
 
 {
     wxClassInfo::InitializeClasses();
 

-#if wxUSE_INTL
-    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-

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


@@ -617,12 +714,13 @@ bool wxApp::Initialize()
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
     wxInitializeStockLists();
     wxInitializeStockObjects();
 

-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-

     wxModule::RegisterModules();
     wxModule::RegisterModules();

-    if (!wxModule::InitializeModules()) return FALSE;
+    if (!wxModule::InitializeModules())
+        return FALSE;
+
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -631,10 +729,6 @@ void wxApp::CleanUp()
 {
     wxModule::CleanUpModules();
 
 {
     wxModule::CleanUpModules();
 

-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-

     delete wxTheColourDatabase;
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 


@@ -649,7 +743,9 @@ void wxApp::CleanUp()
 
 #if wxUSE_THREADS
     delete wxPendingEvents;
 
 #if wxUSE_THREADS
     delete wxPendingEvents;

+    wxPendingEvents = NULL;

     delete wxPendingEventsLocker;
     delete wxPendingEventsLocker;

+    wxPendingEventsLocker = NULL;

 #endif
 
     // check for memory leaks
 #endif
 
     // check for memory leaks


@@ -707,10 +803,11 @@ int wxEntryStart( int& argc, char *argv[] )
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif
 
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif
 

-    gdk_threads_enter();
-

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

+    /* we can not enter threads before gtk_init is done */
+    gdk_threads_enter();
+

     wxSetDetectableAutoRepeat( TRUE );
 
     if (!wxApp::Initialize())
     wxSetDetectableAutoRepeat( TRUE );
 
     if (!wxApp::Initialize())


@@ -801,9 +898,11 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->argv = argv;
 #endif
 
     wxTheApp->argv = argv;
 #endif
 

-    wxString name(wxFileNameFromPath(argv[0]));
-    wxStripExtension( name );
-    wxTheApp->SetAppName( name );
+    if (wxTheApp->argc > 0)
+    {
+        wxFileName fname( wxTheApp->argv[0] );
+        wxTheApp->SetAppName( fname.GetName() );
+    }

 
     int retValue;
     retValue = wxEntryInitGui();
 
     int retValue;
     retValue = wxEntryInitGui();