Skip to content

Fix ANSI escape color codes #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fincs merged 2 commits into from
May 7, 2025
Merged

Fix ANSI escape color codes #570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eeb934
Test ansi escape RGB fix
Golem642 Apr 20, 2025
0b655da
Fix escape color codes
Golem642 Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions libctru/source/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,17 +366,17 @@ static void consoleHandleColorEsc(int code)
}
break;
case ESC_BUILDING_FORMAT_FG:
if (escapeSeq.color.args[0] == 5)
if (code == 5)
escapeSeq.state = ESC_BUILDING_FORMAT_FG_NONRGB;
else if (escapeSeq.color.args[0] == 2)
else if (code == 2)
escapeSeq.state = ESC_BUILDING_FORMAT_FG_RGB;
else
escapeSeq.state = ESC_BUILDING_FORMAT_UNKNOWN;
break;
case ESC_BUILDING_FORMAT_BG:
if (escapeSeq.color.args[0] == 5)
if (code == 5)
escapeSeq.state = ESC_BUILDING_FORMAT_BG_NONRGB;
else if (escapeSeq.color.args[0] == 2)
else if (code == 2)
escapeSeq.state = ESC_BUILDING_FORMAT_BG_RGB;
else
escapeSeq.state = ESC_BUILDING_FORMAT_UNKNOWN;
Expand Down Expand Up @@ -448,6 +448,7 @@ static void consoleColorStateShift(void)
if (escapeSeq.hasArg[1])
consoleHandleColorEsc(escapeSeq.color.args[1]);
escapeSeq.argIdx = 0;
escapeSeq.rawBuf[0] = escapeSeq.rawBuf[1] = 0;
escapeSeq.hasArg[0] = escapeSeq.hasArg[1] = false;
break;
case ESC_BUILDING_FORMAT_BG:
Expand All @@ -456,11 +457,12 @@ static void consoleColorStateShift(void)
case ESC_BUILDING_FORMAT_BG_NONRGB:
consoleHandleColorEsc(escapeSeq.color.args[0]);
escapeSeq.argIdx = 0;
escapeSeq.rawBuf[0] = escapeSeq.rawBuf[1] = 0;
escapeSeq.hasArg[0] = escapeSeq.hasArg[1] = false;
break;
case ESC_BUILDING_FORMAT_FG_RGB:
case ESC_BUILDING_FORMAT_BG_RGB:
if (escapeSeq.argIdx < 3)
if (escapeSeq.argIdx < 2)
escapeSeq.argIdx++;
else
consoleHandleColorEsc(0); // Nothing passed here because three RGB items
Expand Down Expand Up @@ -538,7 +540,7 @@ ssize_t con_write(struct _reent *r,void *fd,const char *ptr, size_t len) {
escapeSeq.rawBuf[escapeSeq.argIdx] = escapeSeq.rawBuf[escapeSeq.argIdx] * 10 + (chr - '0');
break;
case ';':
if (escapeSeq.argIdx < 2)
if (escapeSeq.argIdx < 1)
escapeSeq.argIdx++;
else
consoleColorStateShift();
Expand Down Expand Up @@ -836,7 +838,13 @@ void consoleDrawChar(int c) {
}

if (!(currentConsole->flags & CONSOLE_BG_CUSTOM)) {
bg = colorTable[bg];
if (currentConsole->flags & CONSOLE_COLOR_BOLD) {
bg = colorTable[bg + 8];
} else if (currentConsole->flags & CONSOLE_COLOR_FAINT) {
bg = colorTable[bg + 16];
} else {
bg = colorTable[bg];
}
}

if (currentConsole->flags & CONSOLE_COLOR_REVERSE) {
Expand Down