Skip to content

Rz cons html filter bright foreground background and resets. #6606

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

Open
NewtronReal wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Rz cons html filter bright foreground background and resets. #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9205ef4
cons background and bright colors
NewtronReal Jul 6, 2026
2436d7a
added test cases
NewtronReal Jul 11, 2026
5169f0e
Merge branch 'dev' into rz-cons-html-filter-bg
NewtronReal Jul 11, 2026
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
55 changes: 55 additions & 0 deletions librz/cons/html.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@ static const char *gethtmlcolor(const char ptrch) {
return "";
}

static const char *gethtmlbrightcolor(const char ptrch) {
switch (ptrch) {
case '0': return "#777"; // Bright Black (Gray)
case '1': return "#ff5555"; // Bright Red
case '2': return "#55ff55"; // Bright Green
case '3': return "#ffff55"; // Bright Yellow
case '4': return "#5555ff"; // Bright Blue
case '5': return "#ff55ff"; // Bright Magenta
case '6': return "#55ffff"; // Bright Cyan
case '7': return "#ffffff"; // Bright White
}
return "";
}

// TODO: move into rz_util/str
RZ_API char *rz_cons_html_filter(const char *ptr, int *newlen) {
const char *str = ptr;
Expand Down Expand Up @@ -183,6 +197,14 @@ RZ_API char *rz_cons_html_filter(const char *ptr, int *newlen) {
esc = 0;
continue;
// invert color
} else if (!strncmp(ptr, "39m", 3)) {
// Reset foreground to default
text_color[0] = '\0';
need_to_set = true;
ptr += 2;
str = ptr + 1;
esc = 0;
continue;
} else if (ptr[0] == '3' && ptr[2] == 'm') {
const char *htmlColor = gethtmlcolor(ptr[1]);
if (htmlColor) {
Expand All @@ -193,6 +215,14 @@ RZ_API char *rz_cons_html_filter(const char *ptr, int *newlen) {
str = ptr + 1;
esc = 0;
continue;
} else if (!strncmp(ptr, "49m", 3)) {
// Reset background to default
background_color[0] = '\0';
need_to_set = true;
ptr += 2;
str = ptr + 1;
esc = 0;
continue;
} else if (ptr[0] == '4' && ptr[2] == 'm') {
const char *htmlColor = gethtmlcolor(ptr[1]);
if (htmlColor) {
Expand All @@ -203,6 +233,31 @@ RZ_API char *rz_cons_html_filter(const char *ptr, int *newlen) {
str = ptr + 1;
esc = 0;
continue;
} else if (ptr[0] == '9' && ptr[2] == 'm') {
const char *htmlColor = gethtmlbrightcolor(ptr[1]);
if (htmlColor) {
rz_str_ncpy(text_color, htmlColor, sizeof(text_color));
}
need_to_set = true;
ptr = ptr + 2;
str = ptr + 1;
esc = 0;
continue;
} else if (ptr[0] == '1' &&
ptr[1] == '0' &&
ptr[3] == 'm' &&
ptr[2] >= '0' &&
ptr[2] <= '7') {
const char *htmlColor = gethtmlbrightcolor(ptr[2]);
if (htmlColor) {
rz_str_ncpy(background_color, htmlColor,
sizeof(background_color));
}
need_to_set = true;
ptr = ptr + 3;
str = ptr + 1;
esc = 0;
continue;
}
}
}
Expand Down
76 changes: 76 additions & 0 deletions test/unit/test_cons_html.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,82 @@ bool test_cons_to_html() {
html = rz_cons_html_filter(Color_RED Color_BGGREEN "aaa" Color_RESET_BG Color_RESET "bbb", NULL);
mu_assert_streq_free(html, "<font color='#f00' style='background-color:#0f0'>aaa</font>bbb", "Two different resets opposite order");

/* Bright foreground colors (90-97) */

html = rz_cons_html_filter("\x1b[90mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#777'>Bright&nbsp;foreground</font>", "Bright black");

html = rz_cons_html_filter("\x1b[91mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#ff5555'>Bright&nbsp;foreground</font>", "Bright red");

html = rz_cons_html_filter("\x1b[92mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#55ff55'>Bright&nbsp;foreground</font>", "Bright green");

html = rz_cons_html_filter("\x1b[93mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#ffff55'>Bright&nbsp;foreground</font>", "Bright yellow");

html = rz_cons_html_filter("\x1b[94mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#5555ff'>Bright&nbsp;foreground</font>", "Bright blue");

html = rz_cons_html_filter("\x1b[95mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#ff55ff'>Bright&nbsp;foreground</font>", "Bright magenta");

html = rz_cons_html_filter("\x1b[96mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#55ffff'>Bright&nbsp;foreground</font>", "Bright cyan");

html = rz_cons_html_filter("\x1b[97mBright foreground\x1b[0m", NULL);
mu_assert_streq_free(html, "<font color='#ffffff'>Bright&nbsp;foreground</font>", "Bright white");

/* Bright background colors (100-107) */

html = rz_cons_html_filter("\x1b[100mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#777'>Bright&nbsp;background</font>", "Bright background black");

html = rz_cons_html_filter("\x1b[101mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#ff5555'>Bright&nbsp;background</font>", "Bright background red");

html = rz_cons_html_filter("\x1b[102mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#55ff55'>Bright&nbsp;background</font>", "Bright background green");

html = rz_cons_html_filter("\x1b[103mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#ffff55'>Bright&nbsp;background</font>", "Bright background yellow");

html = rz_cons_html_filter("\x1b[104mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#5555ff'>Bright&nbsp;background</font>", "Bright background blue");

html = rz_cons_html_filter("\x1b[105mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#ff55ff'>Bright&nbsp;background</font>", "Bright background magenta");

html = rz_cons_html_filter("\x1b[106mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#55ffff'>Bright&nbsp;background</font>", "Bright background cyan");

html = rz_cons_html_filter("\x1b[107mBright background\x1b[0m", NULL);
mu_assert_streq_free(html, "<font style='background-color:#ffffff'>Bright&nbsp;background</font>", "Bright background white");

/* Explicit foreground reset (39m) */

html = rz_cons_html_filter("\x1b[91mAA\x1b[39mBB", NULL);
mu_assert_streq_free(html,
"<font color='#ff5555'>AA</font>BB",
"Reset bright foreground");

html = rz_cons_html_filter("\x1b[91m\x1b[42mAA\x1b[39mBB", NULL);
mu_assert_streq_free(html,
"<font color='#ff5555' style='background-color:#0f0'>AA</font>"
"<font style='background-color:#0f0'>BB</font>",
"Reset foreground preserve background");

html = rz_cons_html_filter("\x1b[101mAA\x1b[49mBB", NULL);
mu_assert_streq_free(html,
"<font style='background-color:#ff5555'>AA</font>BB",
"Reset bright background");

html = rz_cons_html_filter("\x1b[91m\x1b[101mAA\x1b[49mBB", NULL);
mu_assert_streq_free(html,
"<font color='#ff5555' style='background-color:#ff5555'>AA</font>"
"<font color='#ff5555'>BB</font>",
"Reset background preserve foreground");

mu_end;
}

Expand Down
Loading