flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Again improved LogReplaceLine

Browse Source 
* Fixed issues on Linux with cursor positioning
* Made preprocessor blocks more readable
* Improved reliability of line clearing on Windows
- Removed an *unneeded* variable
This commit is contained in:
Tiger Wang 2014-02-01 21:44:23 +00:00
parent e26dc5cc0a
commit dd325d742d
2 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Log.cpp
View File

@ -24,8 +24,7 @@
cLog* cLog::s_Log = NULL; cLog* cLog::s_Log = NULL;
cLog::cLog(const AString & a_FileName ) cLog::cLog(const AString & a_FileName )
: m_File(NULL), : m_File(NULL)
m_LastStringSize(0)
{ {
s_Log = this; s_Log = this;
@ -115,6 +114,7 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
time(&rawtime); time(&rawtime);
struct tm* timeinfo; struct tm* timeinfo;
#ifdef _MSC_VER #ifdef _MSC_VER
struct tm timeinforeal; struct tm timeinforeal;
timeinfo = &timeinforeal; timeinfo = &timeinforeal;
@ -129,6 +129,7 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
#else #else
Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#endif #endif
if (m_File) if (m_File)
{ {
fprintf(m_File, "%s\n", Line.c_str()); fprintf(m_File, "%s\n", Line.c_str());
@ -141,56 +142,57 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str()); __android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str());
//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else #else
#ifdef _WIN32
size_t LineLength = Line.length(); size_t LineLength = Line.length();
#ifdef _WIN32
if (m_LastStringSize == 0)
m_LastStringSize = LineLength; // Initialise m_LastStringSize
HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE);
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
GetConsoleScreenBufferInfo(Output, &csbi); GetConsoleScreenBufferInfo(Output, &csbi); // Obtain console window information
if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength) if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength) // Will text overrun width? If so, do not do a replace operation
{ {
printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, add a new line printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, print normally with a newline
return false; return false;
} }
if (LineLength < m_LastStringSize) // If last printed line was longer than current, clear this line for (size_t X = 0; X != (size_t)(csbi.srWindow.Right - csbi.srWindow.Left); ++X)
{ {
for (size_t X = 0; X != m_LastStringSize + 1; ++X) fputs(" ", stdout); // Clear current line in preparation for new text
{
fputs(" ", stdout);
}
} }
#else // _WIN32 #else // _WIN32
struct ttysize ts; // Try to get console width; if text overruns, print normally with a newline
#ifdef TIOCGSIZE #ifdef TIOCGSIZE
struct ttysize ts;
ioctl(STDIN_FILENO, TIOCGSIZE, &ts); ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
if (ts.ts_cols < LineLength) if (ts.ts_cols < LineLength)
{ {
printf("\n%s", Line.c_str());
return false; return false;
} }
#elif defined(TIOCGWINSZ) #elif defined(TIOCGWINSZ)
struct winsize ts;
ioctl(STDIN_FILENO, TIOCGWINSZ, &ts); ioctl(STDIN_FILENO, TIOCGWINSZ, &ts);
if (ts.ts_cols < LineLength)
if (ts.ws_col < LineLength)
{ {
printf("\n%s", Line.c_str());
return false; return false;
} }
#else /* TIOCGSIZE */ #else
printf("\n%s", Line.c_str());
return false; return false;
#endif #endif
fputs("\033[K", stdout); // Clear current line fputs("\033[K", stdout); // Clear current line
#endif #endif // Not _WIN32
printf("\r%s", Line.c_str()); printf("\r%s", Line.c_str());
#ifdef __linux #ifdef __linux
fputs("\033[1B", stdout); // Move down one line fputs("\033[1B", stdout); // Move down one line
#endif // __linux #endif // __linux
m_LastStringSize = LineLength;
#endif // ANDROID_NDK #endif // ANDROID_NDK
#if defined (_WIN32) && defined(_DEBUG) #if defined (_WIN32) && defined(_DEBUG)
@ -241,7 +243,9 @@ void cLog::Log(const char * a_Format, va_list argList)
__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() ); __android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() );
//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else #else
printf("%s", Line.c_str()); // If something requests the current line to be rewritten (LogReplaceLine), on Linux it clears the current line, but that moves the cursor to the end of that line, so we reset it here (\r)
// Doesn't affect anything normally - cursor should already be at beginning of line
printf("\r%s", Line.c_str());
#endif #endif
#if defined (_WIN32) && defined(_DEBUG) #if defined (_WIN32) && defined(_DEBUG)

1
src/Log.h
View File

@ -11,7 +11,6 @@ private:
FILE * m_File; FILE * m_File;
static cLog * s_Log; static cLog * s_Log;
size_t m_LastStringSize;
public: public: