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/display.c

@@ -1,80 +1,36 @@
-#include <string.h>
 #include "display.h"
-#include "io.h"
+#include "io.h" // Include your I/O header for port access
 #include "vga.h"
 
 // Initialize the display
 void init_display(void) {
-    // Initialize the VGA driver. This typically sets up the 80x25 text mode,
+    // Initialize VGA settings, if necessary
-    // clears the screen, and sets the cursor.
+    // This could involve setting up the VGA mode, etc.
-    vga_init();
+    set_display_mode(0x13); // Example: Set to 320x200 256-color mode
 }
 
 // Enumerate connected displays
 void enumerate_displays(void) {
-    // This function is often a complex operation in a real driver.
+    // This is a simplified example. Actual enumeration may require
-    // In this simplified kernel/VGA text mode environment, we use printf
+    // reading from specific VGA registers or using BIOS interrupts.
-    // to output a message and rely on the fact that VGA is present.
     
-    // Clear the display before printing a message
+    // For demonstration, we will just print a message
-    vga_clear(vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK));
+    // In a real driver, you would check the VGA registers
-    
+    // to determine connected displays.
-    // Output a simplified enumeration message
+    clear_display();
-    vga_printf("Display: Standard VGA Text Mode (80x25) Detected.\n");
+    // Here you would typically read from VGA registers to find connected displays
-    
+    // For example, using inb() to read from VGA ports
-    // In a real driver, you would use inb() and outb() with specific VGA ports
-    // to read information (e.g., from the CRTC registers 0x3D4/0x3D5)
-    // to check for display presence or configuration.
 }
 
 // Set the display mode
-// NOTE: Setting arbitrary VGA modes (like 0x13 for 320x200) is very complex
-// and requires writing hundreds of register values, often done via BIOS in
-// real mode. Since we are in protected mode and have a simple text driver,
-// this function is kept simple or treated as a placeholder for full mode changes.
 void set_display_mode(uint8_t mode) {
-    // Check if the requested mode is a known mode (e.g., VGA Text Mode 3)
+    // Set the VGA mode by writing to the appropriate registers
-    // For this example, we simply acknowledge the call.
-    // A true mode set would involve complex register sequencing.
-    
-    // The provided vga.c is a Text Mode driver, so a graphical mode set
-    // like 0x13 (320x200 256-color) would break the existing vga_printf functionality.
-    
-    // A simplified text-mode-specific response:
-    if (mode == 0x03) { // Mode 3 is standard 80x25 text mode
-        vga_printf("Display mode set to 80x25 Text Mode (Mode 0x03).\n");
-        vga_init(); // Re-initialize the text mode
-    } else {
-        // Simple I/O example based on the original structure (Caution: Incomplete for full mode set)
     outb(VGA_PORT, mode); // Example function to write to a port
-        vga_printf("Attempting to set display mode to 0x%x. (Warning: May break current display)\n", mode);
-    }
 }
 
 // Clear the display
 void clear_display(void) {
-    // Use the VGA driver's clear function, typically clearing to black on light grey
+    // Clear the display by filling it with a color
-    // or black on black. We'll use the black on light grey from vga_init for consistency.
+    // This is a placeholder for actual clearing logic
-    vga_clear(vga_entry_color(VGA_COLOR_BLACK, VGA_COLOR_LIGHT_GREY));
+    // You would typically write to video memory here
-    // Reset cursor to 0, 0
-    vga_set_cursor_position(0, 0);
-}
-
-// Helper function to write a string
-void display_write_string(const char* str) {
-    // Use the VGA driver's string writing function
-    vga_write_string(str, strlen(str));
-}
-
-// Helper function to print a formatted string
-void display_printf(const char* format, ...) {
-    // Use the VGA driver's printf function
-    va_list args;
-    va_start(args, format);
-    
-    // The vga_printf function already handles the va_list internally,
-    // so we can just call it directly.
-    vga_printf(format, args);
-    
-    va_end(args);
 }

kernel/display.h

@@ -2,21 +2,13 @@
 #define DISPLAY_H
 
 #include <stdint.h>
-#include "vga.h" // Include VGA functions
 
-#define VGA_PORT 0x3C0  // Base port for VGA (Often used for general control, though 0x3D4/0x3D5 are used for cursor)
+#define VGA_PORT 0x3C0  // Base port for VGA
 
 // Function prototypes
 void init_display(void);
 void enumerate_displays(void);
-void set_display_mode(uint8_t mode); // In this context, modes are typically BIOS or VESA modes, which are complex.
+void set_display_mode(uint8_t mode);
-                                      // We'll treat this as a placeholder/simple mode call.
 void clear_display(void);
 
-// New function to write a string using the VGA driver
-void display_write_string(const char* str);
-
-// New function to print a formatted string using the VGA driver
-void display_printf(const char* format, ...);
-
 #endif // DISPLAY_H

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/vga.c

@@ -1,9 +1,9 @@
+#include "vga.h"
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdarg.h>
 #include "string_utils.h"
-#include "vga.h"
 
 void outb(uint16_t port, uint8_t value) {
     __asm__ volatile("outb %0, %1" : : "a"(value), "Nd"(port));
@@ -134,7 +134,7 @@ void vga_printf(const char* format, ...) {
     va_end(args);
     
     // Now you can use the buffer with vga_write_string
-    vga_write_string(buffer, strlen(buffer)); // Use my_strlen instead of strlen
+    vga_write_string(buffer, my_strlen(buffer)); // Use my_strlen instead of strlen
 }
 
 void vga_init(void) {

kernel/vga.h

@@ -35,7 +35,6 @@ typedef enum {
 // Function prototypes
 uint8_t vga_entry_color(vga_color fg, vga_color bg);
 uint16_t vga_entry(unsigned char uc, uint8_t color);
-void vga_init(void);
 
 void vga_put_entry_at(char c, uint8_t color, size_t x, size_t y);
 void vga_clear(uint8_t color);