Update gui.h

Adds gui base header

.clang-format

@@ -1,24 +0,0 @@
-BasedOnStyle: Google
-IndentWidth: 4
-TabWidth: 4
-UseTab: Never
-ColumnLimit: 80
-
-DerivePointerAlignment: false
-PointerAlignment: Right
-ReferenceAlignment: Right
-
-AlignConsecutiveMacros: Consecutive
-AlignTrailingComments:
-  Kind: Always
-  OverEmptyLines: 0
-
-IncludeBlocks: Regroup
-IncludeCategories:
-  # Std headers
-  - Regex: '<[[:alnum:]_.]+>'
-    Priority: 2
-
-  # Other headers
-  - Regex: '.*'
-    Priority: 1

.clangd

@@ -1,6 +0,0 @@
-CompileFlags:
-  CompilationDatabase: build
-
-Diagnostics:
-  UnusedIncludes: Strict
-  MissingIncludes: Strict

.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[Makefile]
-indent_style = tab
-indent_size = 8
-tab_width = 8

Makefile

@@ -18,9 +18,9 @@ KERNEL_OBJ += $(patsubst kernel/%.asm, $(BUILD_DIR)/asm_%.o, $(KERNEL_ASM_SRC))
 KLIBC_SRC = $(wildcard klibc/src/*.c)
 KLIBC_OBJ = $(patsubst klibc/src/%.c, $(BUILD_DIR)/klibc/%.o, $(KLIBC_SRC))
 
-.PHONY: all stage1 stage2 kernel compile-commands $(BUILD_DIR)/compile_commands.json run gdb clean clean-cross clean-all
 all: $(DISK_IMG)
 
+.PHONY: stage1 stage2 kernel run gdb clean
 stage1: $(BUILD_DIR)
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/$@.o bootloader/$@.asm
 	$(LD) -Ttext=0x7c00 -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.o
@@ -57,10 +57,6 @@ $(BUILD_DIR):
 	mkdir -p $@
 	mkdir -p $(BUILD_DIR)/klibc
 
-compile-commands: $(BUILD_DIR)/compile_commands.json
-$(BUILD_DIR)/compile_commands.json: $(BUILD_DIR)
-	bear --output $@ -- make -B
-
 run:
 	qemu-system-i386 -s -S $(DISK_IMG)
 

kernel/gui.c

@@ -0,0 +1,66 @@
+#include "gui.h"
+#include "vga.h"  // VGA functions for drawing and clearing screen
+#include "framebuffer.h"  // For pixel manipulation if needed
+
+// Initialize the GUI (could set up any global state or variables here)
+void gui_init(void) {
+    // Clear the screen with black or any color
+    gui_clear(vga_entry_color(VGA_COLOR_BLACK, VGA_COLOR_WHITE));
+}
+
+// Draw a window (simple rectangle with a title)
+void gui_draw_window(gui_window_t* window) {
+    // Draw the window's border
+    for (uint32_t y = 0; y < window->height; ++y) {
+        for (uint32_t x = 0; x < window->width; ++x) {
+            // Check if we are at the border
+            if (x == 0 || y == 0 || x == window->width - 1 || y == window->height - 1) {
+                vga_put_entry_at('#', vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK), window->x + x, window->y + y);
+            } else {
+                // Fill the inside of the window
+                vga_put_entry_at(' ', vga_entry_color(VGA_COLOR_BLACK, VGA_COLOR_BLACK), window->x + x, window->y + y);
+            }
+        }
+    }
+
+    // Draw the title at the top
+    if (window->title) {
+        size_t i = 0;
+        while (window->title[i] != '\0' && i < window->width - 2) {
+            vga_put_entry_at(window->title[i], vga_entry_color(VGA_COLOR_WHITE, VGA_COLOR_BLACK), window->x + i + 1, window->y);
+            i++;
+        }
+    }
+}
+
+// Draw a button (a simple rectangle with text in the middle)
+void gui_draw_button(gui_button_t* button) {
+    for (uint32_t y = 0; y < button->height; ++y) {
+        for (uint32_t x = 0; x < button->width; ++x) {
+            // Check if we are at the border
+            if (x == 0 || y == 0 || x == button->width - 1 || y == button->height - 1) {
+                vga_put_entry_at('#', vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK), button->x + x, button->y + y);
+            } else {
+                // Fill the inside of the button
+                vga_put_entry_at(' ', vga_entry_color(VGA_COLOR_BLACK, VGA_COLOR_BLACK), button->x + x, button->y + y);
+            }
+        }
+    }
+
+    // Draw the label in the center of the button
+    size_t label_len = 0;
+    while (button->label[label_len] != '\0') {
+        label_len++;
+    }
+
+    size_t start_x = button->x + (button->width - label_len) / 2;
+    size_t start_y = button->y + (button->height - 1) / 2;
+    for (size_t i = 0; i < label_len; ++i) {
+        vga_put_entry_at(button->label[i], vga_entry_color(VGA_COLOR_WHITE, VGA_COLOR_BLACK), start_x + i, start_y);
+    }
+}
+
+// Clear the screen with a color
+void gui_clear(uint32_t color) {
+    vga_clear(color);  // Just clear the VGA screen with a solid color
+}

kernel/gui.h

@@ -0,0 +1,34 @@
+#ifndef GUI_H
+#define GUI_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#define GUI_WINDOW_WIDTH   80
+#define GUI_WINDOW_HEIGHT  25
+#define GUI_BUTTON_WIDTH   10
+#define GUI_BUTTON_HEIGHT  3
+
+// Window structure
+typedef struct {
+    uint32_t x, y;
+    uint32_t width, height;
+    uint32_t color;  // Background color
+    const char* title;
+} gui_window_t;
+
+// Button structure
+typedef struct {
+    uint32_t x, y;
+    uint32_t width, height;
+    uint32_t color;  // Background color
+    const char* label;
+} gui_button_t;
+
+// Function prototypes for GUI elements
+void gui_init(void);
+void gui_draw_window(gui_window_t* window);
+void gui_draw_button(gui_button_t* button);
+void gui_clear(uint32_t color);
+
+#endif // GUI_H

kernel/vesa.c

@@ -1,98 +0,0 @@
-#include "vesa.h"
-#include "io.h"
-#include "print.h"
-
-// VESA mode and controller information
-#define VESA_BIOS_INT 0x10
-#define VESA_BIOS_FUNC 0x4F
-
-// Function to call BIOS with specific VESA function
-static bool vesa_bios_call(uint16_t function, uint16_t* eax, uint32_t* ebx, uint32_t* ecx, uint32_t* edx) {
-    // Set up registers for VESA function call
-    __asm__ __volatile__(
-        "movw %1, %%ax\n"           // Move function number into AX
-        "int $0x10\n"                // Call BIOS interrupt 0x10 (VESA)
-        "movw %%ax, %0\n"            // Move return value in AX to the return variable
-        : "=m"(*eax)                 // Output operand (eax)
-        : "m"(function)              // Input operand (function number)
-        : "%eax", "%ebx", "%ecx", "%edx", "memory"
-    );
-    // Check for success (return values vary depending on the function)
-    return *eax == 0x004F;
-}
-
-// Set the VESA video mode
-bool vesa_set_mode(uint16_t mode) {
-    uint16_t eax = VBE_FUNCTION_SET_MODE;
-    uint32_t ebx = mode;
-    uint32_t ecx = 0;
-    uint32_t edx = 0;
-    
-    if (vesa_bios_call(VBE_FUNCTION_SET_MODE, &eax, &ebx, &ecx, &edx)) {
-        return true;
-    }
-    return false;
-}
-
-// Get the VESA mode information
-bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info) {
-    uint16_t eax = VBE_FUNCTION_GET_MODE_INFO;
-    uint32_t ebx = mode;
-    uint32_t ecx = 0;
-    uint32_t edx = 0;
-
-    if (vesa_bios_call(VBE_FUNCTION_GET_MODE_INFO, &eax, &ebx, &ecx, &edx)) {
-        // Copy the information into the provided struct
-        uint32_t base = (uint32_t)info;
-        __asm__ __volatile__(
-            "movw %%bx, %%es:%%di\n"
-            : 
-            : "b" (base)
-            : "%es", "%di", "memory"
-        );
-        return true;
-    }
-    return false;
-}
-
-// Get the VESA controller information
-bool vesa_get_controller_info(vbe_controller_info_t* info) {
-    uint16_t eax = VBE_FUNCTION_GET_CONTROLLER_INFO;
-    uint32_t ebx = 0;
-    uint32_t ecx = 0;
-    uint32_t edx = 0;
-
-    if (vesa_bios_call(VBE_FUNCTION_GET_CONTROLLER_INFO, &eax, &ebx, &ecx, &edx)) {
-        // Copy controller information into the provided struct
-        uint32_t base = (uint32_t)info;
-        __asm__ __volatile__(
-            "movw %%bx, %%es:%%di\n"
-            : 
-            : "b" (base)
-            : "%es", "%di", "memory"
-        );
-        return true;
-    }
-    return false;
-}
-
-// Return pointer to the VESA framebuffer
-void* vesa_get_framebuffer(void) {
-    vbe_mode_info_t mode_info;
-    if (vesa_get_mode_info(0x101, &mode_info)) {
-        return (void*)mode_info.PhysBasePtr;
-    }
-    return NULL;
-}
-
-// Clear the screen with a color
-void vesa_clear_screen(uint32_t color) {
-    uint32_t* framebuffer = (uint32_t*)vesa_get_framebuffer();
-    if (framebuffer) {
-        for (int y = 0; y < 480; y++) { // For 640x480 mode
-            for (int x = 0; x < 640; x++) {
-                framebuffer[y * 640 + x] = color;
-            }
-        }
-    }
-}

kernel/vesa.h

@@ -1,67 +0,0 @@
-#ifndef VESA_H
-#define VESA_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-// VESA BIOS Extension 2.0 Function Calls
-#define VBE_FUNCTION_SET_MODE        0x4F02
-#define VBE_FUNCTION_GET_MODE_INFO   0x4F01
-#define VBE_FUNCTION_GET_CONTROLLER_INFO 0x4F00
-#define VBE_FUNCTION_SET_DISPLAY_START 0x4F05
-
-// VESA Mode Information Structure (VBE 2.0)
-typedef struct {
-    uint16_t ModeAttributes;      // Mode attributes
-    uint8_t WinAAttributes;       // Window A attributes
-    uint8_t WinBAttributes;       // Window B attributes
-    uint16_t WinGranularity;      // Window granularity
-    uint16_t WinSize;             // Window size
-    uint16_t WinASegment;         // Window A segment address
-    uint16_t WinBSegment;         // Window B segment address
-    uint32_t WinFuncPtr;          // Function pointer for window
-    uint16_t BytesPerScanLine;    // Bytes per scanline
-    uint16_t XResolution;         // Horizontal resolution in pixels
-    uint16_t YResolution;         // Vertical resolution in pixels
-    uint8_t XCharSize;            // Character cell width
-    uint8_t YCharSize;            // Character cell height
-    uint8_t NumberOfPlanes;       // Number of memory planes
-    uint8_t BitsPerPixel;         // Bits per pixel
-    uint8_t NumberOfBanks;        // Number of banks
-    uint8_t MemoryModel;          // Memory model type
-    uint8_t BankSize;             // Bank size in kB
-    uint8_t NumberOfImagePages;   // Number of image pages
-    uint8_t Reserved0;            // Reserved
-    uint8_t RedMaskSize;          // Red mask size
-    uint8_t RedFieldPosition;     // Red field position
-    uint8_t GreenMaskSize;        // Green mask size
-    uint8_t GreenFieldPosition;   // Green field position
-    uint8_t BlueMaskSize;         // Blue mask size
-    uint8_t BlueFieldPosition;    // Blue field position
-    uint8_t RsvdMaskSize;         // Reserved mask size
-    uint8_t RsvdFieldPosition;    // Reserved field position
-    uint8_t DirectColorModeInfo;  // Direct color mode info
-    uint32_t PhysBasePtr;         // Physical base address of the linear framebuffer
-    uint32_t OffScreenMemOff;     // Offset to off-screen memory
-    uint16_t OffScreenMemSize;    // Size of off-screen memory
-    uint8_t Reserved1[206];       // Reserved
-} __attribute__((packed)) vbe_mode_info_t;
-
-// VESA Controller Information
-typedef struct {
-    uint8_t VESAVersion[2];       // VESA version
-    uint32_t OEMStringPtr;        // Pointer to OEM string
-    uint8_t Capabilities[4];      // Capabilities of the controller
-    uint32_t VideoModePtr;        // Pointer to supported video modes
-    uint16_t TotalMemory;         // Total video memory (in 64KB)
-    uint8_t Reserved[4];          // Reserved
-} __attribute__((packed)) vbe_controller_info_t;
-
-// Function Prototypes
-bool vesa_set_mode(uint16_t mode);
-bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info);
-bool vesa_get_controller_info(vbe_controller_info_t* info);
-void* vesa_get_framebuffer(void);
-void vesa_clear_screen(uint32_t color);
-
-#endif // VESA_H