Added support for more color types (bpp)

Somehow the text is inverted and things are strange but the colors may be correct.

5 files changed, 95 insertions, 50 deletions

diff --git a/src/kernel/graphics/font.h b/src/kernel/graphics/font.h
index 47e87d5..21f8679 100644
--- a/src/kernel/graphics/font.h
+++ b/src/kernel/graphics/font.h
@@ -96,6 +96,7 @@ unsigned char font[95][13] = {
         {0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f},
         {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
         {0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}};
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}
+};
 
 #endif
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 31ca9d2..379109d 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -6,19 +6,14 @@
 #include <kernel/system.h>
 #include <kernel/lib/alloc.h>
 #include <kernel/commands/command.h>
+#include <kernel/timer/timer.h>
 
 void switch_to_vga() {
     serial_write("Force switch to VGA!\n");
-    regs16_t regs;
-    regs.ax = 0x0003;
-    paging_disable();
-    int32(0x10, &regs);
-    paging_enable();
-
     uint16_t *terminal_buffer = (uint16_t *) 0xB8000;
     char *error = "Melvix does not support this graphics hardware!";
     for (size_t i = 0; i < strlen(error); i++)
-        terminal_buffer[i] = (uint16_t) error[i] | (uint16_t) 0x700;
+        terminal_buffer[24 * 80 + i] = (uint16_t) error[i] | (uint16_t) 0x700;
     panic("No VESA support!");
 }
 
