X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fb67cd1968707f15341792406da62045e11c5f0..9e855852c1bc24ddd49b69df5290111022a96093:/src/common/log.cpp diff --git a/src/common/log.cpp b/src/common/log.cpp index 050ee0c3d3..b71af7bd54 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -29,21 +29,25 @@ // wxWindows #ifndef WX_PRECOMP - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include "wx/window.h" +#ifdef __WXMSW__ + #include "wx/msw/private.h" +#endif + #include "wx/event.h" + #include "wx/app.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/menu.h" + #include "wx/frame.h" + #include "wx/msgdlg.h" + #include "wx/filedlg.h" + #include "wx/textctrl.h" #endif //WX_PRECOMP -#include -#include -#include -#include +#include "wx/file.h" +#include "wx/textfile.h" +#include "wx/utils.h" +#include "wx/log.h" // other standard headers #include @@ -93,15 +97,15 @@ static wxFrame *gs_pFrame; // FIXME MT-unsafe #define LOG_BUFFER_SIZE (4096) // static buffer for error messages (FIXME MT-unsafe) -static char s_szBuf[LOG_BUFFER_SIZE]; +static wxChar s_szBuf[LOG_BUFFER_SIZE]; // 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); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(level, s_szBuf, time(NULL)); @@ -109,12 +113,12 @@ void wxLogGeneric(wxLogLevel level, const char *szFormat, ...) } #define IMPLEMENT_LOG_FUNCTION(level) \ - void wxLog##level(const char *szFormat, ...) \ + void wxLog##level(const wxChar *szFormat, ...) \ { \ if ( wxLog::GetActiveTarget() != NULL ) { \ va_list argptr; \ va_start(argptr, szFormat); \ - vsprintf(s_szBuf, szFormat, argptr); \ + wxVsprintf(s_szBuf, szFormat, argptr); \ va_end(argptr); \ \ wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \ @@ -130,13 +134,13 @@ IMPLEMENT_LOG_FUNCTION(Status) // accepts an additional argument which tells to which frame the output should // be directed -void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...) +void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...) { wxLog *pLog = wxLog::GetActiveTarget(); if ( pLog != NULL ) { va_list argptr; va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxASSERT( gs_pFrame == NULL ); // should be reset! @@ -147,13 +151,13 @@ void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...) } // 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); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL)); @@ -163,33 +167,33 @@ void wxLogVerbose(const char *szFormat, ...) // debug functions #ifdef __WXDEBUG__ #define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \ - void wxLog##level(const char *szFormat, ...) \ + void wxLog##level(const wxChar *szFormat, ...) \ { \ if ( wxLog::GetActiveTarget() != NULL ) { \ va_list argptr; \ va_start(argptr, szFormat); \ - vsprintf(s_szBuf, szFormat, argptr); \ + wxVsprintf(s_szBuf, szFormat, argptr); \ va_end(argptr); \ \ wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \ } \ } - void wxLogTrace(const char *mask, const char *szFormat, ...) + void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...) { wxLog *pLog = wxLog::GetActiveTarget(); if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) { va_list argptr; va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL)); } } - void wxLogTrace(wxTraceMask mask, const char *szFormat, ...) + void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...) { wxLog *pLog = wxLog::GetActiveTarget(); @@ -199,7 +203,7 @@ void wxLogVerbose(const char *szFormat, ...) if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) { va_list argptr; va_start(argptr, szFormat); - vsprintf(s_szBuf, szFormat, argptr); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL)); @@ -219,28 +223,28 @@ 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]; + wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode)); + wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(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); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); 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); + wxVsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLogSysErrorHelper(lErrCode); @@ -311,30 +315,43 @@ void wxLog::RemoveTraceMask(const wxString& str) ms_aTraceMasks.Remove((size_t)index); } -void wxLog::DoLog(wxLogLevel level, const char *szString, time_t t) +void wxLog::TimeStamp(wxString *str) { - wxString str; + if ( ms_timestamp ) + { + wxChar buf[256]; + time_t timeNow; + (void)time(&timeNow); + wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow)); + + str->Empty(); + *str << buf << _T(": "); + } +} +void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) +{ switch ( level ) { case wxLOG_FatalError: - DoLogString(str << _("Fatal error: ") << szString, t); + DoLogString(wxString(_("Fatal error: ")) + szString, t); DoLogString(_("Program aborted."), t); Flush(); abort(); break; case wxLOG_Error: - DoLogString(str << _("Error: ") << szString, t); + DoLogString(wxString(_("Error: ")) + szString, t); break; case wxLOG_Warning: - DoLogString(str << _("Warning: ") << szString, t); + DoLogString(wxString(_("Warning: ")) + szString, t); break; case wxLOG_Info: - case wxLOG_Message: if ( GetVerbose() ) - DoLogString(str + szString, t); + case wxLOG_Message: + default: // log unknown log levels too + DoLogString(szString, t); // fall through case wxLOG_Status: @@ -346,17 +363,13 @@ void wxLog::DoLog(wxLogLevel level, const char *szString, time_t t) #ifdef __WXDEBUG__ DoLogString(szString, t); #endif - break; - - default: - wxFAIL_MSG(_("unknown log level in wxLog::DoLog")); } } -void wxLog::DoLogString(const char *WXUNUSED(szString), time_t t) +void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t)) { - wxFAIL_MSG("DoLogString must be overriden if it's called."); + wxFAIL_MSG(_T("DoLogString must be overriden if it's called.")); } void wxLog::Flush() @@ -376,18 +389,19 @@ wxLogStderr::wxLogStderr(FILE *fp) m_fp = fp; } -void wxLogStderr::DoLogString(const char *szString, time_t t) +void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { - wxString str(szString); - str << '\n'; + wxString str; + TimeStamp(&str); + str << szString << _T('\n'); - fputs(str, m_fp); + fputs(str.mb_str(), m_fp); fflush(m_fp); // under Windows, programs usually don't have stderr at all, so make show the // messages also under debugger #ifdef __WXMSW__ - OutputDebugString(str + '\r'); + OutputDebugString(str + _T('\r')); #endif // MSW } @@ -404,9 +418,9 @@ wxLogStream::wxLogStream(ostream *ostr) m_ostr = ostr; } -void wxLogStream::DoLogString(const char *szString, time_t t) +void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { - (*m_ostr) << szString << endl << flush; + (*m_ostr) << wxConvCurrent->cWX2MB(szString) << endl << flush; } #endif // wxUSE_STD_IOSTREAM @@ -416,19 +430,19 @@ void wxLogStream::DoLogString(const char *szString, time_t t) // wxLogTextCtrl implementation // ---------------------------------------------------------------------------- -#if wxUSE_STD_IOSTREAM wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) -#if !defined(NO_TEXT_WINDOW_STREAM) -: wxLogStream(new ostream(pTextCtrl)) -#endif { + m_pTextCtrl = pTextCtrl; } -wxLogTextCtrl::~wxLogTextCtrl() +void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t t) { - delete m_ostr; + wxString msg; + TimeStamp(&msg); + msg << szString << _T('\n'); + + m_pTextCtrl->AppendText(msg); } -#endif // wxUSE_STD_IOSTREAM // ---------------------------------------------------------------------------- // wxLogGui implementation (FIXME MT-unsafe) @@ -469,10 +483,10 @@ void wxLogGui::Flush() if ( nLines > 25 ) // don't put too many lines in message box break; - str << m_aMessages[n - 1] << "\n"; + str << m_aMessages[n - 1] << _T("\n"); } - const char *title; + const wxChar *title; long style; if ( m_bErrors ) { @@ -496,7 +510,7 @@ void wxLogGui::Flush() // the default behaviour is to discard all informational messages if there // are any errors/warnings. -void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t) +void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t) { switch ( level ) { case wxLOG_Info: @@ -510,6 +524,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t) break; case wxLOG_Status: +#if wxUSE_STATUSBAR { // find the top window and set it's status text if it has any wxFrame *pFrame = gs_pFrame; @@ -523,6 +538,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t) if ( pFrame != NULL ) pFrame->SetStatusText(szString); } +#endif // wxUSE_STATUSBAR break; case wxLOG_Trace: @@ -532,12 +548,16 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t) #ifdef __WXMSW__ // don't prepend debug/trace here: it goes to the // debug window anyhow, but do put a timestamp - OutputDebugString(wxString(szString) + "\n\r"); + wxString str; + TimeStamp(&str); + str << szString << _T("\n\r"); + OutputDebugString(str); #else // send them to stderr - fprintf(stderr, "%s: %s\n", - level == wxLOG_Trace ? "Trace" : "Debug", - szString); + wxFprintf(stderr, _T("%s: %s\n"), + level == wxLOG_Trace ? _T("Trace") + : _T("Debug"), + szString); fflush(stderr); #endif } @@ -570,9 +590,6 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t) m_aMessages.Add(szString); m_aTimes.Add((long)t); break; - - default: - wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog")); } } @@ -586,13 +603,15 @@ class wxLogFrame : public wxFrame { public: // ctor & dtor - wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle); + wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle); virtual ~wxLogFrame(); // menu callbacks void OnClose(wxCommandEvent& event); void OnCloseWindow(wxCloseEvent& event); +#if wxUSE_FILE void OnSave (wxCommandEvent& event); +#endif // wxUSE_FILE void OnClear(wxCommandEvent& event); void OnIdle(wxIdleEvent&); @@ -620,13 +639,15 @@ private: BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) // wxLogWindow menu events EVT_MENU(Menu_Close, wxLogFrame::OnClose) +#if wxUSE_FILE EVT_MENU(Menu_Save, wxLogFrame::OnSave) +#endif // wxUSE_FILE EVT_MENU(Menu_Clear, wxLogFrame::OnClear) EVT_CLOSE(wxLogFrame::OnCloseWindow) END_EVENT_TABLE() -wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle) +wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle) : wxFrame(pParent, -1, szTitle) { m_log = log; @@ -640,15 +661,19 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle) // create menu wxMenuBar *pMenuBar = new wxMenuBar; wxMenu *pMenu = new wxMenu; +#if wxUSE_FILE pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file")); +#endif // wxUSE_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); +#if wxUSE_STATUSBAR // status bar for menu prompts CreateStatusBar(); +#endif // wxUSE_STATUSBAR m_log->OnFrameCreate(this); } @@ -663,11 +688,12 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) DoClose(); } +#if wxUSE_FILE void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) { // get the file name // ----------------- - const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt"); + const wxChar *szFileName = wxSaveFileSelector(_T("log"), _T("txt"), _T("log.txt")); if ( szFileName == NULL ) { // cancelled return; @@ -733,6 +759,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) wxLogStatus(this, _("Log saved to the file '%s'."), szFileName); } } +#endif // wxUSE_FILE void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) { @@ -747,9 +774,9 @@ wxLogFrame::~wxLogFrame() // wxLogWindow // ----------- wxLogWindow::wxLogWindow(wxFrame *pParent, - const char *szTitle, - bool bShow, - bool bDoPass) + const wxChar *szTitle, + bool bShow, + bool bDoPass) { m_bPassMessages = bDoPass; @@ -773,7 +800,7 @@ void wxLogWindow::Flush() m_bHasMessages = FALSE; } -void wxLogWindow::DoLog(wxLogLevel level, const char *szString, time_t t) +void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t) { // first let the previous logger show it if ( m_pOldLog != NULL && m_bPassMessages ) { @@ -789,6 +816,7 @@ void wxLogWindow::DoLog(wxLogLevel level, const char *szString, time_t t) case wxLOG_Status: // by default, these messages are ignored by wxLog, so process // them ourselves + if ( !wxIsEmpty(szString) ) { wxString str; str << _("Status: ") << szString; @@ -812,7 +840,7 @@ void wxLogWindow::DoLog(wxLogLevel level, const char *szString, time_t t) m_bHasMessages = TRUE; } -void wxLogWindow::DoLogString(const char *szString, time_t t) +void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { // put the text into our window wxTextCtrl *pText = m_pLogFrame->TextCtrl(); @@ -823,8 +851,11 @@ void wxLogWindow::DoLogString(const char *szString, time_t t) pText->SetSelection(nLen, nLen); #endif // Windows - pText->WriteText(szString); - pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n") + wxString msg; + TimeStamp(&msg); + msg << szString << _T('\n'); + + pText->AppendText(msg); // TODO ensure that the line can be seen } @@ -864,6 +895,9 @@ wxLogWindow::~wxLogWindow() wxLog *wxLog::ms_pLogger = (wxLog *)NULL; bool wxLog::ms_doLog = TRUE; bool wxLog::ms_bAutoCreate = TRUE; + +const wxChar *wxLog::ms_timestamp = "%X"; // time only, no date + wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; wxArrayString wxLog::ms_aTraceMasks; @@ -924,14 +958,14 @@ unsigned long wxSysErrorCode() } // get error message from system -const char *wxSysErrorMsg(unsigned long nErrCode) +const wxChar *wxSysErrorMsg(unsigned long nErrCode) { if ( nErrCode == 0 ) nErrCode = wxSysErrorCode(); #ifdef __WXMSW__ #ifdef __WIN32__ - static char s_szBuf[LOG_BUFFER_SIZE / 2]; + static wxChar s_szBuf[LOG_BUFFER_SIZE / 2]; // get error message from system LPVOID lpMsgBuf; @@ -942,17 +976,17 @@ const char *wxSysErrorMsg(unsigned long nErrCode) 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'; + wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1); + s_szBuf[WXSIZEOF(s_szBuf) - 1] = _T('\0'); LocalFree(lpMsgBuf); // returned string is capitalized and ended with '\r\n' - bad - s_szBuf[0] = (char)tolower(s_szBuf[0]); - size_t len = strlen(s_szBuf); + 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'; + if ( s_szBuf[len - 2] == _T('\r') ) + s_szBuf[len - 2] = _T('\0'); } return s_szBuf; @@ -961,7 +995,13 @@ const char *wxSysErrorMsg(unsigned long nErrCode) 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(nErrCode); +#endif #endif // Win/Unix } @@ -990,7 +1030,7 @@ void Trap() } // this function is called when an assert fails -void wxOnAssert(const char *szFile, int nLine, const char *szMsg) +void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) { // this variable can be set to true to suppress "assert failure" messages static bool s_bNoAsserts = FALSE; @@ -1007,23 +1047,23 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg) s_bInAssert = TRUE; - char szBuf[LOG_BUFFER_SIZE]; + wxChar szBuf[LOG_BUFFER_SIZE]; // make life easier for people using VC++ IDE: clicking on the message // will take us immediately to the place of the failed assert #ifdef __VISUALC__ - sprintf(szBuf, "%s(%d): assert failed", szFile, nLine); + wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine); #else // !VC++ // make the error message more clear for all the others - sprintf(szBuf, "Assert failed in file %s at line %d", szFile, nLine); + wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine); #endif // VC/!VC if ( szMsg != NULL ) { - strcat(szBuf, ": "); - strcat(szBuf, szMsg); + wxStrcat(szBuf, _T(": ")); + wxStrcat(szBuf, szMsg); } else { - strcat(szBuf, "."); + wxStrcat(szBuf, _T(".")); } if ( !s_bNoAsserts ) { @@ -1035,9 +1075,9 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg) #else // this message is intentionally not translated - it is for // developpers only - strcat(szBuf, "\nDo you want to stop the program?" + wxStrcat(szBuf, _T("\nDo you want to stop the program?" "\nYou can also choose [Cancel] to suppress " - "further warnings."); + "further warnings.")); switch ( wxMessageBox(szBuf, _("Debug"), wxYES_NO | wxCANCEL | wxICON_STOP ) ) {