Update gui.h

Adds gui base header

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

@@ -1,65 +0,0 @@
-#include "hid.h"
-#include "usb.h"
-#include "mouse.h"
-#include "keyboard.h"
-#include "print.h"
-#include <stdint.h>
-#include <stdbool.h>
-
-// Global variables
-static bool hid_initialized = false;
-
-void hid_init(void) {
-    if (hid_initialized) return;
-    hid_initialized = true;
-
-    // Initialize keyboard and mouse HID handling
-    keyboard_init();
-    // Assume USB mouse has been initialized and is connected.
-    usb_hid_init(); // Initializes USB HID for both keyboard and mouse
-}
-
-void hid_process_report(uint8_t* report, uint8_t length) {
-    // Process the HID report based on its type
-    if (length == 8) {  // Assuming a standard 8-byte report for HID keyboard
-        keyboard_hid_report_t* k_report = (keyboard_hid_report_t*) report;
-        hid_process_keyboard_report(k_report);
-    } else if (length == 3) {  // Assuming a standard 3-byte report for HID mouse
-        mouse_hid_report_t* m_report = (mouse_hid_report_t*) report;
-        hid_process_mouse_report(m_report);
-    }
-}
-
-// Handle HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report) {
-    // Iterate over the keycodes and process key presses
-    for (int i = 0; i < 6; i++) {
-        uint8_t keycode = report->keycodes[i];
-        if (keycode != 0) {
-            char key = scancode_map[keycode];
-            if (key) {
-                keyboard_buffer_add(key);
-            }
-        }
-    }
-}
-
-// Handle HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report) {
-    // Process mouse movement and button clicks
-    mouse_data.x += report->x;
-    mouse_data.y += report->y;
-    mouse_data.left_button = (report->buttons & 0x01) != 0;
-    mouse_data.right_button = (report->buttons & 0x02) != 0;
-
-    print_hex((uint32_t)mouse_data.x, 1, 1);
-    print_hex((uint32_t)mouse_data.y, 1, 1);
-    print_hex((uint32_t)report->buttons, 1, 1);
-}
-
-// Parse the HID descriptor (for parsing USB HID device descriptors)
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length) {
-    // HID descriptors are defined in the USB HID specification, we'll need to parse them here.
-    // For now, just return true assuming we have a valid descriptor.
-    return true;
-}

kernel/hid.h

@@ -1,46 +0,0 @@
-#ifndef HID_H
-#define HID_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-// HID Report types
-#define HID_REPORT_INPUT  0x01
-#define HID_REPORT_OUTPUT 0x02
-#define HID_REPORT_FEATURE 0x03
-
-// HID usage page constants (USB HID)
-#define HID_USAGE_PAGE_GENERIC 0x01
-#define HID_USAGE_KEYBOARD 0x06
-#define HID_USAGE_MOUSE 0x02
-
-// HID keyboard and mouse data
-typedef struct {
-    uint8_t modifier;    // Modifier keys (shift, ctrl, alt, etc.)
-    uint8_t reserved;    // Reserved byte
-    uint8_t keycodes[6]; // Keycodes for keys pressed
-} keyboard_hid_report_t;
-
-typedef struct {
-    uint8_t buttons;     // Mouse buttons (bitwise: 0x01 = left, 0x02 = right, 0x04 = middle)
-    int8_t x;            // X axis movement
-    int8_t y;            // Y axis movement
-    int8_t wheel;        // Mouse wheel
-} mouse_hid_report_t;
-
-// Initialize the HID subsystem
-void hid_init(void);
-
-// Process an incoming HID report
-void hid_process_report(uint8_t* report, uint8_t length);
-
-// Process HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report);
-
-// Process HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report);
-
-// USB HID report descriptor parsing
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length);
-
-#endif // HID_H

kernel/keyboard.c

@@ -2,91 +2,64 @@
 #include "io.h"
 #include "isr.h"
 #include "terminal.h"
-#include <stddef.h>
 
 #define KEYBOARD_DATA_PORT 0x60
 #define KEY_BUFFER_SIZE 256
 
-// Use volatile so the compiler knows these change inside interrupts
+static char key_buffer[KEY_BUFFER_SIZE];
-static volatile char key_buffer[KEY_BUFFER_SIZE];
+static uint8_t buffer_head = 0;  // Write position (interrupt)
-static volatile uint8_t buffer_head = 0;
+static uint8_t buffer_tail = 0;  // Read position (get_char)
-static volatile uint8_t buffer_tail = 0;
+static uint8_t buffer_count = 0;
-static volatile uint8_t buffer_count = 0;
+static uint8_t buffer_index = 0;
 
