aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/graphics/vesa.c
diff options
context:
space:
mode:
authorMarvin Borner2019-11-30 13:20:57 +0100
committerMarvin Borner2019-11-30 13:20:57 +0100
commitde2f84f733776b19c0adecbfc8b31ea88f7b6291 (patch)
treeddbe09554a056eba4a470041c9e3d74ddd64ff8a /src/kernel/graphics/vesa.c
parent4ada94d4db995ebf150dd3ecfc8efd3241a6ff84 (diff)
Yeeha fixed font installation!
Diffstat (limited to 'src/kernel/graphics/vesa.c')
-rw-r--r--src/kernel/graphics/vesa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 65d65a5..9563f4f 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -291,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];
@@ -395,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];