X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe7b115601ec33076852d3881093138a0794a7a1..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/common/log.cpp?ds=sidebyside diff --git a/src/common/log.cpp b/src/common/log.cpp index d1e30401d4..be03d3c4c8 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -16,6 +16,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "log.h" #endif @@ -29,31 +30,35 @@ // wxWindows #ifndef WX_PRECOMP - #include - #include - #include - #include - - #include - #include - #include + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/app.h" + + #if wxUSE_GUI + #include "wx/window.h" + #ifdef __WXMSW__ + #include "wx/msw/private.h" + #endif + #endif #endif //WX_PRECOMP -#include -#include -#include -#include +#include "wx/file.h" +#include "wx/textfile.h" +#include "wx/utils.h" +#include "wx/wxchar.h" +#include "wx/log.h" +#include "wx/thread.h" + +#if wxUSE_LOG // other standard headers #include #include #include -#ifdef __WXMSW__ - #include -#else //Unix - #include -#endif //Win/Unix +#if defined(__WXMSW__) + #include "wx/msw/private.h" // includes windows.h for OutputDebugString +#endif // ---------------------------------------------------------------------------- // non member functions @@ -71,43 +76,64 @@ // ============================================================================ // ---------------------------------------------------------------------------- -// implementation of Log functions -// -// NB: unfortunately we need all these distinct functions, we can't make them -// macros and not all compilers inline vararg functions. +// globals // ---------------------------------------------------------------------------- // log functions can't allocate memory (LogError("out of memory...") should // work!), so we use a static buffer for all log messages #define LOG_BUFFER_SIZE (4096) -// static buffer for error messages (@@@ MT-unsafe) -static char s_szBuf[LOG_BUFFER_SIZE]; +// static buffer for error messages +static wxChar s_szBuf[LOG_BUFFER_SIZE]; + +#if wxUSE_THREADS + +// the critical section protecting the static buffer +static wxCriticalSection gs_csLogBuf; + +#endif // wxUSE_THREADS + +// return true if we have a non NULL non disabled log target +static inline bool IsLoggingEnabled() +{ + return wxLog::IsEnabled() && (wxLog::GetActiveTarget() != NULL); +} + +// ---------------------------------------------------------------------------- +// implementation of Log functions +// +// NB: unfortunately we need all these distinct functions, we can't make them +// macros and not all compilers inline vararg functions. +// ---------------------------------------------------------------------------- // generic log function -void wxLogGeneric(wxLogLevel level, const char *szFormat, ...) +void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...) { - if ( wxLog::GetActiveTarget() != NULL ) { - va_list argptr; - va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); - va_end(argptr); + if ( IsLoggingEnabled() ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); - wxLog::OnLog(level, s_szBuf); - } + va_list argptr; + va_start(argptr, szFormat); + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); + va_end(argptr); + + wxLog::OnLog(level, s_szBuf, time(NULL)); + } } -#define IMPLEMENT_LOG_FUNCTION(level) \ - void wxLog##level(const char *szFormat, ...) \ - { \ - if ( wxLog::GetActiveTarget() != NULL ) { \ - va_list argptr; \ - va_start(argptr, szFormat); \ - vsprintf(s_szBuf, szFormat, argptr); \ - va_end(argptr); \ - \ - wxLog::OnLog(wxLOG_##level, s_szBuf); \ - } \ +#define IMPLEMENT_LOG_FUNCTION(level) \ + void wxLog##level(const wxChar *szFormat, ...) \ + { \ + if ( IsLoggingEnabled() ) { \ + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); \ + \ + va_list argptr; \ + va_start(argptr, szFormat); \ + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); \ + va_end(argptr); \ + \ + wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \ + } \ } IMPLEMENT_LOG_FUNCTION(FatalError) @@ -118,48 +144,82 @@ IMPLEMENT_LOG_FUNCTION(Info) IMPLEMENT_LOG_FUNCTION(Status) // same as info, but only if 'verbose' mode is on -void wxLogVerbose(const char *szFormat, ...) +void wxLogVerbose(const wxChar *szFormat, ...) { - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->GetVerbose() ) { - va_list argptr; - va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); - va_end(argptr); - - wxLog::OnLog(wxLOG_Info, s_szBuf); - } + if ( IsLoggingEnabled() ) { + wxLog *pLog = wxLog::GetActiveTarget(); + if ( pLog != NULL && pLog->GetVerbose() ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); + + va_list argptr; + va_start(argptr, szFormat); + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); + va_end(argptr); + + wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL)); + } + } } // debug functions #ifdef __WXDEBUG__ -#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \ - void wxLog##level(const char *szFormat, ...) \ - { \ - if ( wxLog::GetActiveTarget() != NULL ) { \ - va_list argptr; \ - va_start(argptr, szFormat); \ - vsprintf(s_szBuf, szFormat, argptr); \ - va_end(argptr); \ - \ - wxLog::OnLog(wxLOG_##level, s_szBuf); \ - } \ +#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \ + void wxLog##level(const wxChar *szFormat, ...) \ + { \ + if ( IsLoggingEnabled() ) { \ + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); \ + \ + va_list argptr; \ + va_start(argptr, szFormat); \ + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); \ + va_end(argptr); \ + \ + wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \ + } \ } - void wxLogTrace(wxTraceMask mask, const char *szFormat, ...) + void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...) { - wxLog *pLog = wxLog::GetActiveTarget(); + if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); + + wxChar *p = s_szBuf; + size_t len = WXSIZEOF(s_szBuf); + wxStrncpy(s_szBuf, _T("("), len); + len -= 1; // strlen("(") + p += 1; + wxStrncat(p, mask, len); + size_t lenMask = wxStrlen(mask); + len -= lenMask; + p += lenMask; + + wxStrncat(p, _T(") "), len); + len -= 2; + p += 2; + va_list argptr; + va_start(argptr, szFormat); + wxVsnprintf(p, len, szFormat, argptr); + va_end(argptr); + + wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL)); + } + } + + void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...) + { // we check that all of mask bits are set in the current mask, so // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something // if both bits are set. - if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) { + if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); + va_list argptr; va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); va_end(argptr); - wxLog::OnLog(wxLOG_Trace, s_szBuf); + wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL)); } } @@ -176,31 +236,40 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace) // common part of both wxLogSysError void wxLogSysErrorHelper(long lErrCode) { - char szErrMsg[LOG_BUFFER_SIZE / 2]; - sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode)); - strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf)); + wxChar szErrMsg[LOG_BUFFER_SIZE / 2]; + wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg), + _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode)); + wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf)); - wxLog::OnLog(wxLOG_Error, s_szBuf); + wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL)); } -void WXDLLEXPORT wxLogSysError(const char *szFormat, ...) +void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...) { - va_list argptr; - va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); - va_end(argptr); + if ( IsLoggingEnabled() ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); + + va_list argptr; + va_start(argptr, szFormat); + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); + va_end(argptr); - wxLogSysErrorHelper(wxSysErrorCode()); + wxLogSysErrorHelper(wxSysErrorCode()); + } } -void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...) +void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...) { - va_list argptr; - va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); - va_end(argptr); + if ( IsLoggingEnabled() ) { + wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); - wxLogSysErrorHelper(lErrCode); + va_list argptr; + va_start(argptr, szFormat); + wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); + va_end(argptr); + + wxLogSysErrorHelper(lErrCode); + } } // ---------------------------------------------------------------------------- @@ -209,559 +278,360 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...) wxLog::wxLog() { - m_bHasMessages = FALSE; - m_bVerbose = FALSE; - m_szTimeFormat = "[%d/%b/%y %H:%M:%S] "; + m_bHasMessages = FALSE; } wxLog *wxLog::GetActiveTarget() { - if ( ms_bAutoCreate && ms_pLogger == NULL ) { - // prevent infinite recursion if someone calls wxLogXXX() from - // wxApp::CreateLogTarget() - static bool s_bInGetActiveTarget = FALSE; - if ( !s_bInGetActiveTarget ) { - s_bInGetActiveTarget = TRUE; - - #ifdef WX_TEST_MINIMAL - ms_pLogger = new wxLogStderr; - #else - // ask the application to create a log target for us - if ( wxTheApp != NULL ) - ms_pLogger = wxTheApp->CreateLogTarget(); - #endif - - // do nothing if it fails - what can we do? + if ( ms_bAutoCreate && ms_pLogger == NULL ) { + // prevent infinite recursion if someone calls wxLogXXX() from + // wxApp::CreateLogTarget() + static bool s_bInGetActiveTarget = FALSE; + if ( !s_bInGetActiveTarget ) { + s_bInGetActiveTarget = TRUE; + + // ask the application to create a log target for us + if ( wxTheApp != NULL ) + ms_pLogger = wxTheApp->CreateLogTarget(); + else + ms_pLogger = new wxLogStderr; + + s_bInGetActiveTarget = FALSE; + + // do nothing if it fails - what can we do? + } } - } - return ms_pLogger; + return ms_pLogger; } wxLog *wxLog::SetActiveTarget(wxLog *pLogger) { - // flush the old messages before changing - if ( ms_pLogger != NULL ) - ms_pLogger->Flush(); + if ( ms_pLogger != NULL ) { + // flush the old messages before changing because otherwise they might + // get lost later if this target is not restored + ms_pLogger->Flush(); + } + + wxLog *pOldLogger = ms_pLogger; + ms_pLogger = pLogger; - wxLog *pOldLogger = ms_pLogger; - ms_pLogger = pLogger; - return pOldLogger; + return pOldLogger; } -wxString wxLog::TimeStamp() const +void wxLog::DontCreateOnDemand() { - wxString str; + ms_bAutoCreate = FALSE; - if ( !IsEmpty(m_szTimeFormat) ) { - char szBuf[128]; - time_t timeNow; - struct tm *ptmNow; - - time(&timeNow); - ptmNow = localtime(&timeNow); - - strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow); - str = szBuf; - } - - return str; + // this is usually called at the end of the program and we assume that it + // is *always* called at the end - so we free memory here to avoid false + // memory leak reports from wxWin memory tracking code + ClearTraceMasks(); } -void wxLog::DoLog(wxLogLevel level, const char *szString) +void wxLog::RemoveTraceMask(const wxString& str) { - // prepend a timestamp if not disabled - wxString str = TimeStamp(); - - switch ( level ) { - case wxLOG_FatalError: - DoLogString(str << _("Fatal error: ") << szString); - DoLogString(_("Program aborted.")); - Flush(); - abort(); - break; - - case wxLOG_Error: - DoLogString(str << _("Error: ") << szString); - break; - - case wxLOG_Warning: - DoLogString(str << _("Warning: ") << szString); - break; - - case wxLOG_Info: - if ( GetVerbose() ) - case wxLOG_Message: - DoLogString(str + szString); - // fall through - - case wxLOG_Status: - // nothing to do - break; - - case wxLOG_Trace: - case wxLOG_Debug: - #ifdef __WXDEBUG__ - DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug")) - << ": " << szString); - #endif - - break; - - default: - wxFAIL_MSG(_("unknown log level in wxLog::DoLog")); - } + int index = ms_aTraceMasks.Index(str); + if ( index != wxNOT_FOUND ) + ms_aTraceMasks.Remove((size_t)index); } -void wxLog::DoLogString(const char *WXUNUSED(szString)) +void wxLog::ClearTraceMasks() { - wxFAIL_MSG(_("DoLogString must be overrided if it's called.")); + ms_aTraceMasks.Clear(); } -void wxLog::Flush() +void wxLog::TimeStamp(wxString *str) { - // do nothing -} + if ( ms_timestamp ) + { + wxChar buf[256]; + time_t timeNow; + (void)time(&timeNow); + wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow)); -// ---------------------------------------------------------------------------- -// wxLogStderr class implementation -// ---------------------------------------------------------------------------- - -wxLogStderr::wxLogStderr(FILE *fp) -{ - if ( fp == NULL ) - m_fp = stderr; - else - m_fp = fp; + str->Empty(); + *str << buf << wxT(": "); + } } -void wxLogStderr::DoLogString(const char *szString) +void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) { - fputs(szString, m_fp); - fputc('\n', m_fp); - fflush(m_fp); -} + switch ( level ) { + case wxLOG_FatalError: + DoLogString(wxString(_("Fatal error: ")) + szString, t); + DoLogString(_("Program aborted."), t); + Flush(); + abort(); + break; -// ---------------------------------------------------------------------------- -// wxLogStream implementation -// ---------------------------------------------------------------------------- + case wxLOG_Error: + DoLogString(wxString(_("Error: ")) + szString, t); + break; -wxLogStream::wxLogStream(ostream *ostr) -{ - if ( ostr == NULL ) - m_ostr = &cerr; - else - m_ostr = ostr; -} + case wxLOG_Warning: + DoLogString(wxString(_("Warning: ")) + szString, t); + break; -void wxLogStream::DoLogString(const char *szString) -{ - (*m_ostr) << szString << endl << flush; -} + case wxLOG_Info: + if ( GetVerbose() ) + case wxLOG_Message: + case wxLOG_Status: + default: // log unknown log levels too + DoLogString(szString, t); + break; -// ---------------------------------------------------------------------------- -// wxLogTextCtrl implementation -// ---------------------------------------------------------------------------- -wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) -// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf + case wxLOG_Trace: + case wxLOG_Debug: +#ifdef __WXDEBUG__ + { + wxString msg = level == wxLOG_Trace ? wxT("Trace: ") + : wxT("Debug: "); + msg << szString; + DoLogString(msg, t); + } +#endif // Debug + break; + } +} -// Also, in DLL mode in wxMSW, can't use it. -#if defined(NO_TEXT_WINDOW_STREAM) -#else - : wxLogStream(new ostream(pTextCtrl)) -#endif +void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t)) { + wxFAIL_MSG(wxT("DoLogString must be overriden if it's called.")); } -wxLogTextCtrl::~wxLogTextCtrl() +void wxLog::Flush() { - delete m_ostr; + // remember that we don't have any more messages to show + m_bHasMessages = FALSE; } // ---------------------------------------------------------------------------- -// wxLogGui implementation +// wxLogStderr class implementation // ---------------------------------------------------------------------------- -#ifndef WX_TEST_MINIMAL - -wxLogGui::wxLogGui() +wxLogStderr::wxLogStderr(FILE *fp) { - m_bErrors = FALSE; + if ( fp == NULL ) + m_fp = stderr; + else + m_fp = fp; } -void wxLogGui::Flush() -{ - if ( !m_bHasMessages ) - return; - - // @@@ ugly... - - // concatenate all strings (but not too many to not overfill the msg box) - wxString str; - uint nLines = 0, - nMsgCount = m_aMessages.Count(); - - // start from the most recent message - for ( uint n = nMsgCount; n > 0; n-- ) { - // for Windows strings longer than this value are wrapped (NT 4.0) - const uint nMsgLineWidth = 156; - - nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth; +#if defined(__WXMAC__) && !defined(__DARWIN__) +#define kDebuggerSignature 'MWDB' - if ( nLines > 25 ) // don't put too many lines in message box - break; - - str << m_aMessages[n - 1] << "\n"; - } - - if ( m_bErrors ) { - wxMessageBox(str, _("Error"), wxOK | wxICON_EXCLAMATION); - } - else { - wxMessageBox(str, _("Information"), wxOK | wxICON_INFORMATION); - } +static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info) +{ + OSErr err; + ProcessSerialNumber psn; + Boolean found = false; + psn.highLongOfPSN = 0; + psn.lowLongOfPSN = kNoProcess; - // no undisplayed messages whatsoever - m_bHasMessages = - m_bErrors = FALSE; - m_aMessages.Empty(); -} + if (!info) return false; -// the default behaviour is to discard all informational messages if there -// are any errors/warnings. -void wxLogGui::DoLog(wxLogLevel level, const char *szString) -{ - switch ( level ) { - case wxLOG_Info: - if ( GetVerbose() ) - case wxLOG_Message: - if ( !m_bErrors ) { - m_aMessages.Add(szString); - m_bHasMessages = TRUE; - } - break; - - case wxLOG_Status: - { - // find the top window and set it's status text if it has any - wxWindow *pWin = wxTheApp->GetTopWindow(); - if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) { - wxFrame *pFrame = (wxFrame *)pWin; - pFrame->SetStatusText(szString); - } - } - break; + info->processInfoLength = sizeof(ProcessInfoRec); + info->processName = NULL; + info->processAppSpec = NULL; - case wxLOG_Trace: - case wxLOG_Debug: - #ifdef __WXDEBUG__ + err = noErr; + while (!found && err == noErr) + { + err = GetNextProcess(&psn); + if (err == noErr) { - wxString strTime = TimeStamp(); - - #ifdef __WIN32__ - // don't prepend debug/trace here: it goes to the debug window - // anyhow, but do put a timestamp - OutputDebugString(strTime + szString + "\n\r"); - #else //!WIN32 - // send them to stderr - fprintf(stderr, "%s %s: %s\n", - strTime.c_str(), - level == wxLOG_Trace ? _("Trace") : _("Debug"), - szString); - fflush(stderr); - #endif // WIN32 + err = GetProcessInformation(&psn, info); + found = err == noErr && info->processSignature == signature; } - #endif - break; - - case wxLOG_FatalError: - // show this one immediately - wxMessageBox(szString, _("Fatal error"), wxICON_HAND); - break; - - case wxLOG_Error: - case wxLOG_Warning: - // discard earlier informational messages if this is the 1st error - if ( !m_bErrors ) { - m_aMessages.Empty(); - m_bHasMessages = TRUE; - m_bErrors = TRUE; - } - - m_aMessages.Add(szString); - break; - - default: - wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog")); - } + } + return found; } -// ---------------------------------------------------------------------------- -// wxLogWindow and wxLogFrame implementation -// ---------------------------------------------------------------------------- - -// log frame class -// --------------- -class wxLogFrame : public wxFrame +pascal Boolean MWDebuggerIsRunning(void) { -public: - // ctor & dtor - wxLogFrame(wxLogWindow *log, const char *szTitle); - virtual ~wxLogFrame(); - - // menu callbacks - void OnClose(wxCommandEvent& event); - void OnCloseWindow(wxCloseEvent& event); - void OnSave (wxCommandEvent& event); - void OnClear(wxCommandEvent& event); - - void OnIdle(wxIdleEvent&); - - // accessors - wxTextCtrl *TextCtrl() const { return m_pTextCtrl; } + ProcessInfoRec info; + return FindProcessBySignature(kDebuggerSignature, &info); +} -private: - enum - { - Menu_Close = 100, - Menu_Save, - Menu_Clear - }; +pascal OSErr AmIBeingMWDebugged(Boolean* result) +{ + OSErr err; + ProcessSerialNumber psn; + OSType sig = kDebuggerSignature; + AppleEvent theAE = {typeNull, NULL}; + AppleEvent theReply = {typeNull, NULL}; + AEAddressDesc addr = {typeNull, NULL}; + DescType actualType; + Size actualSize; - // instead of closing just hide the window to be able to Show() it later - void DoClose() { Show(FALSE); } + if (!result) return paramErr; - wxTextCtrl *m_pTextCtrl; - wxLogWindow *m_log; + err = AECreateDesc(typeApplSignature, &sig, sizeof(sig), &addr); + if (err != noErr) goto exit; - DECLARE_EVENT_TABLE() -}; + err = AECreateAppleEvent(kDebuggerSignature, 'Dbg?', &addr, + kAutoGenerateReturnID, kAnyTransactionID, &theAE); + if (err != noErr) goto exit; -BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) - // wxLogWindow menu events - EVT_MENU(Menu_Close, wxLogFrame::OnClose) - EVT_MENU(Menu_Save, wxLogFrame::OnSave) - EVT_MENU(Menu_Clear, wxLogFrame::OnClear) + GetCurrentProcess(&psn); + err = AEPutParamPtr(&theAE, keyDirectObject, typeProcessSerialNumber, + &psn, sizeof(psn)); + if (err != noErr) goto exit; - EVT_CLOSE(wxLogFrame::OnCloseWindow) + err = AESend(&theAE, &theReply, kAEWaitReply, kAENormalPriority, + kAEDefaultTimeout, NULL, NULL); + if (err != noErr) goto exit; - EVT_IDLE(wxLogFrame::OnIdle) -END_EVENT_TABLE() + err = AEGetParamPtr(&theReply, keyAEResult, typeBoolean, &actualType, result, + sizeof(Boolean), &actualSize); -wxLogFrame::wxLogFrame(wxLogWindow *log, const char *szTitle) - : wxFrame(NULL, -1, szTitle) -{ - m_log = log; - - // @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating - // a rich edit control instead of a normal one we want in wxMSW - m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, - wxDefaultSize, - wxSIMPLE_BORDER | - wxTE_MULTILINE | - wxHSCROLL | - wxTE_READONLY); - /* - m_pTextCtrl->SetEditable(FALSE); - m_pTextCtrl->SetRichEdit(FALSE); - */ - - // create menu - wxMenuBar *pMenuBar = new wxMenuBar; - wxMenu *pMenu = new wxMenu; - pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file")); - pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents")); - pMenu->AppendSeparator(); - pMenu->Append(Menu_Close, _("&Close"), _("Close this window")); - pMenuBar->Append(pMenu, _("&Log")); - SetMenuBar(pMenuBar); - - // status bar for menu prompts - CreateStatusBar(); - - m_log->OnFrameCreate(this); -} +exit: + if (addr.dataHandle) + AEDisposeDesc(&addr); + if (theAE.dataHandle) + AEDisposeDesc(&theAE); + if (theReply.dataHandle) + AEDisposeDesc(&theReply); -void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event)) -{ - DoClose(); + return err; } +#endif -void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - DoClose(); -} - -void wxLogFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) -{ - // if we're the last frame to stay, delete log frame letting the - // application to close - if ( wxTopLevelWindows.Number() == 1 ) - Destroy(); -} - -void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) -{ - // get the file name - // ----------------- - const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt"); - if ( szFileName == NULL ) { - // cancelled - return; - } - - // open file - // --------- - wxFile file; - bool bOk = FALSE; - if ( wxFile::Exists(szFileName) ) { - bool bAppend = FALSE; - wxString strMsg; - strMsg.Printf(_("Append log to file '%s' " - "(choosing [No] will overwrite it)?"), szFileName); - switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) { - case wxYES: - bAppend = TRUE; - break; - - case wxNO: - bAppend = FALSE; - break; - - case wxCANCEL: - return; - - default: - wxFAIL_MSG(_("invalid message box return value")); - } - - if ( bAppend ) { - bOk = file.Open(szFileName, wxFile::write_append); +void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) +{ + wxString str; + TimeStamp(&str); + str << szString; + + fputs(str.mb_str(), m_fp); + fputc(_T('\n'), m_fp); + fflush(m_fp); + + // under Windows, programs usually don't have stderr at all, so show the + // messages also under debugger - unless it's a console program +#if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__) + str += wxT("\r\n") ; + OutputDebugString(str.c_str()); +#endif // MSW +#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI + Str255 pstr ; + strcpy( (char*) pstr , str.c_str() ) ; + strcat( (char*) pstr , ";g" ) ; + c2pstr( (char*) pstr ) ; +#if __WXDEBUG__ + Boolean running = false ; + +/* + if ( MWDebuggerIsRunning() ) + { + AmIBeingMWDebugged( &running ) ; } - else { - bOk = file.Create(szFileName, TRUE /* overwrite */); +*/ + if (running) + { +#ifdef __powerc + DebugStr(pstr); +#else + SysBreakStr(pstr); +#endif } - } - else { - bOk = file.Create(szFileName); - } - - // retrieve text and save it - // ------------------------- -#ifdef __WXGTK__ - // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet - wxLogError(_("Sorry, this function is not implemented under GTK")); + else +#endif + { +#ifdef __powerc + DebugStr(pstr); #else - int nLines = m_pTextCtrl->GetNumberOfLines(); - for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) { - bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL()); - } -#endif //GTK - - if ( bOk ) - bOk = file.Close(); - - if ( !bOk ) { - wxLogError(_("Can't save log contents to file.")); - return; - } + DebugStr(pstr); +#endif + } +#endif // Mac } -void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) -{ - m_pTextCtrl->Clear(); -} +// ---------------------------------------------------------------------------- +// wxLogStream implementation +// ---------------------------------------------------------------------------- -wxLogFrame::~wxLogFrame() +#if wxUSE_STD_IOSTREAM +wxLogStream::wxLogStream(wxSTD ostream *ostr) { - m_log->OnFrameDelete(this); + if ( ostr == NULL ) + m_ostr = &wxSTD cerr; + else + m_ostr = ostr; } -// wxLogWindow -// ----------- -wxLogWindow::wxLogWindow(const char *szTitle, bool bShow, bool bDoPass) +void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { - m_bPassMessages = bDoPass; - - m_pLogFrame = new wxLogFrame(this, szTitle); - m_pOldLog = wxLog::SetActiveTarget(this); - - if ( bShow ) - m_pLogFrame->Show(TRUE); + wxString str; + TimeStamp(&str); + (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl; } +#endif // wxUSE_STD_IOSTREAM -void wxLogWindow::Show(bool bShow) -{ - m_pLogFrame->Show(bShow); -} +// ---------------------------------------------------------------------------- +// wxLogChain +// ---------------------------------------------------------------------------- -void wxLogWindow::Flush() +wxLogChain::wxLogChain(wxLog *logger) { - if ( m_pOldLog != NULL ) - m_pOldLog->Flush(); - - m_bHasMessages = FALSE; + m_logNew = logger; + m_logOld = wxLog::SetActiveTarget(this); } -void wxLogWindow::DoLog(wxLogLevel level, const char *szString) +void wxLogChain::SetLog(wxLog *logger) { - // first let the previous logger show it - if ( m_pOldLog != NULL && m_bPassMessages ) { - // @@@ why can't we access protected wxLog method from here (we derive - // from wxLog)? gcc gives "DoLog is protected in this context", what - // does this mean? Anyhow, the cast is harmless and let's us do what - // we want. - ((wxLogWindow *)m_pOldLog)->DoLog(level, szString); - } + if ( m_logNew != this ) + delete m_logNew; - // and this will format it nicely and call our DoLogString() - wxLog::DoLog(level, szString); + wxLog::SetActiveTarget(logger); - m_bHasMessages = TRUE; + m_logNew = logger; } -void wxLogWindow::DoLogString(const char *szString) +void wxLogChain::Flush() { - // put the text into our window - wxTextCtrl *pText = m_pLogFrame->TextCtrl(); - - // remove selection (WriteText is in fact ReplaceSelection) - #ifdef __WXMSW__ - long nLen = pText->GetLastPosition(); - pText->SetSelection(nLen, nLen); - #endif // Windows + if ( m_logOld ) + m_logOld->Flush(); - pText->WriteText(szString); - pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n") - - // ensure that the line can be seen - // @@@ TODO + // be careful to avoid inifinite recursion + if ( m_logNew && m_logNew != this ) + m_logNew->Flush(); } -wxFrame *wxLogWindow::GetFrame() const +void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t) { - return m_pLogFrame; -} + // let the previous logger show it + if ( m_logOld && IsPassingMessages() ) + { + // bogus cast just to access protected DoLog + ((wxLogChain *)m_logOld)->DoLog(level, szString, t); + } -void wxLogWindow::OnFrameCreate(wxFrame *frame) -{ + if ( m_logNew && m_logNew != this ) + { + // as above... + ((wxLogChain *)m_logNew)->DoLog(level, szString, t); + } } -void wxLogWindow::OnFrameDelete(wxFrame *frame) -{ - m_pLogFrame = NULL; -} +// ---------------------------------------------------------------------------- +// wxLogPassThrough +// ---------------------------------------------------------------------------- -wxLogWindow::~wxLogWindow() -{ - // may be NULL if log frame already auto destroyed itself - delete m_pLogFrame; +#ifdef __VISUALC__ + // "'this' : used in base member initializer list" - so what? + #pragma warning(disable:4355) +#endif // VC++ - // delete the old log - delete m_pOldLog; +wxLogPassThrough::wxLogPassThrough() + : wxLogChain(this) +{ } -#endif //WX_TEST_MINIMAL +#ifdef __VISUALC__ + #pragma warning(default:4355) +#endif // VC++ // ============================================================================ // Global functions/variables @@ -770,9 +640,22 @@ wxLogWindow::~wxLogWindow() // ---------------------------------------------------------------------------- // static variables // ---------------------------------------------------------------------------- -wxLog *wxLog::ms_pLogger = NULL; -bool wxLog::ms_bAutoCreate = TRUE; -wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; + +wxLog *wxLog::ms_pLogger = (wxLog *)NULL; +bool wxLog::ms_doLog = TRUE; +bool wxLog::ms_bAutoCreate = TRUE; +bool wxLog::ms_bVerbose = FALSE; + +size_t wxLog::ms_suspendCount = 0; + +#if wxUSE_GUI + const wxChar *wxLog::ms_timestamp = wxT("%X"); // time only, no date +#else + const wxChar *wxLog::ms_timestamp = NULL; // save space +#endif + +wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; +wxArrayString wxLog::ms_aTraceMasks; // ---------------------------------------------------------------------------- // stdout error logging helper @@ -781,33 +664,33 @@ wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; // helper function: wraps the message and justifies it under given position // (looks more pretty on the terminal). Also adds newline at the end. // -// @@ this is now disabled until I find a portable way of determining the -// terminal window size (ok, I found it but does anybody really cares?) -#ifdef LOG_PRETTY_WRAP +// TODO this is now disabled until I find a portable way of determining the +// terminal window size (ok, I found it but does anybody really cares?) +#ifdef LOG_PRETTY_WRAP static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) { - size_t nMax = 80; // @@@@ - size_t nStart = strlen(pszPrefix); - fputs(pszPrefix, f); - - size_t n; - while ( *psz != '\0' ) { - for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ ) - putc(*psz++, f); - - // wrapped? - if ( *psz != '\0' ) { - /*putc('\n', f);*/ - for ( n = 0; n < nStart; n++ ) - putc(' ', f); - - // as we wrapped, squeeze all white space - while ( isspace(*psz) ) - psz++; + size_t nMax = 80; // FIXME + size_t nStart = strlen(pszPrefix); + fputs(pszPrefix, f); + + size_t n; + while ( *psz != '\0' ) { + for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ ) + putc(*psz++, f); + + // wrapped? + if ( *psz != '\0' ) { + /*putc('\n', f);*/ + for ( n = 0; n < nStart; n++ ) + putc(' ', f); + + // as we wrapped, squeeze all white space + while ( isspace(*psz) ) + psz++; + } } - } - putc('\n', f); + putc('\n', f); } #endif //LOG_PRETTY_WRAP @@ -818,123 +701,67 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { - #ifdef __WXMSW__ - #ifdef __WIN32__ - return ::GetLastError(); - #else //WIN16 - // @@@@ what to do on Windows 3.1? - return 0; - #endif //WIN16/32 - #else //Unix +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#ifdef __WIN32__ + return ::GetLastError(); +#else //WIN16 + // TODO what to do on Windows 3.1? + return 0; +#endif //WIN16/32 +#else //Unix return errno; - #endif //Win/Unix +#endif //Win/Unix } // get error message from system -const char *wxSysErrorMsg(unsigned long nErrCode) -{ - if ( nErrCode == 0 ) - nErrCode = wxSysErrorCode(); - - #ifdef __WXMSW__ - #ifdef __WIN32__ - static char s_szBuf[LOG_BUFFER_SIZE / 2]; - - // get error message from system - LPVOID lpMsgBuf; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, nErrCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, - 0, NULL); - - // copy it to our buffer and free memory - strncpy(s_szBuf, (const char *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1); - s_szBuf[WXSIZEOF(s_szBuf) - 1] = '\0'; - LocalFree(lpMsgBuf); - - // returned string is capitalized and ended with '\r\n' - bad - s_szBuf[0] = (char)wxToLower(s_szBuf[0]); - size_t len = strlen(s_szBuf); - if ( len > 0 ) { +const wxChar *wxSysErrorMsg(unsigned long nErrCode) +{ + if ( nErrCode == 0 ) + nErrCode = wxSysErrorCode(); + +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#ifdef __WIN32__ + static wxChar s_szBuf[LOG_BUFFER_SIZE / 2]; + + // get error message from system + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, nErrCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsgBuf, + 0, NULL); + + // copy it to our buffer and free memory + if( lpMsgBuf != 0 ) + wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1); + else + s_szBuf[0] = wxT('\0'); + s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0'); + LocalFree(lpMsgBuf); + + // returned string is capitalized and ended with '\r\n' - bad + s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]); + size_t len = wxStrlen(s_szBuf); + if ( len > 0 ) { // truncate string - if ( s_szBuf[len - 2] == '\r' ) - s_szBuf[len - 2] = '\0'; - } - - return s_szBuf; - #else //Win16 - // TODO @@@@ - return NULL; - #endif // Win16/32 - #else // Unix - return strerror(nErrCode); - #endif // Win/Unix -} - -// ---------------------------------------------------------------------------- -// debug helper -// ---------------------------------------------------------------------------- - -#ifdef __WXDEBUG__ - -void Trap() -{ - #ifdef __WXMSW__ - DebugBreak(); - #else // Unix - raise(SIGTRAP); - #endif // Win/Unix -} - -// this function is called when an assert fails -void wxOnAssert(const char *szFile, int nLine, const char *szMsg) -{ - // this variable can be set to true to suppress "assert failure" messages - static bool s_bNoAsserts = FALSE; - static bool s_bInAssert = FALSE; - - if ( s_bInAssert ) { - // He-e-e-e-elp!! we're trapped in endless loop - Trap(); - } - - s_bInAssert = TRUE; - - char szBuf[LOG_BUFFER_SIZE]; - sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine); - if ( szMsg != NULL ) { - strcat(szBuf, ": "); - strcat(szBuf, szMsg); - } - else { - strcat(szBuf, "."); - } - - if ( !s_bNoAsserts ) { - // send it to the normal log destination - wxLogDebug(szBuf); - - strcat(szBuf, _("\nDo you want to stop the program?" - "\nYou can also choose [Cancel] to suppress " - "further warnings.")); - - switch ( wxMessageBox(szBuf, _("Debug"), - wxYES_NO | wxCANCEL | wxICON_STOP ) ) { - case wxYES: - Trap(); - break; - - case wxCANCEL: - s_bNoAsserts = TRUE; - break; - - //case wxNO: nothing to do + if ( s_szBuf[len - 2] == wxT('\r') ) + s_szBuf[len - 2] = wxT('\0'); } - } - s_bInAssert = FALSE; + return s_szBuf; +#else //Win16 + // TODO + return NULL; +#endif // Win16/32 +#else // Unix +#if wxUSE_UNICODE + static wxChar s_szBuf[LOG_BUFFER_SIZE / 2]; + wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1); + return s_szBuf; +#else + return strerror((int)nErrCode); +#endif +#endif // Win/Unix } -#endif //WXDEBUG - +#endif //wxUSE_LOG