/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
- #pragma implementation "appbase.h"
#pragma implementation "app.h"
#endif
#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"
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif
-extern wxResourceCache *wxTheResourceCache;
extern bool g_isIdle;
-unsigned char g_palette[64*3] =
-{
- 0x0, 0x0, 0x0,
- 0xff, 0xff, 0xff,
- 0xff, 0x0, 0x0,
- 0xff, 0xff, 0x0,
- 0x0, 0xff, 0x0,
- 0x0, 0x0, 0xff,
- 0x0, 0xff, 0xff,
- 0x99, 0x99, 0x99,
- 0xff, 0x88, 0x0,
- 0x88, 0x0, 0x0,
- 0x0, 0x88, 0x88,
- 0x88, 0x88, 0x0,
- 0xff, 0xcc, 0x97,
- 0xbb, 0xbb, 0xbb,
- 0x9f, 0x6b, 0x42,
- 0x55, 0x55, 0x55,
- 0xdd, 0xdd, 0xdd,
- 0x77, 0x77, 0x77,
- 0x33, 0x33, 0x33,
- 0xcc, 0x0, 0x0,
- 0xff, 0x44, 0x0,
- 0xff, 0xcc, 0x0,
- 0xcc, 0xcc, 0x0,
- 0x60, 0x60, 0x0,
- 0x0, 0x43, 0x0,
- 0x0, 0x7f, 0x0,
- 0x0, 0xcc, 0x0,
- 0x0, 0x44, 0x44,
- 0x0, 0x0, 0x44,
- 0x0, 0x0, 0x88,
- 0xef, 0xb1, 0x7b,
- 0xdf, 0x98, 0x5f,
- 0xbf, 0x87, 0x56,
- 0x7f, 0x57, 0x26,
- 0x5f, 0x39, 0xc,
- 0x3f, 0x1c, 0x0,
- 0x21, 0x0, 0x0,
- 0x0, 0x43, 0x87,
- 0x2d, 0x70, 0xaf,
- 0x5a, 0x9e, 0xd7,
- 0x87, 0xcc, 0xff,
- 0xff, 0xe0, 0xba,
- 0x21, 0x43, 0xf,
- 0x3d, 0x5d, 0x25,
- 0x59, 0x78, 0x3a,
- 0x75, 0x93, 0x4f,
- 0x91, 0xae, 0x64,
- 0xad, 0xc8, 0x7a,
- 0xf0, 0xa8, 0xef,
- 0xd0, 0x88, 0xd0,
- 0xaf, 0x66, 0xaf,
- 0x8e, 0x44, 0x8e,
- 0x6d, 0x22, 0x6d,
- 0x4b, 0x0, 0x4b,
- 0xff, 0xc0, 0xbc,
- 0xff, 0x93, 0x91,
- 0xff, 0x66, 0x67,
- 0xd8, 0xf2, 0xbf,
- 0xff, 0xc9, 0x68,
- 0xff, 0x96, 0x67,
- 0xa5, 0x60, 0xff,
- 0x51, 0xff, 0x99,
- 0x3f, 0xa5, 0x63,
- 0x98, 0x90, 0x67
-};
+bool g_mainThreadLocked = FALSE;
//-----------------------------------------------------------------------------
// local functions
//-----------------------------------------------------------------------------
-extern void wxFlushResources(void);
+/* forward declaration */
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+void wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+#endif
//-----------------------------------------------------------------------------
-// global functions
+// wxExit
//-----------------------------------------------------------------------------
void wxExit()
gtk_main_quit();
}
-/* forward declaration */
-gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+//-----------------------------------------------------------------------------
+// wxYield
+//-----------------------------------------------------------------------------
bool wxYield()
{
bool has_idle = (wxTheApp->m_idleTag != 0);
-
+
if (has_idle)
{
/* We need to temporarily remove idle callbacks or the loop will
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 );
}
-
+
return TRUE;
}
-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()
{
- if (!wxTheApp) return TRUE;
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ wxMutexGuiEnter();
+#endif
+
+ if (g_isIdle)
+ wxapp_install_idle_handler();
-#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 ();
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ wxMutexGuiLeave();
#endif
+}
+
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------
+
+gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+{
+ if (!wxTheApp) return TRUE;
+
+ // 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();
/* sent idle event to all who request them */
while (wxTheApp->ProcessIdle()) { }
emptied */
g_isIdle = TRUE;
-#if (GTK_MINOR_VERSION > 0)
- /* release lock again */
- GDK_THREADS_LEAVE ();
-#endif
+ // release lock again
+ gdk_threads_leave();
return TRUE;
}
void wxapp_install_idle_handler()
{
- wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
+ wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
- /* this routine gets called by all event handlers
- indicating that the idle is over. */
+ /* 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). */
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
#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 );
+
+ wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, 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) )
+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
+ gdk_threads_enter();
+
+ wxapp_uninstall_thread_wakeup();
// unblock other threads wishing to do some GUI things
wxMutexGuiLeave();
+
+ g_mainThreadLocked = TRUE;
// wake up other threads
wxUsleep( 1 );
// block other thread again
wxMutexGuiEnter();
-#if (GTK_MINOR_VERSION > 0)
- // release lock again
- GDK_THREADS_LEAVE ();
-#endif
+ g_mainThreadLocked = FALSE;
wxapp_install_thread_wakeup();
+ // release lock again
+ gdk_threads_leave();
+
return TRUE;
}
-#endif
+
+#endif // wxUSE_THREADS
//-----------------------------------------------------------------------------
// wxApp
/* 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
- in the GNOME libraries. it ensures that all GNOME applications
- 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... */
-
- /*
- GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
-
- for (int i = 0; i < 64; i++)
- {
- GdkColor col;
- col.red = g_palette[i*3 + 0] << 8;
- col.green = g_palette[i*3 + 1] << 8;
- col.blue = g_palette[i*3 + 2] << 8;
- col.pixel = 0;
-
- gdk_color_alloc( cmap, &col );
- }
-
- gtk_widget_set_default_colormap( cmap );
- */
-
/* initialize color cube for 8-bit color reduction dithering */
GdkColormap *cmap = gtk_widget_get_default_colormap();
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") );
+ wxFAIL_MSG( wxT("Unsupported graphics hardware") );
#endif
}
m_colorCube[ (r*1024) + (g*32) + b ] = index;
s_inOnIdle = TRUE;
-#if wxUSE_THREADS
/* Resend in the main thread events which have been prepared in other
threads */
ProcessPendingEvents();
-#endif
/* 'Garbage' collection of windows deleted with Close(). */
DeletePendingObjects();
win->ProcessEvent(event);
win->OnInternalIdle();
-
+
if (event.MoreRequested())
needMore = TRUE;
void wxApp::ExitMainLoop()
{
- gtk_main_quit();
+ if (gtk_main_level() > 0)
+ gtk_main_quit();
}
bool wxApp::Initialized()
gtk_main_iteration();
}
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
- wxNode *node = wxPendingEvents->First();
- wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
- while (node)
- {
- wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
- handler->ProcessPendingEvents();
-
- delete node;
-
- node = wxPendingEvents->First();
- }
-}
-#endif // wxUSE_THREADS
-
void wxApp::DeletePendingObjects()
{
wxNode *node = wxPendingDelete.First();
wxPendingEventsLocker = new wxCriticalSection();
#endif
-/*
- wxTheFontNameDirectory = new wxFontNameDirectory;
- wxTheFontNameDirectory->Initialize();
-*/
-
wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
wxTheColourDatabase->Initialize();
wxInitializeStockObjects();
#if wxUSE_WX_RESOURCES
- wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
-
wxInitializeResourceSystem();
#endif
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
- wxFlushResources();
-
- if (wxTheResourceCache)
- delete wxTheResourceCache;
- wxTheResourceCache = (wxResourceCache*) NULL;
-
wxCleanUpResourceSystem();
#endif
if (wxTheColourDatabase)
delete wxTheColourDatabase;
+
wxTheColourDatabase = (wxColourDatabase*) NULL;
-/*
- if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
- wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-*/
-
wxDeleteStockObjects();
wxDeleteStockLists();
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft() > 0)
{
- wxLogDebug(_T("There were memory leaks.\n"));
+ wxLogDebug(wxT("There were memory leaks.\n"));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
if (oldLog)
delete oldLog;
-}
-
#endif // wxUSE_LOG
+}
//-----------------------------------------------------------------------------
// wxEntry
int wxEntry( int argc, char *argv[] )
{
+#if wxUSE_THREADS
+ /* GTK 1.2 up to version 1.2.3 has broken threads */
+ if ((gtk_major_version == 1) &&
+ (gtk_minor_version == 2) &&
+ (gtk_micro_version < 4))
+ {
+ printf( "wxWindows warning: Disabled GUI threading due to outdated GTK version\n" );
+ }
+ else
+ {
+ g_thread_init(NULL);
+ }
+#endif
+
gtk_set_locale();
#if wxUSE_WCHAR_T
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif
+ gdk_threads_enter();
+
gtk_init( &argc, &argv );
wxSetDetectableAutoRepeat( TRUE );
if (!wxApp::Initialize())
+ {
+ gdk_threads_leave();
return -1;
+ }
if (!wxTheApp)
{
wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
- _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
+ wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxTheApp = (wxApp*) test_app;
}
- wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
+ wxCHECK_MSG( wxTheApp, -1, wxT("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++;
+ while (mb_argc < argc)
+ {
+ wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+ mb_argc++;
}
wxTheApp->argv[mb_argc] = (wxChar *)NULL;
#else
wxApp::CleanUp();
+ gdk_threads_leave();
+
return retValue;
}
return wxIcon(warning_xpm);
default:
- wxFAIL_MSG(_T("requested non existent standard icon"));
+ wxFAIL_MSG(wxT("requested non existent standard icon"));
// still fall through
case wxICON_HAND: