2 Commits

Author SHA1 Message Date
7adb798c17 Update gui.h
Adds gui base header
2026-01-18 15:43:03 -08:00
43b5cacd09 Update gui.c
Add base gui implementation
2026-01-18 15:40:23 -08:00
7 changed files with 101 additions and 90 deletions

View File

@@ -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

View File

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

View File

@@ -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

View File

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

View File

@@ -1,43 +0,0 @@
#ifndef ATA_H
#define ATA_H
#include <stdint.h>
#include <stdbool.h>
/* ATA I/O ports */
#define ATA_PRIMARY_IO 0x1F0
#define ATA_PRIMARY_CTRL 0x3F6
/* ATA registers */
#define ATA_REG_DATA 0x00
#define ATA_REG_ERROR 0x01
#define ATA_REG_FEATURES 0x01
#define ATA_REG_SECCOUNT0 0x02
#define ATA_REG_LBA0 0x03
#define ATA_REG_LBA1 0x04
#define ATA_REG_LBA2 0x05
#define ATA_REG_HDDEVSEL 0x06
#define ATA_REG_COMMAND 0x07
#define ATA_REG_STATUS 0x07
/* ATA commands */
#define ATA_CMD_READ_PIO 0x20
#define ATA_CMD_WRITE_PIO 0x30
#define ATA_CMD_IDENTIFY 0xEC
/* Status flags */
#define ATA_SR_BSY 0x80
#define ATA_SR_DRDY 0x40
#define ATA_SR_DRQ 0x08
#define ATA_SR_ERR 0x01
/* Drive select */
#define ATA_MASTER 0x00
#define ATA_SLAVE 0x10
/* Public API */
bool ata_init(void);
bool ata_read_sector(uint32_t lba, uint8_t* buffer);
bool ata_write_sector(uint32_t lba, const uint8_t* buffer);
#endif

View File

@@ -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
}

View File

@@ -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