From 5c1c4eb0a4084b666342e6f8eb348eb80be6214b Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Fri, 12 Aug 2022 15:36:57 +0200 Subject: memcpy, memset; small fixes --- kernel/src/libk/stdio.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kernel/src/libk/stdio.c') diff --git a/kernel/src/libk/stdio.c b/kernel/src/libk/stdio.c index be75b73..da5d839 100644 --- a/kernel/src/libk/stdio.c +++ b/kernel/src/libk/stdio.c @@ -5,32 +5,32 @@ #include #include -int32_t x; -int32_t y; +uint32_t curr_x; +uint32_t curr_y; inline void print_char(char c) { + if (curr_x * 8 >= main_fb.width) { + curr_x = 0; + curr_y++; + } + if (curr_y * 16 >= main_fb.height) { + curr_x = 0; + curr_y = 0; + } if (c == '\n') { - x = 0; - y++; + curr_x = 0; + curr_y++; return; } if (c == '\b') { - if (x != 0) { - x--; + if (curr_x != 0) { + curr_x--; } return; } - if (x * 8 >= (int32_t)main_fb.width) { - x = 0; - y++; - } - if (y * 16 >= (int32_t)main_fb.height) { - x = 0; - y = 0; - } - fb_draw_character(main_fb, c, x * 8, y * 16, WHITE, BLACK); - x++; + fb_draw_character(main_fb, c, (int32_t)curr_x * 8, (int32_t)curr_y * 16, WHITE, BLACK); + curr_x++; } inline void print_string(const char* s) -- cgit v1.2.3