abdelrahman/wizapp-stdlib
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move termcolour to shell

Browse Source
This commit is contained in:
Abdelrahman Said 2024-06-16 23:17:54 +01:00
parent 25ab75f74f
commit 4fc99f76a5
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/termcolour/termcolour.c → src/common/shell/termcolour/termcolour.c
View File

@ -54,7 +54,7 @@ internal const char *colours[COUNT_TERM_COLOUR] = {
}; };
#endif /* ifdef WAPP_PLATFORM_WINDOWS */ #endif /* ifdef WAPP_PLATFORM_WINDOWS */
TerminalColourist wapp_termcolour_get_colourist(void) { TerminalColourist wapp_shell_termcolour_get_colourist(void) {
TerminalColourist colourist; TerminalColourist colourist;
#ifdef WAPP_PLATFORM_WINDOWS #ifdef WAPP_PLATFORM_WINDOWS
@ -74,8 +74,8 @@ TerminalColourist wapp_termcolour_get_colourist(void) {
return colourist; return colourist;
} }
void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text, void wapp_shell_termcolour_print_text(TerminalColourist *colourist,
TerminalColour colour) { const char *text, TerminalColour colour) {
if (colour < WAPP_TERM_COLOUR_FG_BLACK || if (colour < WAPP_TERM_COLOUR_FG_BLACK ||
colour > WAPP_TERM_COLOUR_FG_BR_WHITE) { colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
return; return;
@ -85,7 +85,7 @@ void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text,
print_coloured_text(colourist, text); print_coloured_text(colourist, text);
} }
void wapp_termcolour_clear_colour(TerminalColourist *colourist) { void wapp_shell_termcolour_clear_colour(TerminalColourist *colourist) {
colourist->current_colour = colourist->default_colour; colourist->current_colour = colourist->default_colour;
print_coloured_text(colourist, ""); print_coloured_text(colourist, "");
} }

16
src/common/termcolour/termcolour.h → src/common/shell/termcolour/termcolour.h
View File

@ -5,6 +5,10 @@
#include "misc_utils.h" #include "misc_utils.h"
#include "platform.h" #include "platform.h"
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
typedef enum { typedef enum {
WAPP_TERM_COLOUR_FG_BLACK, WAPP_TERM_COLOUR_FG_BLACK,
WAPP_TERM_COLOUR_FG_RED, WAPP_TERM_COLOUR_FG_RED,
@ -48,9 +52,13 @@ struct terminal_colourist {
#endif // WAPP_PLATFORM_WINDOWS #endif // WAPP_PLATFORM_WINDOWS
// clang-format on // clang-format on
TerminalColourist wapp_termcolour_get_colourist(void); TerminalColourist wapp_shell_termcolour_get_colourist(void);
void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text, void wapp_shell_termcolour_print_text(TerminalColourist *colourist,
TerminalColour colour); const char *text, TerminalColour colour);
void wapp_termcolour_clear_colour(TerminalColourist *colourist); void wapp_shell_termcolour_clear_colour(TerminalColourist *colourist);
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // !TERM_COLOUR_H #endif // !TERM_COLOUR_H

6
src/tester/tester.c
View File

@ -10,7 +10,7 @@ internal void handle_test_result(TerminalColourist *colourist,
TestFuncResult result); TestFuncResult result);
void run_tests(TestFunc *func1, ...) { void run_tests(TestFunc *func1, ...) {
TerminalColourist colourist = wapp_termcolour_get_colourist(); TerminalColourist colourist = wapp_shell_termcolour_get_colourist();
printf("\n"); printf("\n");
@ -47,8 +47,8 @@ internal void handle_test_result(TerminalColourist *colourist,
} }
printf("["); printf("[");
wapp_termcolour_print_text(colourist, result_text, colour); wapp_shell_termcolour_print_text(colourist, result_text, colour);
wapp_termcolour_clear_colour(colourist); wapp_shell_termcolour_clear_colour(colourist);
printf("] %s\n", result.name); printf("] %s\n", result.name);
if (!result.passed) { if (!result.passed) {