edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unicode support for console output on windows

Browse source 
Hints regarding the unicode support were taken from the libuv project, which
really helped.

Conflicts:
	src/base/system.c
This commit is contained in:
heinrich5991 2014-04-08 10:56:59 +02:00 committed by def
parent 7e89917ddd
commit 92cdb15679
1 changed files with 72 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/base/system.c
View file

@ -239,6 +239,78 @@ void dbg_msg(const char *sys, const char *fmt, ...)
static void logger_stdout(const char *line)
{
#if defined(CONF_FAMILY_WINDOWS)
static const size_t MAX_LENGTH = 1024;
static const size_t MAX_LENGTH_ERROR = 1024 + 32;
static const int UNICODE_REPLACEMENT_CHAR = 0xfffd;
static const char *STR_TOO_LONG = "(str too long)";
static const char *INVALID_UTF8 = "(invalid utf8)";
wchar_t wline[MAX_LENGTH_ERROR];
size_t len = 0;
const char *read = line;
const char *error = STR_TOO_LONG;
while(len < MAX_LENGTH)
{
// Read a character. This also advances the read pointer
int glyph = str_utf8_decode(&read);
if(glyph < 0)
{
// If there was an error decoding the UTF-8 sequence,
// emit a replacement character. Since the
// str_utf8_decode function will not work after such
// an error, end the string here.
glyph = UNICODE_REPLACEMENT_CHAR;
error = INVALID_UTF8;
}
else if(glyph == 0)
{
// A character code of 0 signals the end of the string.
error = 0;
break;
}
else if(glyph > 0xffff)
{
// Since the windows console does not really support
// UTF-16, don't mind doing actual UTF-16 encoding,
// but rather emit a replacement character.
glyph = UNICODE_REPLACEMENT_CHAR;
}
// Again, since the windows console does not really support
// UTF-16, but rather something along the lines of UCS-2,
// simply put the character into the output.
wline[len++] = glyph;
}
if(error)
{
read = error;
while(1)
{
// Errors are simple ascii, no need for UTF-8
// decoding
char character = *read;
if(character == 0)
break;
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for error");
wline[len++] = character;
read++;
}
}
// Terminate the line
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for \\r");
wline[len++] = '\r';
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for \\n");
wline[len++] = '\n';
// Ignore any error that might occur
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wline, len, 0, 0);
#else
printf("%s\n", line);
fflush(stdout);
#if defined(__ANDROID__)