3 files changed, 356 insertions, 69 deletions

diff --git a/sys/dev/cons/cons.c b/sys/dev/cons/cons.c
index b89727f..8470a60 100644
--- a/sys/dev/cons/cons.c
+++ b/sys/dev/cons/cons.c
@@ -44,7 +44,7 @@
     cons_draw_cursor((SCR), (SCR)->bg)
 
 #define SHOW_CURSOR(SCR) \
-    cons_draw_cursor((SCR), (SCR)->fg)
+    cons_draw_cursor((SCR), rgb_invert((SCR)->bg))
 
 /* Console background from kconf */
 #if defined(__CONSOLE_BG)
@@ -65,7 +65,23 @@ static struct cdevsw cons_cdevsw;
 
 static void cons_draw_cursor(struct cons_screen *scr, uint32_t color);
 static int cons_handle_special(struct cons_screen *scr, char c);
-static void cons_clear_scr(struct cons_screen *scr, uint32_t bg);
+
+static uint32_t
+rgb_invert(uint32_t rgb)
+{
+    uint8_t r, g, b;
+    uint32_t ret;
+
+    r = (rgb >> 16) & 0xFF;
+    g = (rgb >> 8) & 0xFF;
+    b = rgb & 0xFF;
+
+    ret = (255 - r) << 16;
+    ret |= (255 - g) << 8;
+    ret |= 255 - b;
+    return ret;
+}
+
 
 /*
  * Render a character onto the screen.
@@ -91,9 +107,9 @@ cons_draw_char(struct cons_screen *scr, struct cons_char ch)
     y = ch.y;
 
     for (uint32_t cy = 0; cy < FONT_HEIGHT; ++cy) {
+        idx = fbdev_get_index(&scr->fbdev, x + (FONT_WIDTH - 1), y + cy);
         for (uint32_t cx = 0; cx < FONT_WIDTH; ++cx) {
-            idx = fbdev_get_index(&scr->fbdev, x + (FONT_WIDTH - 1) - cx, y + cy);
-            scr->fb_mem[idx] = ISSET(glyph[cy], BIT(cx)) ? ch.fg : ch.bg;
+            scr->fb_mem[idx--] = ISSET(glyph[cy], BIT(cx)) ? ch.fg : ch.bg;
         }
     }
 }
@@ -158,6 +174,17 @@ cons_handle_special(struct cons_screen *scr, char c)
     }
 
     switch (c) {
+    case ASCII_HT:
+        HIDE_CURSOR(scr);
+        scr->curs_col += 4;
+        scr->ch_col += 4;
+        if (scr->ch_col >= scr->ncols - 1) {
+           cons_handle_special(scr, '\n');
+        }
+        SHOW_CURSOR(scr);
+        return 0;
+    case ASCII_NUL:
+        return 0;
     case ASCII_BS:
         bp = scr->ob[scr->ch_row];
         if (bp->head > bp->tail) {
@@ -165,27 +192,21 @@ cons_handle_special(struct cons_screen *scr, char c)
         }
 
         HIDE_CURSOR(scr);
-        --scr->ch_col;
-        --scr->curs_col;
+        if (scr->ch_col > 0 && scr->curs_col > 0) {
+            --scr->ch_col;
+            --scr->curs_col;
+        }
         SHOW_CURSOR(scr);
         return 0;
     case ASCII_LF:
-        HIDE_CURSOR(scr);
-
         /* Are we past screen width? */
         if (scr->ch_row >= scr->nrows - 1) {
             cons_clear_scr(scr, scr->bg);
-            cons_flush(scr);
-            scr->ch_col = 0;
-            scr->ch_row = 0;
-
-            /* Update cursor */
-            scr->curs_row = 0;
-            scr->curs_col = 0;
-            SHOW_CURSOR(scr);
             return 0;
         }
 
+        HIDE_CURSOR(scr);
+
         /* Make a newline */
         cons_flush(scr);
         ++scr->ch_row;
@@ -221,9 +242,9 @@ cons_draw_cursor(struct cons_screen *scr, uint32_t color)
     }
 
     for (uint32_t cy = 0; cy < FONT_HEIGHT; ++cy) {
+        idx = fbdev_get_index(&scr->fbdev, scr->curs_col * FONT_WIDTH, (scr->curs_row * FONT_HEIGHT) + cy);
         for (uint32_t cx = 0; cx < FONT_WIDTH; ++cx) {
-            idx = fbdev_get_index(&scr->fbdev, (scr->curs_col * FONT_WIDTH) + cx, (scr->curs_row * FONT_HEIGHT) + cy);
-            scr->fb_mem[idx] = color;
+            scr->fb_mem[idx++] = color;
         }
     }
 }
