diff options
| author | Marvin Borner | 2019-11-30 13:22:16 +0100 |
|---|---|---|
| committer | GitHub | 2019-11-30 13:22:16 +0100 |
| commit | 728d764f314b98adec26d8e674b7235db6c4ad63 (patch) | |
| tree | ddbe09554a056eba4a470041c9e3d74ddd64ff8a /src/kernel/graphics/vesa.c | |
| parent | e294302ec8940669e7c8c5559eff2441f9ce4988 (diff) | |
| parent | de2f84f733776b19c0adecbfc8b31ea88f7b6291 (diff) | |
Merged external font
External font resources (smaller kernel)
Diffstat (limited to 'src/kernel/graphics/vesa.c')
| -rw-r--r-- | src/kernel/graphics/vesa.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c index 5e3080c..9563f4f 100644 --- a/src/kernel/graphics/vesa.c +++ b/src/kernel/graphics/vesa.c @@ -101,7 +101,6 @@ struct vbe_mode_info *vbe_get_mode_info(uint16_t mode) void set_optimal_resolution() { - asm ("sti"); vga_log("Switching to graphics mode", 8); vga_log("Trying to detect available modes", 9); uint16_t *video_modes = vbe_get_modes(); @@ -292,9 +291,9 @@ void vesa_draw_char(char ch) uint16_t bitmap = 0; for (int cy = 0; cy <= font_height; cy++) { - if (font_height == 16) bitmap = font_16[ch - 32][cy]; - else if (font_height == 24) bitmap = font_24[ch - 32][cy] >> 4; - else if (font_height == 32) bitmap = font_32[ch - 32][cy]; + if (font_height == 16) bitmap = font->font_16[ch - 32][cy]; + else if (font_height == 24) bitmap = font->font_24[ch - 32][cy] >> 4; + else if (font_height == 32) bitmap = font->font_32[ch - 32][cy]; for (int cx = 0; cx <= font_width + 1; cx++) { if (bitmap & ((1 << font_width) >> cx)) { // Side effect: Smoothness factor! draw[vbe_bpl * cx] = terminal_color[2]; @@ -396,7 +395,7 @@ void vesa_draw_cursor(int x, int y) prev[vbe_bpl * cx] = draw[vbe_bpl * cx]; prev[vbe_bpl * cx + 1] = draw[vbe_bpl * cx + 1]; prev[vbe_bpl * cx + 2] = draw[vbe_bpl * cx + 2]; - if (cursor[cy] & ((1 << 12) >> cx)) { + if (font->cursor[cy] & ((1 << 12) >> cx)) { draw[vbe_bpl * cx] = terminal_color[2]; draw[vbe_bpl * cx + 1] = terminal_color[1]; draw[vbe_bpl * cx + 2] = terminal_color[0]; |