diff options
| -rwxr-xr-x | run | 8 | ||||
| -rw-r--r-- | src/config.h | 2 | ||||
| -rw-r--r-- | src/drivers/keyboard.c | 57 | ||||
| -rw-r--r-- | src/drivers/vesa.c | 2 | ||||
| -rw-r--r-- | src/features/gui.c | 28 | ||||
| -rw-r--r-- | src/features/psf.c | 1 | ||||
| -rw-r--r-- | src/inc/gui.h | 2 | ||||
| -rw-r--r-- | src/inc/vesa.h | 2 | ||||
| -rw-r--r-- | src/main.c | 5 |
9 files changed, 79 insertions, 28 deletions
@@ -6,16 +6,10 @@ set -e cd "$(dirname "$0")" mode="${1}" -no_ask="${2}" network="rtl8139" qemu_with_flags() { - if [ "${mode}" = "image" ] || [ "${mode}" = "image_debug" ]; then - # TODO: Find out why kvm install is incredibly slow - SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-i386 -no-reboot -vga std -smp "$(nproc)" -serial mon:stdio -rtc base=localtime -m 256M -net nic,model=${network},macaddr=42:42:42:42:42:42 -net user "$@" - else - SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-i386 -no-reboot -vga std -serial stdio -rtc base=localtime -m 256M -net nic,model=${network},macaddr=42:42:42:42:42:42 -net user "$@" - fi + SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-i386 -no-reboot -vga std -serial stdio -rtc base=localtime -m 256M -net nic,model=${network},macaddr=42:42:42:42:42:42 -net user "$@" } make_cross() { diff --git a/src/config.h b/src/config.h index 08779a7..789a80f 100644 --- a/src/config.h +++ b/src/config.h @@ -6,7 +6,9 @@ int MELVIX_VERSION = 0; +#define USERNAME "melvin" #define FONT_PATH "/font/ter-p32n.psf" //#define FONT_PATH "/font/spleen-16x32.psfu" +#define NETWORK "rtl8139" #endif diff --git a/src/drivers/keyboard.c b/src/drivers/keyboard.c index 558563e..38ff1f7 100644 --- a/src/drivers/keyboard.c +++ b/src/drivers/keyboard.c @@ -1,18 +1,21 @@ #include <cpu.h> #include <def.h> +#include <gui.h> #include <interrupts.h> -#include <serial.h> -#include <vesa.h> -u8 scancode; +char keymap[128]; +// TODO: Use keyboard as event and move logic to other file void keyboard_handler() { - scancode = inb(0x60); - //serial_print("KEY\n"); - //struct keyboard_event *event = malloc(sizeof(struct keyboard_event)); - //event->scancode = scancode; - //event_trigger(MAP_KEYBOARD, (u8 *)event); + u8 scan_code = inb(0x60); + + if (scan_code > 128) + return; + + if ((scan_code & 0x80) == 0) { // PRESS + gui_term_write_char(keymap[scan_code]); + } } void keyboard_acknowledge() @@ -28,16 +31,38 @@ void keyboard_rate() outb(0x60, 0x0); // Rate{00000} Delay{00} 0 } -char wait_scancode() -{ - scancode = 0; - while (scancode == 0) { - }; - return scancode; -} - void keyboard_install() { //keyboard_rate(); TODO: Fix keyboard rate? irq_install_handler(1, keyboard_handler); } + +char keymap[128] = { + 0, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', + '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', + '\n', 17, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', + 14, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 14, '*', + 0, // Alt key + ' ', // Space bar + 15, // Caps lock + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys + 0, // Num lock + 0, // Scroll lock + 0, // Home key + 0, // Up arrow + 0, // Page up + '-', + 0, // Left arrow + 0, + 0, // Right arrow + '+', + 0, // End key + 0, // Down arrow + 0, // Page down + 0, // Insert key + 0, // Delete key + 0, 0, 0, + 0, // F11 + 0, // F12 + 0, // Other keys +}; diff --git a/src/drivers/vesa.c b/src/drivers/vesa.c index 6bafd9e..9402664 100644 --- a/src/drivers/vesa.c +++ b/src/drivers/vesa.c @@ -32,6 +32,8 @@ void vesa_fill(const u32 color[3]) void vesa_init(struct vbe *info) { vbe = info; + vbe_height = vbe->height; + vbe_width = vbe->width; vbe_bpl = vbe->bpp >> 3; vbe_pitch = vbe->pitch; fb = (u8 *)vbe->framebuffer; diff --git a/src/features/gui.c b/src/features/gui.c index ddf1c60..fa0641c 100644 --- a/src/features/gui.c +++ b/src/features/gui.c @@ -11,8 +11,6 @@ struct font *font; void gui_write_char(int x, int y, const u32 c[3], char ch) { - /* const u32 c[3] = { 0xff, 0x00, 0x00 }; */ - int pos = x * vbe_bpl + y * vbe_pitch; char *draw = (char *)&fb[pos]; @@ -38,6 +36,32 @@ void gui_write(int x, int y, const u32 c[3], char *text) } } +// Abstraction +int x, y = 1; +const u32 c[3] = { 0xff, 0xff, 0xff }; +void gui_term_write_char(char ch) +{ + if (x + font->width > vbe_width) { + x = 0; + y += font->height; + } + + if (ch >= ' ' && ch <= '~') { + gui_write_char(x, y, c, ch); + x += font->width; + } else if (ch == '\n') { + x = 0; + y += font->height; + } +} + +void gui_term_write(char *text) +{ + for (u32 i = 0; i < strlen(text); i++) { + gui_term_write_char(text[i]); + } +} + void gui_init(char *font_path) { font = psf_parse(read_file(font_path)); diff --git a/src/features/psf.c b/src/features/psf.c index c713bb4..adf2aa2 100644 --- a/src/features/psf.c +++ b/src/features/psf.c @@ -44,6 +44,7 @@ struct font *psf_parse(char *data) width = ((struct psf2_header *)data)->width; char_size = ((struct psf2_header *)data)->char_size; } else { + printf("Unknown font!\n"); return 0; } diff --git a/src/inc/gui.h b/src/inc/gui.h index 130db8b..760bcb9 100644 --- a/src/inc/gui.h +++ b/src/inc/gui.h @@ -15,6 +15,8 @@ struct font { }; void gui_write(int x, int y, const u32 c[3], char *text); +void gui_term_write_char(char ch); +void gui_term_write(char *text); void gui_init(char *font_path); #endif diff --git a/src/inc/vesa.h b/src/inc/vesa.h index e1ea521..e34cdc0 100644 --- a/src/inc/vesa.h +++ b/src/inc/vesa.h @@ -44,6 +44,8 @@ struct vbe { }; struct vbe *vbe; +int vbe_width; +int vbe_height; int vbe_bpl; int vbe_pitch; u8 *fb; @@ -22,7 +22,7 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info) mem_info++; // TODO: Use the mmap (or remove)! vesa_init(vid_info->info); - u32 terminal_background[3] = { 0x1d, 0x1f, 0x24 }; + u32 terminal_background[3] = { 0, 0, 0 }; vesa_fill(terminal_background); serial_install(); @@ -30,8 +30,7 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info) ls_root(); gui_init(FONT_PATH); - u32 c[] = { 0xff, 0xff, 0xff }; - gui_write(0, 0, c, "Hello, world!"); + gui_term_write("Welcome back, " USERNAME ".\n"); while (1) { }; |