-// Exported map: Removed 'static' so hid.c can reference it if needed
+// Basic US QWERTY keymap (scancode to ASCII)
-const char scancode_map[128] = {
+static const char scancode_map[128] = {
-    0,  27, '1', '2', '3', '4', '5', '6', '7', '8',
+    0,  27, '1', '2', '3', '4', '5', '6', '7', '8', // 0x00 - 0x09
-    '9', '0', '-', '=', '\b', '\t', 'q', 'w', 'e', 'r',
+   '9', '0', '-', '=', '\b', '\t', 'q', 'w', 'e', 'r', // 0x0A - 0x13
-    't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', 0,
+   't', 'y', 'z', 'u', 'i', 'o', 'p', '[', ']', '\n', // 0x14 - 0x1D
-    'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',
+    0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', // 0x1E - 0x27
-    '\'', '`', 0, '\\', 'z', 'x', 'c', 'v', 'b', 'n',
+   ';', '\'', '`', 0, '\\', 'x', 'c', 'v', 'b', // 0x28 - 0x31
-    'm', ',', '.', '/', 0, '*', 0, ' ', 0
+   'n', 'm', ',', '.', '/', 0, '*', 0, ' ', 0,      // 0x32 - 0x3B
+    // rest can be filled as needed
 };
 
-/**
+// Interrupt handler for IRQ1
- * Shared function used by both PS/2 (callback) and USB (hid.c)
+void keyboard_callback(void) {
- * This fixes the "undefined reference to keyboard_buffer_add" error.
+    uint8_t scancode = inb(KEYBOARD_DATA_PORT);
- */
+
-void keyboard_buffer_add(char c) {
+    if (scancode & 0x80) return;  // Ignore key release
+
+    char c = scancode_map[scancode];
     if (!c) return;
 
     uint8_t next_head = (buffer_head + 1) % KEY_BUFFER_SIZE;
 
-    // If buffer is full, we must drop the key
+    // Drop key if buffer full
-    if (next_head == buffer_tail) {
+    if (next_head == buffer_tail) return;
-        return; 
-    }
 
     key_buffer[buffer_head] = c;
     buffer_head = next_head;
     buffer_count++;
 
-    // Echo to terminal
     terminal_putchar(c);
 }
 
-/**
+void keyboard_init() {
- * Hardware Interrupt Handler for PS/2
+    register_interrupt_handler(33, keyboard_callback); // IRQ1 = int 33 (0x21)
- */
-void keyboard_callback(void) {
-    uint8_t scancode = inb(KEYBOARD_DATA_PORT);
-
-    // Ignore break codes (key release)
-    if (scancode & 0x80) return; 
-
-    char c = scancode_map[scancode];
-    keyboard_buffer_add(c);
 }
 
-void keyboard_init(void) {
+// Blocking read (returns one char)
-    buffer_head = 0;
-    buffer_tail = 0;
-    buffer_count = 0;
-    // IRQ1 is usually mapped to IDT entry 33
-    register_interrupt_handler(33, keyboard_callback); 
-}
-
-/**
- * Blocking read with a safe HLT to prevent CPU 100% usage
- */
 char keyboard_get_char(void) {
-    char c;
+    while (buffer_count == 0) {
-
+        __asm__ __volatile__("hlt");  // Better than busy loop
-    while (1) {
-        __asm__ __volatile__("cli"); // Disable interrupts to check buffer_count safely
-        
-        if (buffer_count > 0) {
-            c = key_buffer[buffer_tail];
-            buffer_tail = (buffer_tail + 1) % KEY_BUFFER_SIZE;
-            buffer_count--;
-            __asm__ __volatile__("sti"); // Re-enable interrupts after reading
-            return c;
-        }
-
-        /* * IMPORTANT: 'sti' followed by 'hlt' is guaranteed by x86 
-         * to execute 'hlt' BEFORE the next interrupt can trigger.
-         * This prevents the race condition hang.
-         */
-        __asm__ __volatile__("sti; hlt"); 
     }
+
+    char c;
+    __asm__ __volatile__("cli");
+    c = key_buffer[buffer_tail];
+    buffer_tail = (buffer_tail + 1) % KEY_BUFFER_SIZE;
+    buffer_count--;
+    __asm__ __volatile__("sti");
+
+    return c;
 }

kernel/keyboard.h

@@ -1,12 +1,7 @@
 #ifndef KEYBOARD_H
 #define KEYBOARD_H
 
-#include <stdint.h>
-
 void keyboard_init(void);
-void keyboard_buffer_add(char c);
+char keyboard_get_char(void);  // Blocking read from buffer
-char keyboard_get_char(void);  
-
-extern const char scancode_map[128]; 
 
 #endif

kernel/mouse.c

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 
 // Mouse buffer
-mouse_data_t mouse_data;
+static mouse_data_t mouse_data;
 
 // Read USB mouse data
 mouse_data_t usb_read_mouse(void) {

kernel/mouse.h

@@ -12,8 +12,6 @@ typedef struct {
     bool right_button;
 } mouse_data_t;
 
-extern mouse_data_t mouse_data;
-
 // Function declarations for USB 1.x HID mouse support
 bool usb_mouse_init(void);
 bool usb_mouse_detected(void);