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;
+extern bool g_isIdle;
unsigned char g_palette[64*3] =
{
gtk_main_quit();
}
-// forward decl
+/* 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)
+ /* 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() )
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();
+
+ /* 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;
+}
- // We need to temporarily remove idle callbacks or the loop will
- // never finish.
+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 );
+ 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 );
+
+ 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;
}
+#endif
//-----------------------------------------------------------------------------
// wxApp
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;
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()
{
- 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);
}
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++)
int gg = (g << 3) | (g >> 2);
int bb = (b << 3) | (b >> 2);
- GdkColor *colors = cmap->colors;
- int max = 3 * (65536);
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;
}
}
}
-
return TRUE;
}
DeletePendingObjects();
/* flush the logged messages if any */
+#if wxUSE_LOG
wxLog *log = wxLog::GetActiveTarget();
if (log != NULL && log->HasPendingMessages())
log->Flush();
+#endif // wxUSE_LOG
/* Send OnIdle events to all windows */
bool needMore = SendIdleEvents();
bool wxApp::Pending()
{
- return gtk_events_pending();
+ return (gtk_events_pending() > 0);
}
void wxApp::Dispatch()
delete obj;
- if (wxPendingDelete.Member(obj))
- delete node;
+ if (wxPendingDelete.Find(obj))
+ delete node;
node = wxPendingDelete.First();
}
bool wxApp::Initialize()
{
- wxBuffer = new char[BUFSIZ + 512];
+ wxBuffer = new wxChar[BUFSIZ + 512];
wxClassInfo::InitializeClasses();
#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
+#if wxUSE_LOG
// do this as the very last thing because everything else can log messages
wxLog::DontCreateOnDemand();
{
return new wxLogGui;
}
+#endif // wxUSE_LOG
//-----------------------------------------------------------------------------
// wxEntry
gtk_init( &argc, &argv );
+ wxSetDetectableAutoRepeat( TRUE );
+
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();
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;
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().
- 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())
wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
if ( oldlog )
delete oldlog;
+#endif // wxUSE_LOG
wxApp::CleanUp();
projects / wxWidgets.git / blobdiff