X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0151c3eb43458ff479c33108a6916670c4f68cd2..a3e7d24d21f5371c88caffe4a85c8e4a5362db3f:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index e3bb20d00d..b307cdd8e3 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -28,13 +28,15 @@ #include "wx/module.h" #include "wx/image.h" +#if wxUSE_THREADS #include "wx/thread.h" +#endif #include "unistd.h" -#include -#include -#include +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" @@ -43,14 +45,10 @@ //----------------------------------------------------------------------------- wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::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] = { @@ -124,7 +122,7 @@ unsigned char g_palette[64*3] = // local functions //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +extern void wxFlushResources(); //----------------------------------------------------------------------------- // global functions @@ -135,59 +133,146 @@ void wxExit() 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) - for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) + bool has_idle = (wxTheApp->m_idleTag != 0); + + if (has_idle) { - wxWindow *win = node->GetData(); - win->OnInternalIdle(); + /* 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 ); - while (gtk_events_pending()) gtk_main_iteration(); - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + /* 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 ); + } + return TRUE; } -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- +gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +{ + if (!wxTheApp) return TRUE; -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +#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 -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() + /* sent idle event to all who request them */ + while (wxTheApp->ProcessIdle()) { } -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) + /* 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 + + return TRUE; +} + +void wxapp_install_idle_handler() { - if (wxTheApp) - { - while (wxTheApp->ProcessIdle()) - { - } - } + 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. */ + + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + + 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(); - wxUsleep(10); + + // 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 // wxUSE_THREADS + +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() + wxApp::wxApp() { wxTheApp = this; @@ -197,21 +282,46 @@ wxApp::wxApp() 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; } wxApp::~wxApp() { - 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() { - /* Nothing to do for 15, 16, 24, 32 bit displays */ - 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 @@ -244,8 +354,8 @@ bool wxApp::OnInitGui() 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++) @@ -254,25 +364,43 @@ bool wxApp::OnInitGui() 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 + { +#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( wxT("Unsupported graphics hardware") ); +#endif } - m_colorCube[ (r*1024) + (g*32) + b ] = index; } } } - return TRUE; } @@ -287,27 +415,27 @@ bool wxApp::ProcessIdle() void wxApp::OnIdle( wxIdleEvent &event ) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; /* Avoid recursion (via ProcessEvent default case) */ - if (inOnIdle) + if (s_inOnIdle) return; - inOnIdle = TRUE; + 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(); /* 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(); @@ -315,7 +443,7 @@ void wxApp::OnIdle( wxIdleEvent &event ) if (needMore) event.RequestMore(TRUE); - inOnIdle = FALSE; + s_inOnIdle = FALSE; } bool wxApp::SendIdleEvents() @@ -341,10 +469,10 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); - win->OnInternalIdle(); - win->ProcessEvent(event); + win->OnInternalIdle(); + if (event.MoreRequested()) needMore = TRUE; @@ -378,7 +506,7 @@ bool wxApp::Initialized() bool wxApp::Pending() { - return gtk_events_pending(); + return (gtk_events_pending() > 0); } void wxApp::Dispatch() @@ -386,25 +514,6 @@ void wxApp::Dispatch() 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(); @@ -414,28 +523,13 @@ void wxApp::DeletePendingObjects() delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } } -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]; @@ -468,11 +562,6 @@ bool wxApp::Initialize() wxInitializeResourceSystem(); #endif - wxImage::InitStandardHandlers(); - - /* no global cursor under X - g_globalCursor = new wxCursor; */ - wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; @@ -506,8 +595,6 @@ void wxApp::CleanUp() wxDeleteStockLists(); - wxImage::CleanUpHandlers(); - delete wxTheApp; wxTheApp = (wxApp*) NULL; @@ -528,23 +615,20 @@ void wxApp::CleanUp() #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(); } #endif // Debug +#if wxUSE_LOG // do this as the very last thing because everything else can log messages wxLog::DontCreateOnDemand(); wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); if (oldLog) delete oldLog; -} - -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; +#endif // wxUSE_LOG } //----------------------------------------------------------------------------- @@ -555,15 +639,23 @@ int wxEntry( int argc, char *argv[] ) { gtk_set_locale(); +#if wxUSE_WCHAR_T + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#else + if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; +#endif + gtk_init( &argc, &argv ); + wxSetDetectableAutoRepeat( TRUE ); + if (!wxApp::Initialize()) 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(); @@ -572,10 +664,20 @@ int wxEntry( int argc, char *argv[] ) 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++; + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else wxTheApp->argv = argv; +#endif wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); @@ -596,31 +698,38 @@ int wxEntry( int argc, char *argv[] ) 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()) + { 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()) @@ -632,9 +741,37 @@ int wxEntry( int argc, char *argv[] ) wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); if ( oldlog ) delete oldlog; +#endif // wxUSE_LOG 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(wxT("requested non existent standard icon")); + // still fall through + + case wxICON_HAND: + return wxIcon(error_xpm); + } +}