#pragma implementation "app.h"
#endif
+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+
#include "wx/app.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
#endif
#include <unistd.h>
+#ifdef __VMS
+# include <poll.h>
+#else
+# include <sys/poll.h>
+#endif
#include "wx/gtk/win_gtk.h"
#include <gtk/gtk.h>
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-extern bool g_isIdle;
-
bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
-// local functions
+// idle system
//-----------------------------------------------------------------------------
-extern "C"
-{
- gint wxapp_idle_callback( gpointer WXUNUSED(data) );
- gint wxapp_pending_callback( gpointer WXUNUSED(data) );
-}
+extern bool g_isIdle;
-void wxapp_install_thread_wakeup();
-void wxapp_uninstall_thread_wakeup();
void wxapp_install_idle_handler();
//-----------------------------------------------------------------------------
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 ( ProcessIdle() )
- {
- }
+ // 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). But we
+ // call ProcessIdle() only once since this is not meant for longish
+ // background jobs (controlled by wxIdleEvent::RequestMore() and the
+ // return value of Processidle().
+ ProcessIdle();
// let the logs be flashed again
wxLog::Resume();
// local functions
//-----------------------------------------------------------------------------
-void wxapp_install_idle_handler()
-{
- wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
-
- g_isIdle = FALSE;
-
- if (g_pendingTag == 0)
- g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
-
- /* 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). Very low priority. */
-
- wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
-}
-
// the callback functions must be extern "C" to comply with GTK+ declarations
extern "C"
{
-gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
{
if (!wxTheApp) return TRUE;
- // when getting called from GDK's time-out handler
+ // 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
+ // thread so we must lock it here ourselves.
gdk_threads_enter();
- // Sent idle event to all who request them
+ // Sent idle event to all who request them.
wxTheApp->ProcessPendingEvents();
g_pendingTag = 0;
- /* flush the logged messages if any */
+ // Flush the logged messages if any.
#if wxUSE_LOG
wxLog::FlushActive();
#endif // wxUSE_LOG
return FALSE;
}
-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
if (!wxTheApp)
return TRUE;
}
#endif // __WXDEBUG__
- // when getting called from GDK's time-out handler
+ // 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
+ // thread so we must lock it here ourselves.
gdk_threads_enter();
- /* 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 */
+ // Indicate that we are now in idle mode and event handlers
+ // will have to reinstall the idle handler again.
g_isIdle = TRUE;
wxTheApp->m_idleTag = 0;
- // Sent idle event to all who request them as long as they do
- while (wxTheApp->ProcessIdle())
+ // Send idle event to all who request them as long as
+ // no events have popped up in the event queue.
+ while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0))
;
// Release lock again
gdk_threads_leave();
// Return FALSE to indicate that no more idle events are
- // to be sent (single shot instead of continuous stream)
+ // to be sent (single shot instead of continuous stream).
return FALSE;
}
#if wxUSE_THREADS
-gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
{
- // 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
+ gint res;
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 );
+ res = poll( (struct pollfd*) ufds, nfds, timeout );
- // block other thread again
wxMutexGuiEnter();
-
g_mainThreadLocked = FALSE;
- wxapp_install_thread_wakeup();
-
- // release lock again
gdk_threads_leave();
- return TRUE;
+ return res;
}
#endif // wxUSE_THREADS
} // extern "C"
-#if wxUSE_THREADS
-
-static int g_threadUninstallLevel = 0;
-
-void wxapp_install_thread_wakeup()
-{
- g_threadUninstallLevel++;
-
- if (g_threadUninstallLevel != 1) return;
-
- if (wxTheApp->m_wakeUpTimerTag) return;
-
- wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL );
-}
-
-void wxapp_uninstall_thread_wakeup()
+void wxapp_install_idle_handler()
{
- g_threadUninstallLevel--;
+ wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
- if (g_threadUninstallLevel != 0) return;
+ g_isIdle = FALSE;
- if (!wxTheApp->m_wakeUpTimerTag) return;
+ if (g_pendingTag == 0)
+ g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
- gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
- wxTheApp->m_wakeUpTimerTag = 0;
+ // 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). Very low priority.
+ wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
}
-#endif // wxUSE_THREADS
-
//-----------------------------------------------------------------------------
// Access to the root window global
//-----------------------------------------------------------------------------
wxapp_install_idle_handler();
#if wxUSE_THREADS
- m_wakeUpTimerTag = 0;
- wxapp_install_thread_wakeup();
+ g_main_set_poll_func( wxapp_poll_func );
#endif
m_colorCube = (unsigned char*) NULL;
{
if (m_idleTag) gtk_idle_remove( m_idleTag );
-#if wxUSE_THREADS
- wxapp_uninstall_thread_wakeup();
-#endif
-
if (m_colorCube) free(m_colorCube);
}
GdkVisual *visual = NULL;
if (m_glVisualInfo)
- visual = gdkx_visual_get( ((XVisualInfo *) wxTheApp->m_glVisualInfo)->visualid );
+ visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
else
visual = gdk_window_get_visual( wxGetRootWindow()->window );
{
static bool s_inOnIdle = FALSE;
- /* Avoid recursion (via ProcessEvent default case) */
+ // Avoid recursion (via ProcessEvent default case)
if (s_inOnIdle)
return;
s_inOnIdle = TRUE;
- /* Resend in the main thread events which have been prepared in other
- threads */
+ // Resend in the main thread events which have been prepared in other
+ // threads
ProcessPendingEvents();
- /* 'Garbage' collection of windows deleted with Close(). */
+ // 'Garbage' collection of windows deleted with Close()
DeletePendingObjects();
- /* Send OnIdle events to all windows */
+ // Send OnIdle events to all windows
bool needMore = SendIdleEvents();
if (needMore)
win->GetEventHandler()->ProcessEvent(event);
- win->OnInternalIdle();
-
if (event.MoreRequested())
needMore = TRUE;
node = node->Next();
}
- return needMore ;
+
+ win->OnInternalIdle();
+
+ return needMore;
}
int wxApp::MainLoop()
bool wxApp::Initialize()
{
- wxBuffer = new wxChar[BUFSIZ + 512];
-
wxClassInfo::InitializeClasses();
#if wxUSE_INTL
wxCleanUpResourceSystem();
#endif
- if (wxTheColourDatabase)
- delete wxTheColourDatabase;
-
+ delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL;
wxDeleteStockObjects();
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.
+ wxClassInfo::CleanUpClasses();
+
#if wxUSE_THREADS
delete wxPendingEvents;
delete wxPendingEventsLocker;
#endif
- delete[] wxBuffer;
-
- wxClassInfo::CleanUpClasses();
-
// check for memory leaks
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
return retValue;
}
-#ifndef __WXUNIVERSAL__
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/gtk/info.xpm"
-#include "wx/gtk/error.xpm"
-#include "wx/gtk/question.xpm"
-#include "wx/gtk/warning.xpm"
-
-#undef static
-
-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(wxT("requested non existent standard icon"));
- // still fall through
-
- case wxICON_HAND:
- return wxIcon(error_xpm);
- }
-}
-#else
-wxIcon wxApp::GetStdIcon(int which) const
-{
- return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
-}
-#endif // !__WXUNIVERSAL__
-
-
#ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
projects / wxWidgets.git / blobdiff