From ecba164dd7531b3717d8ae7318bf149e7acfff9d Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Fri, 26 Jun 2026 17:42:15 +0100 Subject: [PATCH] Rename termcolour --- .../shell/termcolour/posix/termcolour_posix.c | 36 +++++++++---------- src/os/shell/termcolour/termcolour.c | 10 +++--- src/os/shell/termcolour/termcolour.h | 6 ++-- src/os/shell/termcolour/terminal_colours.h | 36 +++++++++---------- src/os/shell/termcolour/win/termcolour_win.c | 36 +++++++++---------- src/testing/tester/tester.c | 10 +++--- 6 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/os/shell/termcolour/posix/termcolour_posix.c b/src/os/shell/termcolour/posix/termcolour_posix.c index 0cc6836..4489d1e 100644 --- a/src/os/shell/termcolour/posix/termcolour_posix.c +++ b/src/os/shell/termcolour/posix/termcolour_posix.c @@ -10,26 +10,26 @@ #include wp_intern WpStr8RO colours[COUNT_TERM_COLOUR] = { - [WAPP_TERM_COLOUR_FG_BLACK] = wpStr8LitRoInitialiserList("\033[30m"), - [WAPP_TERM_COLOUR_FG_RED] = wpStr8LitRoInitialiserList("\033[31m"), - [WAPP_TERM_COLOUR_FG_GREEN] = wpStr8LitRoInitialiserList("\033[32m"), - [WAPP_TERM_COLOUR_FG_BLUE] = wpStr8LitRoInitialiserList("\033[34m"), - [WAPP_TERM_COLOUR_FG_CYAN] = wpStr8LitRoInitialiserList("\033[36m"), - [WAPP_TERM_COLOUR_FG_MAGENTA] = wpStr8LitRoInitialiserList("\033[35m"), - [WAPP_TERM_COLOUR_FG_YELLOW] = wpStr8LitRoInitialiserList("\033[33m"), - [WAPP_TERM_COLOUR_FG_WHITE] = wpStr8LitRoInitialiserList("\033[37m"), - [WAPP_TERM_COLOUR_FG_BR_BLACK] = wpStr8LitRoInitialiserList("\033[90m"), - [WAPP_TERM_COLOUR_FG_BR_RED] = wpStr8LitRoInitialiserList("\033[91m"), - [WAPP_TERM_COLOUR_FG_BR_GREEN] = wpStr8LitRoInitialiserList("\033[92m"), - [WAPP_TERM_COLOUR_FG_BR_BLUE] = wpStr8LitRoInitialiserList("\033[94m"), - [WAPP_TERM_COLOUR_FG_BR_CYAN] = wpStr8LitRoInitialiserList("\033[96m"), - [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wpStr8LitRoInitialiserList("\033[95m"), - [WAPP_TERM_COLOUR_FG_BR_YELLOW] = wpStr8LitRoInitialiserList("\033[93m"), - [WAPP_TERM_COLOUR_FG_BR_WHITE] = wpStr8LitRoInitialiserList("\033[97m"), - [WAPP_TERM_COLOUR_CLEAR] = wpStr8LitRoInitialiserList("\033[0m"), + [WP_TERM_COLOUR_FG_BLACK] = wpStr8LitRoInitialiserList("\033[30m"), + [WP_TERM_COLOUR_FG_RED] = wpStr8LitRoInitialiserList("\033[31m"), + [WP_TERM_COLOUR_FG_GREEN] = wpStr8LitRoInitialiserList("\033[32m"), + [WP_TERM_COLOUR_FG_BLUE] = wpStr8LitRoInitialiserList("\033[34m"), + [WP_TERM_COLOUR_FG_CYAN] = wpStr8LitRoInitialiserList("\033[36m"), + [WP_TERM_COLOUR_FG_MAGENTA] = wpStr8LitRoInitialiserList("\033[35m"), + [WP_TERM_COLOUR_FG_YELLOW] = wpStr8LitRoInitialiserList("\033[33m"), + [WP_TERM_COLOUR_FG_WHITE] = wpStr8LitRoInitialiserList("\033[37m"), + [WP_TERM_COLOUR_FG_BR_BLACK] = wpStr8LitRoInitialiserList("\033[90m"), + [WP_TERM_COLOUR_FG_BR_RED] = wpStr8LitRoInitialiserList("\033[91m"), + [WP_TERM_COLOUR_FG_BR_GREEN] = wpStr8LitRoInitialiserList("\033[92m"), + [WP_TERM_COLOUR_FG_BR_BLUE] = wpStr8LitRoInitialiserList("\033[94m"), + [WP_TERM_COLOUR_FG_BR_CYAN] = wpStr8LitRoInitialiserList("\033[96m"), + [WP_TERM_COLOUR_FG_BR_MAGENTA] = wpStr8LitRoInitialiserList("\033[95m"), + [WP_TERM_COLOUR_FG_BR_YELLOW] = wpStr8LitRoInitialiserList("\033[93m"), + [WP_TERM_COLOUR_FG_BR_WHITE] = wpStr8LitRoInitialiserList("\033[97m"), + [WP_TERM_COLOUR_CLEAR] = wpStr8LitRoInitialiserList("\033[0m"), }; -void print_coloured_text(WpStr8RO *text, TerminalColour colour) { +void _printColouredText(WpStr8RO *text, WpTerminalColour colour) { printf(WP_STR8_SPEC WP_STR8_SPEC, wpStr8Varg(colours[colour]), wpStr8Varg((*text))); } diff --git a/src/os/shell/termcolour/termcolour.c b/src/os/shell/termcolour/termcolour.c index 63153af..a3da8fb 100644 --- a/src/os/shell/termcolour/termcolour.c +++ b/src/os/shell/termcolour/termcolour.c @@ -4,15 +4,15 @@ #include "terminal_colours.h" #include "../../../base/strings/str8/str8.h" -void wapp_shell_termcolour_print_text(WpStr8RO *text, TerminalColour colour) { - if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) { +void wpShellTermcolourPrintText(WpStr8RO *text, WpTerminalColour colour) { + if (colour < WP_TERM_COLOUR_FG_BLACK || colour > WP_TERM_COLOUR_FG_BR_WHITE) { return; } - print_coloured_text(text, colour); + _printColouredText(text, colour); } -void wapp_shell_termcolour_clear_colour(void) { +void wpShellTermcolourClearColour(void) { WpStr8RO empty = wpStr8LitRo(""); - print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR); + _printColouredText(&empty, WP_TERM_COLOUR_CLEAR); } diff --git a/src/os/shell/termcolour/termcolour.h b/src/os/shell/termcolour/termcolour.h index 3e1b314..9343da4 100644 --- a/src/os/shell/termcolour/termcolour.h +++ b/src/os/shell/termcolour/termcolour.h @@ -14,10 +14,10 @@ BEGIN_C_LINKAGE // TODO (Abdelrahman): Look into moving away from stdio in the implementation -void wapp_shell_termcolour_print_text(WpStr8RO *text, TerminalColour colour); -void wapp_shell_termcolour_clear_colour(void); +void wpShellTermcolourPrintText(WpStr8RO *text, WpTerminalColour colour); +void wpShellTermcolourClearColour(void); -wp_extern void print_coloured_text(WpStr8RO *text, TerminalColour colour); +wp_extern void _printColouredText(WpStr8RO *text, WpTerminalColour colour); #ifdef WP_PLATFORM_CPP END_C_LINKAGE diff --git a/src/os/shell/termcolour/terminal_colours.h b/src/os/shell/termcolour/terminal_colours.h index 20a78f9..6c1a328 100644 --- a/src/os/shell/termcolour/terminal_colours.h +++ b/src/os/shell/termcolour/terminal_colours.h @@ -11,26 +11,26 @@ BEGIN_C_LINKAGE #endif // !WP_PLATFORM_CPP typedef enum { - WAPP_TERM_COLOUR_FG_BLACK, - WAPP_TERM_COLOUR_FG_RED, - WAPP_TERM_COLOUR_FG_GREEN, - WAPP_TERM_COLOUR_FG_BLUE, - WAPP_TERM_COLOUR_FG_CYAN, - WAPP_TERM_COLOUR_FG_MAGENTA, - WAPP_TERM_COLOUR_FG_YELLOW, - WAPP_TERM_COLOUR_FG_WHITE, - WAPP_TERM_COLOUR_FG_BR_BLACK, - WAPP_TERM_COLOUR_FG_BR_RED, - WAPP_TERM_COLOUR_FG_BR_GREEN, - WAPP_TERM_COLOUR_FG_BR_BLUE, - WAPP_TERM_COLOUR_FG_BR_CYAN, - WAPP_TERM_COLOUR_FG_BR_MAGENTA, - WAPP_TERM_COLOUR_FG_BR_YELLOW, - WAPP_TERM_COLOUR_FG_BR_WHITE, - WAPP_TERM_COLOUR_CLEAR, + WP_TERM_COLOUR_FG_BLACK, + WP_TERM_COLOUR_FG_RED, + WP_TERM_COLOUR_FG_GREEN, + WP_TERM_COLOUR_FG_BLUE, + WP_TERM_COLOUR_FG_CYAN, + WP_TERM_COLOUR_FG_MAGENTA, + WP_TERM_COLOUR_FG_YELLOW, + WP_TERM_COLOUR_FG_WHITE, + WP_TERM_COLOUR_FG_BR_BLACK, + WP_TERM_COLOUR_FG_BR_RED, + WP_TERM_COLOUR_FG_BR_GREEN, + WP_TERM_COLOUR_FG_BR_BLUE, + WP_TERM_COLOUR_FG_BR_CYAN, + WP_TERM_COLOUR_FG_BR_MAGENTA, + WP_TERM_COLOUR_FG_BR_YELLOW, + WP_TERM_COLOUR_FG_BR_WHITE, + WP_TERM_COLOUR_CLEAR, COUNT_TERM_COLOUR, -} TerminalColour; +} WpTerminalColour; #ifdef WP_PLATFORM_CPP END_C_LINKAGE diff --git a/src/os/shell/termcolour/win/termcolour_win.c b/src/os/shell/termcolour/win/termcolour_win.c index 63c3f56..af8e911 100644 --- a/src/os/shell/termcolour/win/termcolour_win.c +++ b/src/os/shell/termcolour/win/termcolour_win.c @@ -25,31 +25,31 @@ struct TermcolourData { wp_intern void init_data(TermcolourData *data); wp_intern WORD colours[COUNT_TERM_COLOUR] = { - [WAPP_TERM_COLOUR_FG_BLACK] = 0, - [WAPP_TERM_COLOUR_FG_RED] = FOREGROUND_RED, - [WAPP_TERM_COLOUR_FG_GREEN] = FOREGROUND_GREEN, - [WAPP_TERM_COLOUR_FG_BLUE] = FOREGROUND_BLUE, - [WAPP_TERM_COLOUR_FG_CYAN] = FOREGROUND_GREEN | FOREGROUND_BLUE, - [WAPP_TERM_COLOUR_FG_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE, - [WAPP_TERM_COLOUR_FG_YELLOW] = FOREGROUND_RED | FOREGROUND_GREEN, - [WAPP_TERM_COLOUR_FG_WHITE] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, - [WAPP_TERM_COLOUR_FG_BR_BLACK] = FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_RED] = FOREGROUND_RED | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_GREEN] = FOREGROUND_GREEN | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_BLUE] = FOREGROUND_BLUE | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_CYAN] = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_YELLOW] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, - [WAPP_TERM_COLOUR_FG_BR_WHITE] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BLACK] = 0, + [WP_TERM_COLOUR_FG_RED] = FOREGROUND_RED, + [WP_TERM_COLOUR_FG_GREEN] = FOREGROUND_GREEN, + [WP_TERM_COLOUR_FG_BLUE] = FOREGROUND_BLUE, + [WP_TERM_COLOUR_FG_CYAN] = FOREGROUND_GREEN | FOREGROUND_BLUE, + [WP_TERM_COLOUR_FG_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE, + [WP_TERM_COLOUR_FG_YELLOW] = FOREGROUND_RED | FOREGROUND_GREEN, + [WP_TERM_COLOUR_FG_WHITE] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, + [WP_TERM_COLOUR_FG_BR_BLACK] = FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_RED] = FOREGROUND_RED | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_GREEN] = FOREGROUND_GREEN | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_BLUE] = FOREGROUND_BLUE | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_CYAN] = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_YELLOW] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, + [WP_TERM_COLOUR_FG_BR_WHITE] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, }; -void print_coloured_text(WpStr8RO *text, TerminalColour colour) { +void _printColouredText(WpStr8RO *text, WpTerminalColour colour) { wp_persist TermcolourData data = {0}; if (data.handle == 0) { init_data(&data); } - if (colour == WAPP_TERM_COLOUR_CLEAR) { + if (colour == WP_TERM_COLOUR_CLEAR) { data.current_colour = data.default_colour; } else { data.current_colour = colours[colour]; diff --git a/src/testing/tester/tester.c b/src/testing/tester/tester.c index a4229fd..d80e534 100644 --- a/src/testing/tester/tester.c +++ b/src/testing/tester/tester.c @@ -33,20 +33,20 @@ void _runTests(WpTestFunc *func1, ...) { } wp_intern void handleTestResult(WpTestFuncResult result) { - TerminalColour colour; + WpTerminalColour colour; WpStr8 result_text = wpStr8Buf(64); if (result.passed) { - colour = WAPP_TERM_COLOUR_FG_BR_GREEN; + colour = WP_TERM_COLOUR_FG_BR_GREEN; wpStr8CopyCstrCapped(&result_text, "PASSED"); } else { - colour = WAPP_TERM_COLOUR_FG_BR_RED; + colour = WP_TERM_COLOUR_FG_BR_RED; wpStr8CopyCstrCapped(&result_text, "FAILED"); } printf("["); - wapp_shell_termcolour_print_text(&result_text, colour); - wapp_shell_termcolour_clear_colour(); + wpShellTermcolourPrintText(&result_text, colour); + wpShellTermcolourClearColour(); printf("] " WP_STR8_SPEC "\n", wpStr8Varg(result.name)); if (!result.passed) {