Fix video ANSI coloring

mentos-team · Aug 23, 2024 · 69dae6b · 69dae6b
1 parent 11229aa
commit 69dae6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/mentos/src/io/video.c b/mentos/src/io/video.c
@@ -7,6 +7,7 @@
 #include "ctype.h"
 #include "io/vga/vga.h"
 #include "io/video.h"
+#include "io/debug.h"
 #include "stdbool.h"
 #include "stdio.h"
 #include "string.h"
@@ -27,6 +28,8 @@ struct ansi_color_map_t {
 }
 /// @brief The mapping.
 ansi_color_map[] = {
+    { 0, 7 },
+
     { 30, 0 },
     { 31, 4 },
     { 32, 2 },
@@ -61,9 +64,7 @@ ansi_color_map[] = {
     { 104, 9 },
     { 105, 13 },
     { 106, 11 },
-    { 107, 15 },
-
-    { 0, 0 }
+    { 107, 15 }
 };
 
 /// Pointer to a position of the screen writer.
@@ -111,17 +112,18 @@ static inline void __draw_char(char c)
 /// @param ansi_code The ansi code describing background and foreground color.
 static inline void __set_color(uint8_t ansi_code)
 {
-    struct ansi_color_map_t *it = ansi_color_map;
-    while (it->ansi_color != 0) {
-        if (ansi_code == it->ansi_color) {
-            if (((ansi_code >= 30) && (ansi_code <= 37)) || ((ansi_code >= 90) && (ansi_code <= 97))) {
-                color = (color & 0xF0U) | it->video_color;
+    for (size_t i = 0; i < count_of(ansi_color_map); ++i) {
+        if (ansi_code == ansi_color_map[i].ansi_color) {
+            if (
+                (ansi_code == 0) ||
+                ((ansi_code >= 30) && (ansi_code <= 37)) ||
+                ((ansi_code >= 90) && (ansi_code <= 97))) {
+                color = (color & 0xF0U) | ansi_color_map[i].video_color;
             } else {
-                color = (color & 0x0FU) | (it->video_color << 4U);
+                color = (color & 0x0FU) | (ansi_color_map[i].video_color << 4U);
             }
             break;
         }
-        ++it;
     }
 }
 

diff --git a/programs/shell.c b/programs/shell.c
@@ -177,7 +177,7 @@ static inline void __prompt_print(void)
     } else {
         HOSTNAME = buffer.nodename;
     }
-    printf(FG_GREEN "%s" FG_WHITE "@" FG_CYAN "%s " FG_BLUE_BRIGHT "[%02d:%02d:%02d]" FG_WHITE " [%s] " FG_WHITE_BRIGHT "\n-> %% ",
+    printf(FG_GREEN "%s" FG_WHITE "@" FG_CYAN "%s " FG_BLUE_BRIGHT "[%02d:%02d:%02d]" FG_WHITE " [%s] " FG_RESET "\n-> %% ",
            USER, HOSTNAME, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, CWD);
 }