@@ -234,34 +255,87 @@ cons_draw_cursor(struct cons_screen *scr, uint32_t color)
  * @scr: Screen to clear.
  * @bg: Color to clear it to.
  */
-static void
+void
 cons_clear_scr(struct cons_screen *scr, uint32_t bg)
 {
     struct fbdev fbdev = scr->fbdev;
-    struct cons_buf *bp;
+
+    cons_flush(scr);
+    HIDE_CURSOR(scr);
+
+    scr->ch_col = 0;
+    scr->ch_row = 0;
+    scr->curs_col = 0;
+    scr->curs_row = 0;
 
     for (size_t i = 0; i < fbdev.height * fbdev.pitch; ++i) {
         scr->fb_mem[i] = bg;
     }
 
-    bp = scr->ob[scr->nrows - 1];
-    bp->flags |= CONS_BUF_CLEAN;
+    SHOW_CURSOR(scr);
+
 }
 
 /*
- * Character device function.
+ * Quickly put a character on the screen.
+ * XXX: Does not acquire the screen's lock or show/hide the cursor.
+ *
+ * @scr: Screen.
+ * @c: Character to draw.
  */
-static int
-dev_write(dev_t dev, struct sio_txn *sio, int flags)
+static void
+cons_fast_putch(struct cons_screen *scr, char c)
 {
-    char *p;
+    struct cons_char cc;
+    struct cons_buf *bp;
+    int ansi;
+
+    ansi = ansi_feed(&scr->ansi_s, c);
+    if (ansi > 0) {
+        c = ASCII_NUL;
+    } else if (ansi < 0) {
+        c = ASCII_NUL;
+    }
+
+    /* Handle specials */
+    if (cons_handle_special(scr, c) == 0) {
+        return;
+    }
+
+    /* Create a new character */
+    cc.c = c;
+    cc.fg = scr->fg;
+    cc.bg = scr->bg;
+    cc.x = scr->ch_col * FONT_WIDTH;
+    cc.y = scr->ch_row * FONT_HEIGHT;
+
+    /* Push our new character */
+    bp = scr->ob[scr->ch_row];
+    bp->flags &= ~CONS_BUF_CLEAN;
+    cons_obuf_push(bp, cc);
+    ++scr->ch_col;
 
-    p = sio->buf;
+    /* Check screen bounds */
+    if (cc.x >= (scr->ncols * FONT_WIDTH) - 1) {
+        scr->ch_col = 0;
+        ++scr->ch_row;
+    }
 
-    for (size_t i = 0; i < sio->len; ++i) {
-        cons_putch(&g_root_scr, p[i]);
+    ++scr->curs_col;
+    if (scr->curs_col > scr->ncols - 1) {
+        scr->curs_col = 0;
+        if (scr->curs_row < scr->nrows)
+            ++scr->curs_row;
     }
+}
 
+/*
+ * Character device function.
+ */
+static int
+dev_write(dev_t dev, struct sio_txn *sio, int flags)
+{
+    cons_putstr(&g_root_scr, sio->buf, sio->len);
     cons_flush(&g_root_scr);
     return sio->len;
 }
@@ -339,6 +413,34 @@ cons_init_bufs(struct cons_screen *scr)
 }
 
 /*
+ * Reset console color.
+ */
+void
+cons_reset_color(struct cons_screen *scr)
+{
+    g_root_scr.fg = CONSOLE_FG;
+    g_root_scr.bg = CONSOLE_BG;
+}
+
+void
+cons_update_color(struct cons_screen *scr, uint32_t fg, uint32_t bg)
+{
+    scr->fg = fg;
+    scr->bg = bg;
+}
+
+void
+cons_reset_cursor(struct cons_screen *scr)
+{
+    HIDE_CURSOR(scr);
+    scr->ch_col = 0;
+    scr->ch_row = 0;
+    scr->curs_col = 0;
+    scr->curs_row = 0;
+    SHOW_CURSOR(scr);
+}
+
+/*
  * Put a character on the screen.
  *
  * @scr: Screen.
@@ -347,47 +449,37 @@ cons_init_bufs(struct cons_screen *scr)
 int
 cons_putch(struct cons_screen *scr, char c)
 {
-    struct cons_buf *bp;
-    struct cons_char cc;
-    size_t max_width;
-
     spinlock_acquire(&scr->lock);
+    HIDE_CURSOR(scr);
 
-    /* Handle specials */
-    if (cons_handle_special(scr, c) == 0) {
-        goto done;
-    }
+    cons_fast_putch(scr, c);
 