@@ -89,15 +84,14 @@ struct vbe_mode_info *vbe_get_mode_info(uint16_t mode) {
 
     struct vbe_mode_info *mode_info = (struct vbe_mode_info *) 0x7E00;
 
-    if (regs.ax != 0x004f) {
-        return 0;
-    }
+    if (regs.ax != 0x004f) return 0;
 
     return mode_info;
 }
 
 void set_optimal_resolution() {
     vga_log("Switching to graphics mode", 9);
+    vga_log("Trying to detect available modes", 10);
     uint16_t *video_modes = vbe_get_modes();
 
     uint16_t highest = 0;
@@ -119,19 +113,22 @@ void set_optimal_resolution() {
         serial_write_dec(mode_info->bpp);
         serial_write("\n");
 
-        if (mode_info->width >= vbe_width) {
+        //if (mode_info->width > vbe_width || (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl))) {
+        if (mode_info->width > vbe_width || (mode_info->bpp == 16)) {
             // (float) mode_info->width / (float) mode_info->height < 2.0 &&) {
             highest = *mode;
             vbe_width = mode_info->width;
             vbe_height = mode_info->height;
             vbe_pitch = mode_info->pitch;
-            vbe_bpp = mode_info->bpp >> 3;
+            vbe_bpl = mode_info->bpp >> 3;
             fb = (unsigned char *) mode_info->framebuffer;
         }
     }
 
     if (highest == 0) {
         serial_write("Mode detection failed!\nTrying common modes...\n");
+        vga_log("Mode detection failed!", 11);
+        vga_log("Trying common modes...", 12);
         struct vbe_mode_info *mode_info;
         int modes[] = {
                 322, 287, 286, 285, 284, // 1600x1200
@@ -150,12 +147,17 @@ void set_optimal_resolution() {
 
         for (size_t i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) {
             mode_info = vbe_get_mode_info(modes[i]);
-            if (mode_info != 0 && mode_info->width > vbe_width) {
+            if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 ||
+                (mode_info->memory_model != 4 && mode_info->memory_model != 6))
+                continue;
+
+            if ((mode_info->width > vbe_width ||
+                 (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl))) {
                 highest = modes[i];
                 vbe_width = mode_info->width;
                 vbe_height = mode_info->height;
                 vbe_pitch = mode_info->pitch;
-                vbe_bpp = mode_info->bpp >> 3;
+                vbe_bpl = mode_info->bpp >> 3;
                 fb = (unsigned char *) mode_info->framebuffer;
             }
         }
@@ -163,10 +165,13 @@ void set_optimal_resolution() {
         // Everything else failed :(
         if (highest == 0)
             switch_to_vga();
-    }
+    } else vga_log("Mode detection succeeded", 11);
+
+    timer_wait(500);
 
     vbe_set_mode(highest);
 
+    vesa_set_color(default_text_color);
     vesa_clear();
 
     info("Successfully switched to video mode!");
@@ -178,39 +183,67 @@ void set_optimal_resolution() {
     vesa_draw_string("x");
     vesa_draw_number(vbe_height);
     vesa_draw_string("x");
-    vesa_draw_number(vbe_bpp << 3);
+    vesa_draw_number(vbe_bpl << 3);
 
-    uint32_t fb_size = vbe_width * vbe_height * vbe_bpp;
+    uint32_t fb_size = vbe_width * vbe_height * vbe_bpl;
     for (uint32_t z = 0; z < fb_size; z += 4096)
         paging_map((uint32_t) fb + z, (uint32_t) fb + z, PT_PRESENT | PT_RW | PT_USED);
 
 }
 
+const uint32_t default_text_color = vesa_white;
+const uint32_t default_background_color = vesa_black;
+uint32_t terminal_color[3] = {0xab, 0xb2, 0xbf};
+uint32_t terminal_background[3] = {0x1d, 0x1f, 0x24};
 uint16_t terminal_x = 1;
 uint16_t terminal_y = 1;
-uint32_t text_color = vesa_white;
-uint32_t terminal_background = vesa_black;
-uint32_t terminal_color = vesa_white;
-
-void vesa_set_pixel(uint16_t x, uint16_t y, uint32_t color) {
-    unsigned pos = x * vbe_bpp + y * vbe_pitch;
-    fb[pos] = color & 255;
-    fb[pos + 1] = (color >> 8) & 255;
-    fb[pos + 2] = (color >> 16) & 255;
+
+void vesa_convert_color(uint32_t *color_array, uint32_t color) {
+    serial_write("Converting ");
+    serial_write_hex(color);
+    serial_write(" to ");
+
+    uint8_t red = (color >> 16) & 255;
+    uint8_t green = (color >> 8) & 255;
+    uint8_t blue = color & 255;
+
+    if ((vbe_bpl << 3) == 8) {
+        uint32_t new_color = ((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 256);
+        color_array[0] = (new_color >> 16) & 255;
+        color_array[1] = (new_color >> 8) & 255;
+        color_array[2] = new_color & 255;
+    } else if ((vbe_bpl << 3) == 16) {
+        uint32_t new_color = (((red & 0b11111000) << 8) + ((green & 0b11111100) << 3) + (blue >> 3));
+        color_array[0] = (new_color >> 16) & 255;
+        color_array[1] = (new_color >> 8) & 255;
+        color_array[2] = new_color & 255;
+    } else if ((vbe_bpl << 3) == 24 || (vbe_bpl << 3) == 32) {
+        color_array[0] = red;
+        color_array[1] = green;
+        color_array[2] = blue;
+    } else {
+        panic("Unknown color bpp!");
+    }
+
+    serial_write("\n");
+}
+
+void vesa_set_pixel(uint16_t x, uint16_t y, const uint32_t color[3]) {
+    unsigned pos = x * vbe_bpl + y * vbe_pitch;
+    char *draw = (char *) &fb[pos];
+    draw[pos] = color[2];
+    draw[pos + 1] = color[1];
+    draw[pos + 2] = color[0];
 }
 
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, int color) {
-    int i, j;
-    char blue = color & 255;
-    char green = (color >> 8) & 255;
-    char red = (color >> 16) & 255;
-    int pos1 = x1 * vbe_bpp + y1 * vbe_pitch;
+void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]) {
+    int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
     char *draw = (char *) &fb[pos1];
-    for (i = 0; i <= y2 - y1; i++) {
-        for (j = 0; j <= x2 - x1; j++) {
-            draw[vbe_bpp * j] = blue;
-            draw[vbe_bpp * j + 1] = green;
-            draw[vbe_bpp * j + 2] = red;
+    for (int i = 0; i <= y2 - y1; i++) {
+        for (int j = 0; j <= x2 - x1; j++) {
+            draw[vbe_bpl * j] = color[2];
+            draw[vbe_bpl * j + 1] = color[1];
+            draw[vbe_bpl * j + 2] = color[0];
         }
         draw += vbe_pitch;
     }
@@ -218,21 +251,30 @@ void vesa_draw_rectangle(int x1, int y1, int x2, int y2, int color) {
 
 void vesa_clear() {
     vesa_draw_rectangle(0, 0, vbe_width, vbe_height, terminal_background);
+    terminal_x = 0;
+    terminal_y = 0;
 }
 
 void vesa_draw_char(char ch) {
     if (ch >= ' ') {
+        int pos = (terminal_x - 8) * vbe_bpl + (terminal_y - 16) * vbe_pitch;
         int mask[8] = {1, 2, 4, 8, 16, 32, 64, 128};
         unsigned char *glyph = font[ch - 32];
+        char *draw = (char *) &fb[pos];
 
         for (int cy = 0; cy < 13; cy++) {
             for (int cx = 0; cx < 8; cx++) {
                 if (glyph[cy] & mask[cx]) {
-                    vesa_set_pixel(terminal_x + 8 - cx, terminal_y + 16 - cy, terminal_color);
+                    draw[vbe_bpl * cx] = terminal_color[2];
+                    draw[vbe_bpl * cx + 1] = terminal_color[1];
+                    draw[vbe_bpl * cx + 2] = terminal_color[0];
                 } else {
-                    vesa_set_pixel(terminal_x + 8 - cx, terminal_y + 16 - cy, terminal_background);
+                    draw[vbe_bpl * cx] = terminal_background[2];
+                    draw[vbe_bpl * cx + 1] = terminal_background[1];
+                    draw[vbe_bpl * cx + 2] = terminal_background[0];
                 }
             }
+            draw += vbe_pitch;
         }
 
         terminal_x += 10;
@@ -297,5 +339,6 @@ void vesa_draw_number(int n) {
 }
 
 void vesa_set_color(uint32_t color) {
-    terminal_color = color;
+    vesa_convert_color(terminal_color, color);
+    vesa_convert_color(terminal_background, default_background_color);
 }
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index 93150d4..f53095d 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -171,7 +171,7 @@ enum vesa_color {
 /**
  * The default text color
  */
-uint32_t text_color;
+const uint32_t default_text_color;
 
 /**
  * The current input
@@ -199,9 +199,9 @@ int vbe_height;
 int vbe_pitch;
 
 /**
- * The bytes per pixel (pixel width) of the current video mode
+ * The bytes per line (pixel width) of the current video mode
  */
-int vbe_bpp;
+int vbe_bpl;
 
 /**
  * The framebuffer interface
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 172ef55..859b6f1 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -7,6 +7,7 @@
 #include <kernel/input/input.h>
 
 void init() {
+    vga_log("Installing basic features of Melvix...", 0);
     timer_install();
     gdt_install();
     init_serial();
diff --git a/src/kernel/system.c b/src/kernel/system.c
index c8f89b6..2de1183 100644
--- a/src/kernel/system.c
+++ b/src/kernel/system.c
@@ -23,7 +23,7 @@ void log(char *msg) {
     vesa_set_color(vesa_dark_white);
     kernel_time();
     vesa_draw_string(msg);
-    vesa_set_color(text_color);
+    vesa_set_color(default_text_color);
 }
 
 void info(char *msg) {
@@ -31,7 +31,7 @@ void info(char *msg) {
     kernel_time();
     vesa_draw_string("INFORMATION: ");
     vesa_draw_string(msg);
-    vesa_set_color(text_color);
+    vesa_set_color(default_text_color);
 }
 
 void warn(char *msg) {
@@ -39,19 +39,19 @@ void warn(char *msg) {
     kernel_time();
     vesa_draw_string("WARNING: ");
     vesa_draw_string(msg);
-    vesa_set_color(text_color);
+    vesa_set_color(default_text_color);
 }
 
 void panic(char *msg) {
     asm volatile ("cli");
     vesa_set_color(vesa_dark_red);
     kernel_time();
-    serial_write("PANIC: ");
+    serial_write("\nPANIC: ");
     serial_write(msg);
-    serial_write(" - System Halted!\n");
+    serial_write(" - System halted!\n");
     vesa_draw_string("PANIC: ");
     vesa_draw_string(msg);
-    vesa_draw_string(" - System Halted!\n");
+    vesa_draw_string(" - System halted!\n");
     loop:
     asm volatile ("hlt");
     goto loop;