implemented basic keyboard input getting
This commit is contained in:
+26
-10
@@ -6,12 +6,12 @@ static size_t terminal_column;
|
||||
static uint8_t terminal_color;
|
||||
static uint16_t* terminal_buffer;
|
||||
|
||||
uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
|
||||
inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
|
||||
{
|
||||
return fg | bg << 4;
|
||||
}
|
||||
|
||||
uint16_t vga_entry(unsigned char uc, uint8_t color)
|
||||
inline uint16_t vga_entry(unsigned char uc, uint8_t color)
|
||||
{
|
||||
return (uint16_t) uc | (uint16_t) color << 8;
|
||||
}
|
||||
@@ -49,14 +49,32 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
|
||||
terminal_buffer[index] = vga_entry(c, color);
|
||||
}
|
||||
|
||||
void terminal_putchar(char c)
|
||||
void terminal_putchar(char c)
|
||||
{
|
||||
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
|
||||
if (++terminal_column == VGA_WIDTH) {
|
||||
/*if(c == '\n')
|
||||
{
|
||||
terminal_column = 0;
|
||||
terminal_row++;
|
||||
}*/
|
||||
if(c != '\n')
|
||||
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
|
||||
|
||||
if (++terminal_column >= VGA_WIDTH){
|
||||
terminal_column = 0;
|
||||
if (++terminal_row == VGA_HEIGHT)
|
||||
terminal_row = 0;
|
||||
}
|
||||
terminal_initialize();
|
||||
if (++terminal_row >= VGA_HEIGHT)
|
||||
terminal_row = 0;
|
||||
}
|
||||
if(terminal_row >= VGA_HEIGHT){
|
||||
terminal_row = 0;
|
||||
}
|
||||
|
||||
if(c == '\n')
|
||||
{
|
||||
terminal_column = 0;
|
||||
terminal_row++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void terminal_write(const char* data, size_t size)
|
||||
@@ -68,6 +86,4 @@ void terminal_write(const char* data, size_t size)
|
||||
void terminal_writestring(const char* data)
|
||||
{
|
||||
terminal_write(data, strlen(data));
|
||||
terminal_row++;
|
||||
terminal_column = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user