starnakin/42_KFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: character escape (you can now write text)

Browse Source 
fix: cursor when changing screens
This commit is contained in:
0x35c 2024-09-08 15:32:47 +02:00
parent cf617d6984
commit d0ddac4775
5 changed files with 125 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Makefile
View File

@ -1,62 +1,61 @@
BUILDDIR := build
SOURCEDIR := src
OBJECTDIR := obj
NAME := bozOS NAME := bozOS
AS := i386-elf-as AS := i386-elf-as
ASFLAGS := ASFLAGS :=
CC := i386-elf-gcc CC := i386-elf-gcc
CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers -iquoteheaders -g CFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers -iquoteheaders -MMD -g
LD := $(CC) LD := $(CC)
LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib
LIBS := -L libbozo/build/ -lbozo -lgcc LIBS := -L libbozo/build/ -lbozo -lgcc
SSRC := $(shell find $(SOURCEDIR) -name '*.s') SSRC := $(shell find src -name '*.s')
CSRC := $(shell find $(SOURCEDIR) -name '*.c') CSRC := $(shell find src -name '*.c')
OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\ OBJ := $(patsubst src/%.c,obj/%.o,$(CSRC))\
$(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC)) $(patsubst src/%.s,obj/%.o,$(SSRC))
DEP := $(patsubst %.o,%.d,$(OBJ))
all: $(NAME) all: $(NAME)
$(OBJECTDIR)/%.o: $(SOURCEDIR)/%.s obj/%.o: src/%.s
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(AS) $(ASFLAGS) $< -o $@ $(AS) $(ASFLAGS) $< -o $@
$(OBJECTDIR)/%.o: $(SOURCEDIR)/%.c obj/%.o: src/%.c
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(CC) $(CCFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(NAME): $(OBJ) $(NAME): $(OBJ)
make -C libbozo make -C libbozo
mkdir -p $(BUILDDIR)/ mkdir -p build
$(LD) $(LDFLAGS) -o $(BUILDDIR)/$(NAME).bin $(OBJ) $(LIBS) $(LD) $(LDFLAGS) -o build/$(NAME).bin $(OBJ) $(LIBS)
run: $(NAME) run: $(NAME)
qemu-system-i386 -kernel $(BUILDDIR)/$(NAME).bin qemu-system-i386 -kernel build/$(NAME).bin
iso: $(NAME) iso: $(NAME)
mkdir -p isodir/boot/grub mkdir -p isodir/boot/grub
cp $(BUILDDIR)/$(NAME).bin isodir/boot/bozOS.bin cp build/$(NAME).bin isodir/boot/$(NAME).bin
cp config/grub.cfg isodir/boot/grub/grub.cfg cp config/grub.cfg isodir/boot/grub/grub.cfg
grub-mkrescue -o $(BUILDDIR)/bozOS.iso isodir grub-mkrescue -o build/$(NAME).iso isodir
rm -rf isodir rm -rf isodir
run_iso: iso run-iso: iso
qemu-system-i386 -cdrom $(BUILDDIR)/bozOS.iso qemu-system-i386 -cdrom build/$(NAME).iso
debug: iso debug: iso
qemu-system-i386 -s -S $(BUILDDIR)/bozOS.iso qemu-system-i386 -s -S build/$(NAME).iso
clean: clean:
make -C libbozo clean make -C libbozo clean
rm -rf $(OBJDIR) rm -rf isodir
rm -rf obj
fclean: clean fclean: clean
make -C libbozo fclean make -C libbozo fclean
rm -rf $(BUILDDIR)/ rm -rf build
re: fclean all re: fclean all
.PHONY: all clean fclean re run iso run_iso .PHONY: all clean fclean re run iso run-iso
-include $(DEP)

95
headers/keyboard.h Normal file
View File

@ -0,0 +1,95 @@
#pragma once
static const char *keymap[128] = {
[2] = "1!", [3] = "2@", [4] = "3#", [5] = "4$", [6] = "5%",
[7] = "6^", [8] = "7&", [9] = "8*", [10] = "9(", [11] = "0)",
[12] = "-_", [13] = "=+", [16] = "qQ", [17] = "wW", [18] = "eE",
[19] = "rR", [20] = "tT", [21] = "yY", [22] = "uU", [23] = "iI",
[24] = "oO", [25] = "pP", [26] = "[{", [27] = "]}", [28] = "\n\n",
[30] = "aA", [31] = "sS", [32] = "dD", [33] = "fF", [34] = "gG",
[35] = "hH", [36] = "jJ", [37] = "kK", [38] = "lL", [39] = ";:",
[40] = "'\"", [43] = "\\|", [44] = "zZ", [45] = "xX", [46] = "cC",
[47] = "vV", [48] = "bB", [49] = "nN", [50] = "mM", [51] = ",<",
[52] = ".>", [53] = "/?", [57] = " ",
};
#define KEYBOARD_PORT 0x60
#define KEY_1 0x02
#define KEY_2 0x03
#define KEY_3 0x04
#define KEY_4 0x05
#define KEY_5 0x06
#define KEY_6 0x07
#define KEY_7 0x08
#define KEY_8 0x09
#define KEY_9 0x0A
#define KEY_0 0x0B
#define KEY_MINUS 0x0C
#define KEY_EQUAL 0x0D
#define KEY_BACKSPACE 0x0E
#define KEY_TAB 0x0F
#define KEY_SQUARE_OPEN_BRACKET 0x1A
#define KEY_SQUARE_CLOSE_BRACKET 0x1B
#define KEY_ENTER 0x1C
#define KEY_A 0x1E
#define KEY_B 0x30
#define KEY_C 0x2E
#define KEY_D 0x20
#define KEY_E 0x12
#define KEY_F 0x21
#define KEY_G 0x22
#define KEY_H 0x23
#define KEY_I 0x17
#define KEY_J 0x24
#define KEY_K 0x25
#define KEY_L 0x26
#define KEY_M 0x32
#define KEY_N 0x31
#define KEY_O 0x18
#define KEY_P 0x19
#define KEY_Q 0x10
#define KEY_R 0x13
#define KEY_S 0x1F
#define KEY_T 0x14
#define KEY_U 0x16
#define KEY_V 0x2F
#define KEY_W 0x11
#define KEY_X 0x2D
#define KEY_Y 0x15
#define KEY_Z 0x2C
#define KEY_SEMICOLON 0x27
#define KEY_BACKSLASH 0x2B
#define KEY_COMMA 0x33
#define KEY_DOT 0x34
#define KEY_FORESLASH 0x35
#define KEY_F1 0x3B
#define KEY_F2 0x3C
#define KEY_F3 0x3D
#define KEY_F4 0x3E
#define KEY_F5 0x3F
#define KEY_F6 0x40
#define KEY_F7 0x41
#define KEY_F8 0x42
#define KEY_F9 0x43
#define KEY_F10 0x44
#define KEY_F11 0x85
#define KEY_F12 0x86
#define KEY_DELETE 0x53
#define KEY_DOWN 0x50
#define KEY_END 0x4F
#define KEY_ESC 0x01
#define KEY_HOME 0x47
#define KEY_INSERT 0x52
#define KEY_KEYPAD_5 0x4C
#define KEY_KEYPAD_MUL 0x37
#define KEY_KEYPAD_Minus 0x4A
#define KEY_KEYPAD_PLUS 0x4E
#define KEY_KEYPAD_DIV 0x35
#define KEY_LEFT 0x4B
#define KEY_PAGE_DOWN 0x51
#define KEY_PAGE_UP 0x49
#define KEY_PRINT_SCREEN 0x37
#define KEY_RIGHT 0x4D
#define KEY_SPACE 0x39
#define KEY_UP 0x48

81
headers/terminal.h
View File

@ -9,87 +9,6 @@
#define TERM_BUF ((uint16_t *)0xB8000) #define TERM_BUF ((uint16_t *)0xB8000)
#define TERM_COUNT 10 #define TERM_COUNT 10
#define KEYBOARD_PORT 0x60
#define KEY_A 0x1E
#define KEY_B 0x30
#define KEY_C 0x2E
#define KEY_D 0x20
#define KEY_E 0x12
#define KEY_F 0x21
#define KEY_G 0x22
#define KEY_H 0x23
#define KEY_I 0x17
#define KEY_J 0x24
#define KEY_K 0x25
#define KEY_L 0x26
#define KEY_M 0x32
#define KEY_N 0x31
#define KEY_O 0x18
#define KEY_P 0x19
#define KEY_Q 0x10
#define KEY_R 0x13
#define KEY_S 0x1F
#define KEY_T 0x14
#define KEY_U 0x16
#define KEY_V 0x2F
#define KEY_W 0x11
#define KEY_X 0x2D
#define KEY_Y 0x15
#define KEY_Z 0x2C
#define KEY_1 0x02
#define KEY_2 0x03
#define KEY_3 0x04
#define KEY_4 0x05
#define KEY_5 0x06
#define KEY_6 0x07
#define KEY_7 0x08
#define KEY_8 0x09
#define KEY_9 0x0A
#define KEY_0 0x0B
#define KEY_MINUS 0x0C
#define KEY_EQUAL 0x0D
#define KEY_SQUARE_OPEN_BRACKET 0x1A
#define KEY_SQUARE_CLOSE_BRACKET 0x1B
#define KEY_SEMICOLON 0x27
#define KEY_BACKSLASH 0x2B
#define KEY_COMMA 0x33
#define KEY_DOT 0x34
#define KEY_FORESLHASH 0x35
#define KEY_F1 0x3B
#define KEY_F2 0x3C
#define KEY_F3 0x3D
#define KEY_F4 0x3E
#define KEY_F5 0x3F
#define KEY_F6 0x40
#define KEY_F7 0x41
#define KEY_F8 0x42
#define KEY_F9 0x43
#define KEY_F10 0x44
#define KEY_F11 0x85
#define KEY_F12 0x86
#define KEY_BACKSPACE 0x0E
#define KEY_DELETE 0x53
#define KEY_DOWN 0x50
#define KEY_END 0x4F
#define KEY_ENTER 0x1C
#define KEY_ESC 0x01
#define KEY_HOME 0x47
#define KEY_INSERT 0x52
#define KEY_KEYPAD_5 0x4C
#define KEY_KEYPAD_MUL 0x37
#define KEY_KEYPAD_Minus 0x4A
#define KEY_KEYPAD_PLUS 0x4E
#define KEY_KEYPAD_DIV 0x35
#define KEY_LEFT 0x4B
#define KEY_PAGE_DOWN 0x51
#define KEY_PAGE_UP 0x49
#define KEY_PRINT_SCREEN 0x37
#define KEY_RIGHT 0x4D
#define KEY_SPACE 0x39
#define KEY_TAB 0x0F
#define KEY_UP 0x48
struct screen { struct screen {
size_t row; size_t row;
size_t column; size_t column;

4
src/terminal/get.c
View File

@ -1,3 +1,4 @@
#include "keyboard.h"
#include "kprintf.h" #include "kprintf.h"
#include "sys/io.h" #include "sys/io.h"
#include "terminal.h" #include "terminal.h"
@ -9,7 +10,8 @@ uint8_t terminal_getkey(void)
scan_code = inb(KEYBOARD_PORT); scan_code = inb(KEYBOARD_PORT);
if (scan_code != prev_scan_code && prev_scan_code != 0) { if (scan_code != prev_scan_code && prev_scan_code != 0) {
kprintf(0, "%d", scan_code); if (scan_code < 128 && keymap[scan_code])
kprintf(0, "%c", keymap[scan_code][0]);
if (scan_code >= KEY_F1 && scan_code <= KEY_F10) if (scan_code >= KEY_F1 && scan_code <= KEY_F10)
terminal_set_screen(scan_code - KEY_F1); terminal_set_screen(scan_code - KEY_F1);
} }

9
src/terminal/put.c
View File

@ -26,14 +26,14 @@ void terminal_initialize(void)
for (size_t y = 0; y < VGA_HEIGHT; y++) { for (size_t y = 0; y < VGA_HEIGHT; y++) {
for (size_t x = 0; x < VGA_WIDTH; x++) { for (size_t x = 0; x < VGA_WIDTH; x++) {
const size_t index = y * VGA_WIDTH + x; const size_t index = y * VGA_WIDTH + x;
TERM_BUF[index] = vga_entry(' ', screen->color); TERM_BUF[index] = vga_entry(' ', VGA_COLOR_WHITE);
} }
} }
for (int i = 0; i < TERM_COUNT; i++) { for (int i = 0; i < TERM_COUNT; i++) {
screens[i].row = 0; screens[i].row = 0;
screens[i].column = 0; screens[i].column = 0;
screens[i].color = screens[i].color = vga_entry_color(VGA_COLOR_LIGHT_MAGENTA - i,
vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK); VGA_COLOR_BLACK);
memcpy(screens[i].buffer, TERM_BUF, sizeof(screen->buffer)); memcpy(screens[i].buffer, TERM_BUF, sizeof(screen->buffer));
} }
} }
@ -43,6 +43,7 @@ void terminal_set_screen(int pos)
memcpy(screen->buffer, TERM_BUF, sizeof(screen->buffer)); memcpy(screen->buffer, TERM_BUF, sizeof(screen->buffer));
screen = &screens[pos]; screen = &screens[pos];
memcpy(TERM_BUF, screen->buffer, sizeof(screen->buffer)); memcpy(TERM_BUF, screen->buffer, sizeof(screen->buffer));
update_cursor();
} }
void terminal_setcolor(uint8_t color) void terminal_setcolor(uint8_t color)
@ -62,7 +63,7 @@ static void terminal_scroll(void)
for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++) for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++)
TERM_BUF[i] = TERM_BUF[i + VGA_WIDTH]; TERM_BUF[i] = TERM_BUF[i + VGA_WIDTH];
for (size_t i = 0; i < VGA_WIDTH; i++) for (size_t i = 0; i < VGA_WIDTH; i++)
terminal_putentryat(' ', screen->color, i, VGA_HEIGHT - 1); terminal_putentryat(' ', VGA_COLOR_WHITE, i, VGA_HEIGHT - 1);
} }
static void terminal_new_line(void) static void terminal_new_line(void)