X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..e70f5e1301456e02668807d3795a5f2912c2ea86:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index ea8b118df7..d3323035ce 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -8,7 +8,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "appbase.h" + #pragma implementation "app.h" #endif #include "wx/app.h" @@ -19,19 +20,25 @@ #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#ifdef wxUSE_WX_RESOURCES -#include "wx/resource.h" +#include "wx/dialog.h" + +#if wxUSE_WX_RESOURCES + #include "wx/resource.h" #endif + #include "wx/module.h" #include "wx/image.h" -#ifdef wxUSE_THREADS + +#if wxUSE_THREADS #include "wx/thread.h" #endif + #include "unistd.h" #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -39,10 +46,14 @@ //----------------------------------------------------------------------------- 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] = { @@ -122,70 +133,282 @@ extern void wxFlushResources(void); // global functions //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { gtk_main_quit(); } -bool wxYield(void) +/* forward declaration */ +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + +bool wxYield() { - while (gtk_events_pending() > 0) gtk_main_iteration(); + bool has_idle = (wxTheApp->m_idleTag != 0); + + if (has_idle) + { + /* 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(); + + /* 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; + +#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 -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + /* sent idle event to all who request them */ + while (wxTheApp->ProcessIdle()) { } -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() + /* 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; -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) + /* 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()) {} -#ifdef wxUSE_THREADS - wxMutexGuiLeave(); + 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 + +/* 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 - usleep(10000); -#ifdef wxUSE_THREADS + + // 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 + + wxapp_install_thread_wakeup(); + return TRUE; } +#endif + +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() wxApp::wxApp() { - m_idleTag = 0; + wxTheApp = this; + m_topWindow = (wxWindow *) NULL; m_exitOnFrameDelete = TRUE; - wxTheApp = this; -} -wxApp::~wxApp(void) -{ - gtk_idle_remove( m_idleTag ); -} + m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); -bool wxApp::OnInit(void) -{ - return TRUE; +#if wxUSE_THREADS + m_wakeUpTimerTag = 0; + wxapp_install_thread_wakeup(); +#endif + + m_colorCube = (unsigned char*) NULL; } -bool wxApp::OnInitGui(void) +wxApp::~wxApp() { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; + if (m_idleTag) gtk_idle_remove( m_idleTag ); + +#if wxUSE_THREADS + wxapp_uninstall_thread_wakeup(); +#endif + + if (m_colorCube) free(m_colorCube); } -int wxApp::OnRun(void) +bool wxApp::OnInitGui() { - return MainLoop(); + 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 + 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(); + + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); + + for (int r = 0; r < 32; r++) + { + for (int g = 0; g < 32; g++) + { + for (int b = 0; b < 32; b++) + { + int rr = (r << 3) | (r >> 2); + int gg = (g << 3) | (g >> 2); + int bb = (b << 3) | (b >> 2); + + int index = -1; + + GdkColor *colors = cmap->colors; + if (colors) + { + 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( _T("Unsupported graphics hardware") ); +#endif + } + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } + } + + return TRUE; } -bool wxApp::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject( this ); @@ -196,21 +419,29 @@ bool wxApp::ProcessIdle(void) 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(); @@ -218,21 +449,22 @@ void wxApp::OnIdle( wxIdleEvent &event ) if (needMore) event.RequestMore(TRUE); - inOnIdle = FALSE; + s_inOnIdle = FALSE; } -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } + return needMore; } @@ -242,8 +474,11 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); + win->ProcessEvent(event); + win->OnInternalIdle(); + if (event.MoreRequested()) needMore = TRUE; @@ -259,37 +494,52 @@ bool wxApp::SendIdleEvents( wxWindow* win ) return needMore ; } -int wxApp::OnExit(void) -{ - return 0; -} - -int wxApp::MainLoop(void) +int wxApp::MainLoop() { gtk_main(); return 0; } -void wxApp::ExitMainLoop(void) +void wxApp::ExitMainLoop() { gtk_main_quit(); } -bool wxApp::Initialized(void) +bool wxApp::Initialized() { return m_initialized; } -bool wxApp::Pending(void) +bool wxApp::Pending() { - return FALSE; + return (gtk_events_pending() > 0); } -void wxApp::Dispatch(void) +void wxApp::Dispatch() { + gtk_main_iteration(); } -void wxApp::DeletePendingObjects(void) +#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(); while (node) @@ -298,100 +548,140 @@ void wxApp::DeletePendingObjects(void) delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } } -wxWindow *wxApp::GetTopWindow(void) +bool wxApp::Initialize() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); -} + wxBuffer = new wxChar[BUFSIZ + 512]; -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; -} + wxClassInfo::InitializeClasses(); -void wxApp::CommonInit(void) -{ + wxSystemSettings::Init(); -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + // 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 + wxPendingEvents = new wxList(); + wxPendingEventsLocker = new wxCriticalSection(); #endif + +/* + wxTheFontNameDirectory = new wxFontNameDirectory; + wxTheFontNameDirectory->Initialize(); */ - wxSystemSettings::Init(); - - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); - wxInitializeStockLists(); - wxInitializeStockObjects(); +#if wxUSE_WX_RESOURCES + wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); -#ifdef wxUSE_WX_RESOURCES - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - - wxInitializeResourceSystem(); + wxInitializeResourceSystem(); #endif - wxImage::InitStandardHandlers(); + wxImage::InitStandardHandlers(); + + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; -// g_globalCursor = new wxCursor; + return TRUE; } -void wxApp::CommonCleanUp(void) +void wxApp::CleanUp() { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); + wxModule::CleanUpModules(); -#ifdef wxUSE_WX_RESOURCES +#if wxUSE_WX_RESOURCES wxFlushResources(); - wxDELETE(wxTheResourceCache); - + 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(); wxImage::CleanUpHandlers(); + 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. +#if wxUSE_THREADS + delete wxPendingEvents; + delete wxPendingEventsLocker; +#endif + wxSystemSettings::Done(); -} -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; + delete[] wxBuffer; + + wxClassInfo::CleanUpClasses(); + + // check for memory leaks +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + if (wxDebugContext::CountObjectsLeft() > 0) + { + 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(); + + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); + if (oldLog) + delete oldLog; } +#endif // wxUSE_LOG + //----------------------------------------------------------------------------- // wxEntry //----------------------------------------------------------------------------- int wxEntry( int argc, char *argv[] ) { - wxBuffer = new char[BUFSIZ + 512]; + gtk_set_locale(); - wxClassInfo::InitializeClasses(); + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; + gtk_init( &argc, &argv ); + + wxSetDetectableAutoRepeat( TRUE ); + + if (!wxApp::Initialize()) + return -1; if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - } + wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, + _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -400,92 +690,114 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - } + wxCHECK_MSG( wxTheApp, -1, _T("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 - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); + wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); wxTheApp->SetAppName( name ); - gtk_set_locale(); - - gtk_init( &argc, &argv ); + int retValue = 0; - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + if ( !wxTheApp->OnInitGui() ) + retValue = -1; - for (int i = 0; i < 64; i++) + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) { - 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 ); + if ( !wxTheApp->OnInit() ) + retValue = -1; } - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); - - wxApp::CommonInit(); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - wxTheApp->OnInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - if (!wxTheApp->OnInit()) return 0; + 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.Number() > 0); + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - int retValue = 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(); + } + } - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); +#if wxUSE_LOG + // flush the logged messages if any + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - wxTheApp->DeletePendingObjects(); + // continuing to use user defined log target is unsafe from now on because + // some resources may be already unavailable, so replace it by something + // more safe + wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); + if ( oldlog ) + delete oldlog; +#endif // wxUSE_LOG - wxTheApp->OnExit(); + wxApp::CleanUp(); - wxModule::CleanUpModules(); + return retValue; +} - wxApp::CommonCleanUp(); +#include "wx/gtk/info.xpm" +#include "wx/gtk/error.xpm" +#include "wx/gtk/question.xpm" +#include "wx/gtk/warning.xpm" - delete wxTheApp; - wxTheApp = (wxApp*) NULL; +wxIcon +wxApp::GetStdIcon(int which) const +{ + switch(which) + { + case wxICON_INFORMATION: + return wxIcon(info_xpm); - wxClassInfo::CleanUpClasses(); + case wxICON_QUESTION: + return wxIcon(question_xpm); - delete[] wxBuffer; + case wxICON_EXCLAMATION: + return wxIcon(warning_xpm); -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + default: + wxFAIL_MSG(_T("requested non existent standard icon")); + // still fall through - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + case wxICON_HAND: + return wxIcon(error_xpm); } - -#endif - - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); - if (oldLog) delete oldLog; - - return retValue; } - -//----------------------------------------------------------------------------- -