-    HIDE_CURSOR(scr);
+    SHOW_CURSOR(scr);
+    spinlock_release(&scr->lock);
+    return 0;
+}
 
-    /* Create a new character */
-    cc.c = c;
-    cc.fg = scr->fg;
-    cc.bg = scr->bg;
-    cc.x = scr->ch_col * FONT_WIDTH;
-    cc.y = scr->ch_row * FONT_HEIGHT;
+/*
+ * Put a string on the screen.
+ *
+ * @scr: Screen.
+ * @s: String to draw.
+ * @l: Length of s.
+ */
+int
+cons_putstr(struct cons_screen *scr, const char *s, size_t len)
+{
+    const char *p = s;
 
-    /* Push our new character */
-    bp = scr->ob[scr->ch_row];
-    bp->flags &= ~CONS_BUF_CLEAN;
-    cons_obuf_push(bp, cc);
-    ++scr->ch_col;
+    spinlock_acquire(&scr->lock);
+    HIDE_CURSOR(scr);
 
-    /* Check screen bounds */
-    max_width = scr->ncols * FONT_WIDTH;
-    if (cc.x >= max_width - 1) {
-        scr->ch_col = 0;
-        ++scr->ch_row;
+    while (len--) {
+        cons_fast_putch(scr, *p);
+        ++p;
     }
 
-    ++scr->curs_col;
-    if (scr->curs_col > scr->ncols - 1) {
-        scr->curs_col = 0;
-        if (scr->curs_row < scr->nrows)
-            ++scr->curs_row;
-    }
     SHOW_CURSOR(scr);
-done:
     spinlock_release(&scr->lock);
     return 0;
 }
diff --git a/sys/dev/cons/cons_ansi.c b/sys/dev/cons/cons_ansi.c
new file mode 100644
index 0000000..ab1f22a
--- /dev/null
+++ b/sys/dev/cons/cons_ansi.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <dev/cons/cons.h>
+#include <dev/cons/ansi.h>
+#include <string.h>
+
+__always_inline static inline bool
+is_valid_color(int c)
+{
+    return c >= '0' && c <= '7';
+}
+
+static inline void
+ansi_reset(struct ansi_state *statep)
+{
+    memset(statep, 0, sizeof(*statep));
+}
+
+/*
+ * Feed a byte into the ANSI escape sequence
+ * state machine.
+ *
+ * @statep: State machine pointer.
+ * @c: Byte to feed.
+ *
+ * On success, `c' is returned. On failure,
+ * 0 is returned. Values less than 0 indicate
+ * success with console attributes updated
+ * (ANSI_UPDATE_*).
+ */
+int
+ansi_feed(struct ansi_state *statep, char c)
+{
+    /* Standard colors */
+    static uint32_t colortab[] = {
+        ANSI_BLACK, ANSI_RED,
+        ANSI_GREEN, ANSI_YELLOW,
+        ANSI_BLUE, ANSI_MAGENTA,
+        ANSI_CYAN, ANSI_WHITE
+    };
+
+    /*
+     * Handle the control sequence introducer
+     * bytes.
+     */
+    switch (statep->csi) {
+    case 0: /* '\033' */
+        if (c != '\033') {
+            return 0;
+        }
+        statep->csi = 1;
+        statep->prev = c;
+        return c;
+    case 1: /* '[' */
+        if (c != '[') {
+            ansi_reset(statep);
+            return 0;
+        }
+        statep->csi = 2;
+        statep->prev = c;
+        return c;
+    case 2:
+        if (c == 'H') {
+            cons_clear_scr(&g_root_scr, g_root_scr.bg);
+            return ANSI_UPDATE_CURSOR;
+        }
+        break;
+    }
+
+    if (!statep->set_fg && !statep->set_bg) {
+        /* Reset attributes? */
+        if (statep->reset_color) {
+            ansi_reset(statep);
+            cons_reset_color(&g_root_scr);
+            return ANSI_UPDATE_COLOR;
+        }
+
+        /* Mark attributes to be reset? */
+        if (c == '0') {
+            statep->reset_color = 1;
+            statep->prev = c;
+            return c;
+        }
+
+        /* Expect foreground */
+        if (c != '3') {
+            ansi_reset(statep);
+            return 0;
+        }
+        statep->set_fg = 1;
+        statep->prev = c;
+        return c;
+    }
+
+    if (statep->set_fg && c != ';') {
+        /* Make sure this is valid */
+        if (!is_valid_color(c)) {
+            ansi_reset(statep);
+            return 0;
+        }
+
+        /* Set the foreground */
+        statep->fg = colortab[c - '0'];
+        statep->set_bg = 1;
+        statep->set_fg = 0;
+        statep->prev = c;
+        return c;
+    }
+
+    if (statep->set_bg) {
+        if (c == ';') {
+            statep->prev = c;
+            return c;
+        }
+
+        /* Expect '4' after ';' */
+        if (statep->prev == ';' && c != '4') {
+            ansi_reset(statep);
+            return 0;
+        }
+
+        if (c == 'm') {
+            cons_update_color(&g_root_scr, statep->fg, statep->bg);
+            ansi_reset(statep);
+            return ANSI_UPDATE_COLOR;
+        }
+
+        /* Make sure this is valid */
+        if (!is_valid_color(c)) {
+            ansi_reset(statep);
+            return 0;
+        }
+
+        /* Set the background */
+        statep->bg = colortab[c - '0'];
+        statep->prev = c;
+        return c;
+    }
+
+    ansi_reset(statep);
+    return 0;
+}
diff --git a/sys/dev/cons/cons_buf.c b/sys/dev/cons/cons_buf.c
index 3bc45a1..84a38ce 100644
--- a/sys/dev/cons/cons_buf.c
+++ b/sys/dev/cons/cons_buf.c
@@ -81,20 +81,26 @@ int
 cons_obuf_push(struct cons_buf *bp, struct cons_char c)
 {
     uint8_t next;
+    int retval = 0;
 
     if (bp == NULL) {
         return -EINVAL;
     }
 
+    spinlock_acquire(&bp->lock);
     __assert(bp->type == CONS_BUF_OUTPUT);
     next = bp->head + 1;
     if (next > bp->len) {
-        return -ENOSPC;
+        retval = -ENOSPC;
+        goto done;
     }
 
     bp->obuf[bp->head] = c;
     bp->head = next;
-    return 0;
+
+done:
+    spinlock_release(&bp->lock);
+    return retval;
 }
 
 /*
@@ -108,18 +114,21 @@ int
 cons_obuf_pop(struct cons_buf *bp, struct cons_char *res)
 {
     uint8_t next;
+    int retval = 0;
 
     if (bp == NULL || res == NULL) {
         return -EINVAL;
     }
 
     __assert(bp->type == CONS_BUF_OUTPUT);
+    spinlock_acquire(&bp->lock);
 
     /* Do we have any data left? */
     if (bp->head == bp->tail) {
         bp->head = 0;
         bp->tail = 0;
-        return -EAGAIN;
+        retval = -EAGAIN;
+        goto done;
     }
 
     next = bp->tail + 1;
@@ -129,7 +138,10 @@ cons_obuf_pop(struct cons_buf *bp, struct cons_char *res)
 
     *res = bp->obuf[bp->tail];
     bp->tail = next;
-    return 0;
+
+done:
+    spinlock_release(&bp->lock);
+    return retval;
 }
 
 int
