aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-23 15:46:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1051 Fixed some display problems

Browse source
This commit is contained in:
kervala 2010-10-10 23:12:37 +02:00
parent 30f5782a1d
commit d5a512b55b
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
code/ryzom/tools/client/client_patcher/main.cpp
View file

@ -78,40 +78,54 @@ void printCheck(const std::string &str)
void printDownload(const std::string &str) void printDownload(const std::string &str)
{ {
static uint previousLength = 0; static char spaces[80];
static const uint maxLength = 160; uint maxLength = 80;
static char spaces[maxLength];
// if "COLUMNS" environnement variable is defined, use it
if (getenv("COLUMNS"))
{
NLMISC::fromString(std::string(getenv("COLUMNS")), maxLength);
}
// only use 79 columns to not wrap
--maxLength;
// temporary modified string
std::string nstr = str;
uint length = 0; uint length = 0;
if (useUtf8) if (useUtf8)
{ {
ucstring utf8Str; ucstring ucstr;
utf8Str.fromUtf8(str); ucstr.fromUtf8(nstr);
length = (uint)utf8Str.length(); length = (uint)ucstr.length();
if (length > maxLength)
{
ucstr = ucstr.luabind_substr(length - maxLength - 3);
nstr = std::string("...") + ucstr.toUtf8();
length = maxLength;
}
} }
else else
{ {
length = (uint)str.length(); length = (uint)nstr.length();
if (length > maxLength)
{
nstr = std::string("...") + nstr.substr(length - maxLength - 3);
length = maxLength;
}
} }
sint diff = length - previousLength; // add padding with spaces
memset(spaces, ' ', maxLength);
if (diff > 0 && length < maxLength) spaces[maxLength - length] = '\0';
{
memset(spaces, ' ', length);
spaces[length] = '\0';
// "erase" previous line
printf("%s\r", spaces);
fflush(stdout);
}
// display download in purple // display download in purple
if (useEsc) if (useEsc)
{ {
printf("\033[1;35m%s\033[0m\r", str.c_str()); printf("\033[1;35m%s%s\033[0m\r", nstr.c_str(), spaces);
} }
else else
{ {
@ -120,17 +134,15 @@ void printDownload(const std::string &str)
SetConsoleTextAttribute(hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_INTENSITY); SetConsoleTextAttribute(hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_INTENSITY);
#endif #endif
printf("%s\r", str.c_str()); printf("%s%s\r", nstr.c_str(), spaces);
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
if (hStdout != INVALID_HANDLE_VALUE && hStdout) if (hStdout != INVALID_HANDLE_VALUE && hStdout)
SetConsoleTextAttribute(hStdout, attributes); SetConsoleTextAttribute(hStdout, attributes);
#endif #endif
} }
fflush(stdout);
previousLength = length; fflush(stdout);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -168,7 +180,7 @@ int main(int argc, char *argv[])
std::string lang = toLower(std::string(setlocale(LC_CTYPE, ""))); std::string lang = toLower(std::string(setlocale(LC_CTYPE, "")));
useUtf8 = (lang.find("utf8") != string::npos || lang.find("utf-8") != string::npos); useUtf8 = (lang.find("utf8") != string::npos || lang.find("utf-8") != string::npos);
lang = lang.substr(0, 2); lang = lang.substr(0, 2);
// check if console supports colors // check if console supports colors
std::string term = toLower(std::string(getenv("TERM") ? getenv("TERM"):"")); std::string term = toLower(std::string(getenv("TERM") ? getenv("TERM"):""));
useEsc = (term.find("xterm") != string::npos || term.find("linux") != string::npos); useEsc = (term.find("xterm") != string::npos || term.find("linux") != string::npos);