@@ -137,22 +149,28 @@ cons_ibuf_push(struct cons_screen *scr, struct cons_input in)
 {
     struct cons_buf *bp;
     uint8_t head_next;
+    int retval = 0;
 
     if (scr == NULL) {
         return -EINVAL;
     }
 
     bp = scr->ib;
+    spinlock_acquire(&bp->lock);
     __assert(bp->type == CONS_BUF_INPUT);
 
     head_next = bp->head + 1;
     if (head_next > bp->len) {
-        return -ENOSPC;
+        retval = -ENOSPC;
+        goto done;
     }
 
     bp->ibuf[bp->head] = in;
     bp->head = head_next;
-    return 0;
+
+done:
+    spinlock_release(&bp->lock);
+    return retval;
 }
 
 int
@@ -160,6 +178,7 @@ cons_ibuf_pop(struct cons_screen *scr, struct cons_input *res)
 {
     uint8_t tail_next;
     struct cons_buf *bp;
+    int retval = 0;
 
     if (scr == NULL || res == NULL) {
         return -EINVAL;
@@ -167,12 +186,14 @@ cons_ibuf_pop(struct cons_screen *scr, struct cons_input *res)
 
     bp = scr->ib;
     __assert(bp->type == CONS_BUF_INPUT);
+    spinlock_acquire(&bp->lock);
 
     /* Do we have any data left? */
     if (bp->head == bp->tail) {
         bp->head = 0;
         bp->tail = 0;
-        return -EAGAIN;
+        retval = -EAGAIN;
+        goto done;
     }
 
     tail_next = bp->tail + 1;
@@ -182,5 +203,8 @@ cons_ibuf_pop(struct cons_screen *scr, struct cons_input *res)
 
     *res = bp->ibuf[bp->tail];
     bp->tail = tail_next;
-    return 0;
+
+done:
+    spinlock_release(&bp->lock);
+    return retval;
 }