Applied official linux kernel code style guidelines

Due to my change to vim and the clang-format plugin this was needed!

1 files changed, 297 insertions, 279 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 2e14705..da57da1 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -8,204 +8,216 @@
 
 void switch_to_vga()
 {
-    serial_printf("Force switch to VGA!");
-    uint16_t *terminal_buffer = (uint16_t *) 0xB8000;
-    char *error = "Melvix does not support this graphics hardware!";
-    for (size_t i = 0; i < strlen(error); i++)
-        terminal_buffer[24 * 80 + i] = (uint16_t) error[i] | (uint16_t) 0x700;
-    panic("No VESA support!");
+	serial_printf("Force switch to VGA!");
+	uint16_t *terminal_buffer = (uint16_t *)0xB8000;
+	char *error = "Melvix does not support this graphics hardware!";
+	for (size_t i = 0; i < strlen(error); i++)
+		terminal_buffer[24 * 80 + i] = (uint16_t)error[i] | (uint16_t)0x700;
+	panic("No VESA support!");
 }
 
 struct edid_data get_edid()
 {
-    regs16_t regs;
-    regs.ax = 0x4F15;
-    regs.bx = 0x1; // BL
-    regs.es = 0;
-    regs.di = 0x7E00;
-    v86(0x10, &regs);
+	regs16_t regs;
+	regs.ax = 0x4F15;
+	regs.bx = 0x1; // BL
+	regs.es = 0;
+	regs.di = 0x7E00;
+	v86(0x10, &regs);
 
-    if ((regs.ax & 0xFF) != 0x4F) {
-        warn("No EDID available!");
-    }
+	if ((regs.ax & 0xFF) != 0x4F) {
+		warn("No EDID available!");
+	}
 
-    struct edid_data *edid = (struct edid_data *) 0x7E00;
+	struct edid_data *edid = (struct edid_data *)0x7E00;
 
-    return *edid;
+	return *edid;
 }
 
 void vbe_set_mode(unsigned short mode)
 {
-    regs16_t regs;
-    regs.ax = 0x4F02;
-    regs.bx = mode;
-    regs.bx |= 0x4000;
-    v86(0x10, &regs);
-
-    if (regs.ax != 0x004F)
-        switch_to_vga();
+	regs16_t regs;
+	regs.ax = 0x4F02;
+	regs.bx = mode;
+	regs.bx |= 0x4000;
+	v86(0x10, &regs);
+
+	if (regs.ax != 0x004F)
+		switch_to_vga();
 }
 
 uint16_t *vbe_get_modes()
 {
-    char *info_address = (char *) 0x7E00;
-    strcpy(info_address, "VBE2");
-    for (int i = 4; i < 512; i++) *(info_address + i) = 0;
+	char *info_address = (char *)0x7E00;
+	strcpy(info_address, "VBE2");
+	for (int i = 4; i < 512; i++)
+		*(info_address + i) = 0;
 
-    regs16_t regs;
-    regs.ax = 0x4F00;
-    regs.es = 0;
-    regs.di = 0x7E00;
-    v86(0x10, &regs);
+	regs16_t regs;
+	regs.ax = 0x4F00;
+	regs.es = 0;
+	regs.di = 0x7E00;
+	v86(0x10, &regs);
 
-    struct vbe_info *info = (struct vbe_info *) info_address;
+	struct vbe_info *info = (struct vbe_info *)info_address;
 
-    if (regs.ax != 0x004F || strcmp(info->signature, "VESA") != 0) switch_to_vga();
+	if (regs.ax != 0x004F || strcmp(info->signature, "VESA") != 0)
+		switch_to_vga();
 
-    // Get number of modes
-    uint16_t *mode_ptr = (uint16_t *) info->video_modes;
-    size_t number_modes = 1;
-    for (uint16_t *p = mode_ptr; *p != 0xFFFF; p++) number_modes++;
+	// Get number of modes
+	uint16_t *mode_ptr = (uint16_t *)info->video_modes;
+	size_t number_modes = 1;
+	for (uint16_t *p = mode_ptr; *p != 0xFFFF; p++)
+		number_modes++;
 
-    uint16_t *ret = (uint16_t *) kmalloc(sizeof(uint16_t) * number_modes);
-    for (size_t i = 0; i < number_modes; i++)
-        ret[i] = ((uint16_t *) info->video_modes)[i];
+	uint16_t *ret = (uint16_t *)kmalloc(sizeof(uint16_t) * number_modes);
+	for (size_t i = 0; i < number_modes; i++)
+		ret[i] = ((uint16_t *)info->video_modes)[i];
 
-    return ret;
+	return ret;
 }
 
 struct vbe_mode_info *vbe_get_mode_info(uint16_t mode)
 {
-    regs16_t regs;
-    regs.ax = 0x4F01;
-    regs.cx = mode;
-    regs.es = 0;
-    regs.di = 0x7E00;
-    v86(0x10, &regs);
-    if (regs.ax != 0x004f) return 0;
-
-    struct vbe_mode_info_all *mode_info = (struct vbe_mode_info_all *) 0x7E00;
-
-    struct vbe_mode_info *ret = (struct vbe_mode_info *) kmalloc(sizeof(struct vbe_mode_info));
-    ret->attributes = mode_info->attributes;
-    ret->pitch = mode_info->pitch;
-    ret->width = mode_info->width;
-    ret->height = mode_info->height;
-    ret->bpp = mode_info->bpp;
-    ret->memory_model = mode_info->memory_model;
-    ret->framebuffer = mode_info->framebuffer;
-
-    return ret;
+	regs16_t regs;
+	regs.ax = 0x4F01;
+	regs.cx = mode;
+	regs.es = 0;
+	regs.di = 0x7E00;
+	v86(0x10, &regs);
+	if (regs.ax != 0x004f)
+		return 0;
+
+	struct vbe_mode_info_all *mode_info = (struct vbe_mode_info_all *)0x7E00;
+
+	struct vbe_mode_info *ret = (struct vbe_mode_info *)kmalloc(sizeof(struct vbe_mode_info));
+	ret->attributes = mode_info->attributes;
+	ret->pitch = mode_info->pitch;
+	ret->width = mode_info->width;
+	ret->height = mode_info->height;
+	ret->bpp = mode_info->bpp;
+	ret->memory_model = mode_info->memory_model;
+	ret->framebuffer = mode_info->framebuffer;
+
+	return ret;
 }
 
 void set_optimal_resolution()
 {
-    vga_log("Switching to graphics mode");
-    vga_log("Trying to detect available modes");
-    uint16_t *video_modes = vbe_get_modes();
-
-    uint16_t highest = 0;
-
-    for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) {
-        struct vbe_mode_info *mode_info = vbe_get_mode_info(*mode);
-
-        if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 ||
-            (mode_info->memory_model != 4 && mode_info->memory_model != 6)) {
-            kfree(mode_info);
-            continue;
-        }
-
-        serial_printf("Found mode: (0x%x) %dx%dx%d", *mode, mode_info->width, mode_info->height, mode_info->bpp);
-
-        if (mode_info->width > vbe_width || (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl)) {
-            // if (mode_info->bpp == 32) { // Force specific bpp for debugging
-            // (float) mode_info->width / (float) mode_info->height < 2.0 &&) {
-            highest = *mode;
-            vbe_width = mode_info->width;
-            vbe_height = mode_info->height;
-            vbe_pitch = mode_info->pitch;
-            vbe_bpl = mode_info->bpp >> 3;
-            fb = (unsigned char *) mode_info->framebuffer;
-        }
-        kfree(mode_info);
-    }
-
-    kfree(video_modes);
-
-    if (highest == 0) {
-        serial_printf("Mode detection failed!\nTrying common modes...");
-        vga_log("Mode detection failed!");
-        vga_log("Trying common modes...");
-        struct vbe_mode_info *mode_info;
-        int modes[] = {
-                322, 287, 286, 285, 284, // 1600x1200
-                356, 355, 354, 353, 352, // 1440x900
-                317, 283, 282, 281, 263, 262, // 1280x1024
-                361, 360, 359, 358, 357, // 1152x720
-                312, 280, 279, 278, 261, 260, // 1024x768
-                366, 365, 364, 363, 362, // 1024x640
-                307, 306, 305, 304, 303, // 896x672
-                302, 277, 267, 275, 259, 258, 106, // 800x600
-                371, 370, 369, 368, 367, // 800x500
-                297, 274, 273, 272, 257, // 640x480
-                292, 291, 290, 289, 256, // 640x400
-                271, 270, 269, // 320x200
-        };
-
-        for (size_t i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) {
-            mode_info = vbe_get_mode_info((uint16_t) modes[i]);
-            if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 ||
-                (mode_info->memory_model != 4 && mode_info->memory_model != 6)) {
-                kfree(mode_info);
-                continue;
-            }
-
-            if ((mode_info->width > vbe_width || (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl))) {
-                highest = (uint16_t) modes[i];
-                vbe_width = mode_info->width;
-                vbe_height = mode_info->height;
-                vbe_pitch = mode_info->pitch;
-                vbe_bpl = mode_info->bpp >> 3;
-                fb = (unsigned char *) mode_info->framebuffer;
-            }
-            kfree(mode_info);
-        }
-
-        // Everything else failed :(
-        if (highest == 0)
-            switch_to_vga();
-    } else vga_log("Mode detection succeeded");
-
-    vbe_set_mode(highest);
-
-    uint32_t fb_size = vbe_width * vbe_height * vbe_bpl;
-    cursor_buffer = kmalloc(fb_size);
-    for (uint32_t z = 0; z < fb_size; z += 4096) {
-        paging_map((uint32_t) fb + z, (uint32_t) fb + z, PT_PRESENT | PT_RW | PT_USED);
-        paging_map((uint32_t) cursor_buffer + z, (uint32_t) cursor_buffer + z, PT_PRESENT | PT_RW | PT_USED);
-    }
-    serial_printf("0x%x", fb);
-
-    if (vbe_height > 1440) vesa_set_font(32);
-    else if (vbe_height > 720) vesa_set_font(24);
-    else vesa_set_font(16);
-    vesa_set_color(default_text_color);
-    vesa_clear();
-
-    vesa_set_color(vesa_blue);
-    printf(vga_buffer);
-    vesa_set_color(default_text_color);
-
-    info("Successfully switched to video mode!");
-
-    serial_printf("Using mode: (0x%x) %dx%dx%d", highest, vbe_width, vbe_height, vbe_bpl << 3);
-    debug("Using mode: %dx%dx%d", vbe_width, vbe_height, vbe_bpl << 3);
+	vga_log("Switching to graphics mode");
+	vga_log("Trying to detect available modes");
+	uint16_t *video_modes = vbe_get_modes();
+
+	uint16_t highest = 0;
+
+	for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) {
+		struct vbe_mode_info *mode_info = vbe_get_mode_info(*mode);
+
+		if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 ||
+		    (mode_info->memory_model != 4 && mode_info->memory_model != 6)) {
+			kfree(mode_info);
+			continue;
+		}
+
+		serial_printf("Found mode: (0x%x) %dx%dx%d", *mode, mode_info->width,
+			      mode_info->height, mode_info->bpp);
+
+		if (mode_info->width > vbe_width ||
+		    (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl)) {
+			// if (mode_info->bpp == 32) { // Force specific bpp for debugging
+			// (float) mode_info->width / (float) mode_info->height < 2.0 &&) {
+			highest = *mode;
+			vbe_width = mode_info->width;
+			vbe_height = mode_info->height;
+			vbe_pitch = mode_info->pitch;
+			vbe_bpl = mode_info->bpp >> 3;
+			fb = (unsigned char *)mode_info->framebuffer;
+		}
+		kfree(mode_info);
+	}
+
+	kfree(video_modes);
+
+	if (highest == 0) {
+		serial_printf("Mode detection failed!\nTrying common modes...");
+		vga_log("Mode detection failed!");
+		vga_log("Trying common modes...");
+		struct vbe_mode_info *mode_info;
+		int modes[] = {
+			322, 287, 286, 285, 284, // 1600x1200
+			356, 355, 354, 353, 352, // 1440x900
+			317, 283, 282, 281, 263, 262, // 1280x1024
+			361, 360, 359, 358, 357, // 1152x720
+			312, 280, 279, 278, 261, 260, // 1024x768
+			366, 365, 364, 363, 362, // 1024x640
+			307, 306, 305, 304, 303, // 896x672
+			302, 277, 267, 275, 259, 258, 106, // 800x600
+			371, 370, 369, 368, 367, // 800x500
+			297, 274, 273, 272, 257, // 640x480
+			292, 291, 290, 289, 256, // 640x400
+			271, 270, 269, // 320x200
+		};
+
+		for (size_t i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) {
+			mode_info = vbe_get_mode_info((uint16_t)modes[i]);
+			if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 ||
+			    (mode_info->memory_model != 4 && mode_info->memory_model != 6)) {
+				kfree(mode_info);
+				continue;
+			}
+
+			if ((mode_info->width > vbe_width ||
+			     (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl))) {
+				highest = (uint16_t)modes[i];
+				vbe_width = mode_info->width;
+				vbe_height = mode_info->height;
+				vbe_pitch = mode_info->pitch;
+				vbe_bpl = mode_info->bpp >> 3;
+				fb = (unsigned char *)mode_info->framebuffer;
+			}
+			kfree(mode_info);
+		}
+
+		// Everything else failed :(
+		if (highest == 0)
+			switch_to_vga();
+	} else
+		vga_log("Mode detection succeeded");
+
+	vbe_set_mode(highest);
+
+	uint32_t fb_size = vbe_width * vbe_height * vbe_bpl;
+	cursor_buffer = kmalloc(fb_size);
+	for (uint32_t z = 0; z < fb_size; z += 4096) {
+		paging_map((uint32_t)fb + z, (uint32_t)fb + z, PT_PRESENT | PT_RW | PT_USED);
+		paging_map((uint32_t)cursor_buffer + z, (uint32_t)cursor_buffer + z,
+			   PT_PRESENT | PT_RW | PT_USED);
+	}
+	serial_printf("0x%x", fb);
+
+	if (vbe_height > 1440)
+		vesa_set_font(32);
+	else if (vbe_height > 720)
+		vesa_set_font(24);
+	else
+		vesa_set_font(16);
+	vesa_set_color(default_text_color);
+	vesa_clear();
+
+	vesa_set_color(vesa_blue);
+	printf(vga_buffer);
+	vesa_set_color(default_text_color);
+
+	info("Successfully switched to video mode!");
+
+	serial_printf("Using mode: (0x%x) %dx%dx%d", highest, vbe_width, vbe_height, vbe_bpl << 3);
+	debug("Using mode: %dx%dx%d", vbe_width, vbe_height, vbe_bpl << 3);
 }
 
 const uint32_t default_text_color = vesa_white;
 const uint32_t default_background_color = vesa_black;
-uint32_t terminal_color[3] = {0xab, 0xb2, 0xbf};
-uint32_t terminal_background[3] = {0x1d, 0x1f, 0x24};
+uint32_t terminal_color[3] = { 0xab, 0xb2, 0xbf };
+uint32_t terminal_background[3] = { 0x1d, 0x1f, 0x24 };
 uint16_t terminal_x = 0;
 uint16_t terminal_y = 0;
 int font_width;
@@ -213,148 +225,154 @@ int font_height;
 
 void vesa_set_font(int height)
 {
-    font_width = height / 2;
-    font_height = height;
+	font_width = height / 2;
+	font_height = height;
 }
 
 void vesa_convert_color(uint32_t *color_array, uint32_t color)
 {
-    uint8_t red = (uint8_t) ((color >> 16) & 255);
-    uint8_t green = (uint8_t) ((color >> 8) & 255);
-    uint8_t blue = (uint8_t) (color & 255);
-
-    if ((vbe_bpl << 3) == 8) {
-        uint32_t new_color = ((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 255);
-        color_array[0] = (new_color >> 16) & 255;
-        color_array[1] = (new_color >> 8) & 255;
-        color_array[2] = new_color & 255;
-    } else if ((vbe_bpl << 3) == 16) {
-        uint32_t new_color = (((red & 0b11111000) << 8) + ((green & 0b11111100) << 3) + (blue >> 3));
-        color_array[0] = (new_color >> 16) & 255;
-        color_array[1] = (new_color >> 8) & 255;
-        color_array[2] = new_color & 255;
-    } else if ((vbe_bpl << 3) == 24 || (vbe_bpl << 3) == 32) {
-        color_array[0] = red;
-        color_array[1] = green;
-        color_array[2] = blue;
-    } else {
-        panic("Unknown color bpp!");
-    }
+	uint8_t red = (uint8_t)((color >> 16) & 255);
+	uint8_t green = (uint8_t)((color >> 8) & 255);
+	uint8_t blue = (uint8_t)(color & 255);
+
+	if ((vbe_bpl << 3) == 8) {
+		uint32_t new_color =
+			((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 255);
+		color_array[0] = (new_color >> 16) & 255;
+		color_array[1] = (new_color >> 8) & 255;
+		color_array[2] = new_color & 255;
+	} else if ((vbe_bpl << 3) == 16) {
+		uint32_t new_color =
+			(((red & 0b11111000) << 8) + ((green & 0b11111100) << 3) + (blue >> 3));
+		color_array[0] = (new_color >> 16) & 255;
+		color_array[1] = (new_color >> 8) & 255;
+		color_array[2] = new_color & 255;
+	} else if ((vbe_bpl << 3) == 24 || (vbe_bpl << 3) == 32) {
+		color_array[0] = red;
+		color_array[1] = green;
+		color_array[2] = blue;
+	} else {
+		panic("Unknown color bpp!");
+	}
 }
 
 void vesa_set_pixel(uint16_t x, uint16_t y, const uint32_t color[3])
 {
-    unsigned pos = (unsigned int) (x * vbe_bpl + y * vbe_pitch);
-    char *draw = (char *) &fb[pos];
-    draw[pos] = (char) color[2];
-    draw[pos + 1] = (char) color[1];
-    draw[pos + 2] = (char) color[0];
+	unsigned pos = (unsigned int)(x * vbe_bpl + y * vbe_pitch);
+	char *draw = (char *)&fb[pos];
+	draw[pos] = (char)color[2];
+	draw[pos + 1] = (char)color[1];
+	draw[pos + 2] = (char)color[0];
 }
 
 void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3])
 {
-    int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
-    char *draw = (char *) &fb[pos1];
-    for (int i = 0; i <= y2 - y1; i++) {
-        for (int j = 0; j <= x2 - x1; j++) {
-            draw[vbe_bpl * j] = (char) color[2];
-            draw[vbe_bpl * j + 1] = (char) color[1];
-            draw[vbe_bpl * j + 2] = (char) color[0];
-        }
-        draw += vbe_pitch;
-    }
+	int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
+	char *draw = (char *)&fb[pos1];
+	for (int i = 0; i <= y2 - y1; i++) {
+		for (int j = 0; j <= x2 - x1; j++) {
+			draw[vbe_bpl * j] = (char)color[2];
+			draw[vbe_bpl * j + 1] = (char)color[1];
+			draw[vbe_bpl * j + 2] = (char)color[0];
+		}
+		draw += vbe_pitch;
+	}
 }
 
 void vesa_clear()
 {
-    vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, terminal_background);
-    terminal_x = 0;
-    terminal_y = 0;
+	vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, terminal_background);
+	terminal_x = 0;
+	terminal_y = 0;
 }
 
 void vesa_draw_char(char ch)
 {
-    if (ch >= ' ') {
-        int pos = terminal_x * vbe_bpl + terminal_y * vbe_pitch;
-        char *draw = (char *) &fb[pos];
-        uint16_t bitmap = 0;
-
-        for (int cy = 0; cy <= font_height; 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] = (char) terminal_color[2];
-                    draw[vbe_bpl * cx + 1] = (char) terminal_color[1];
-                    draw[vbe_bpl * cx + 2] = (char) terminal_color[0];
-                } else {
-                    draw[vbe_bpl * cx] = (char) terminal_background[2];
-                    draw[vbe_bpl * cx + 1] = (char) terminal_background[1];
-                    draw[vbe_bpl * cx + 2] = (char) terminal_background[0];
-                }
-            }
-            draw += vbe_pitch;
-        }
-
-        terminal_x += font_width;
-    } else if (ch == '\n') {
-        terminal_x = 0;
-        terminal_y += font_height;
-    } else if (ch == '\t') {
-        terminal_x += 4 * font_width;
-    }
-
-    if (terminal_x >= vbe_width) {
-        terminal_x = 0;
-        terminal_y += font_height;
-    }
+	if (ch >= ' ') {
+		int pos = terminal_x * vbe_bpl + terminal_y * vbe_pitch;
+		char *draw = (char *)&fb[pos];
+		uint16_t bitmap = 0;
+
+		for (int cy = 0; cy <= font_height; 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] = (char)terminal_color[2];
+					draw[vbe_bpl * cx + 1] = (char)terminal_color[1];
+					draw[vbe_bpl * cx + 2] = (char)terminal_color[0];
+				} else {
+					draw[vbe_bpl * cx] = (char)terminal_background[2];
+					draw[vbe_bpl * cx + 1] = (char)terminal_background[1];
+					draw[vbe_bpl * cx + 2] = (char)terminal_background[0];
+				}
+			}
+			draw += vbe_pitch;
+		}
+
+		terminal_x += font_width;
+	} else if (ch == '\n') {
+		terminal_x = 0;
+		terminal_y += font_height;
+	} else if (ch == '\t') {
+		terminal_x += 4 * font_width;
+	}
+
+	if (terminal_x >= vbe_width) {
+		terminal_x = 0;
+		terminal_y += font_height;
+	}
 }
 
 int prev_coords[2] = {};
 int first = 1; // TODO: Better initial cursor buffer solution
 void vesa_draw_cursor(int x, int y)
 {
-    // Reset previous area
-    char *reset = (char *) &fb[prev_coords[0] * vbe_bpl + prev_coords[1] * vbe_pitch];
-    char *prev = (char *) &cursor_buffer[prev_coords[0] * vbe_bpl + prev_coords[1] * vbe_pitch];
-    if (!first) {
-        for (int cy = 0; cy <= 19; cy++) {
-            for (int cx = 0; cx <= 12; cx++) {
-                reset[vbe_bpl * cx] = prev[vbe_bpl * cx];
-                reset[vbe_bpl * cx + 1] = prev[vbe_bpl * cx + 1];
-                reset[vbe_bpl * cx + 2] = prev[vbe_bpl * cx + 2];
-            }
-            reset += vbe_pitch;
-            prev += vbe_pitch;
-        }
-    }
-    first = 0;
-
-    // Draw cursor
-    prev_coords[0] = x;
-    prev_coords[1] = y;
-    prev = (char *) &cursor_buffer[x * vbe_bpl + y * vbe_pitch];
-    char *draw = (char *) &fb[x * vbe_bpl + y * vbe_pitch];
-    for (int cy = 0; cy <= 19; cy++) {
-        for (int cx = 0; cx <= 12; cx++) {
-            // Performance issue?
-            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 (font->cursor[cy] & ((1 << 12) >> cx)) {
-                draw[vbe_bpl * cx] = (char) terminal_color[2];
-                draw[vbe_bpl * cx + 1] = (char) terminal_color[1];
-                draw[vbe_bpl * cx + 2] = (char) terminal_color[0];
-            }
-        }
-        draw += vbe_pitch;
-        prev += vbe_pitch;
-    }
+	// Reset previous area
+	char *reset = (char *)&fb[prev_coords[0] * vbe_bpl + prev_coords[1] * vbe_pitch];
+	char *prev = (char *)&cursor_buffer[prev_coords[0] * vbe_bpl + prev_coords[1] * vbe_pitch];
+	if (!first) {
+		for (int cy = 0; cy <= 19; cy++) {
+			for (int cx = 0; cx <= 12; cx++) {
+				reset[vbe_bpl * cx] = prev[vbe_bpl * cx];
+				reset[vbe_bpl * cx + 1] = prev[vbe_bpl * cx + 1];
+				reset[vbe_bpl * cx + 2] = prev[vbe_bpl * cx + 2];
+			}
+			reset += vbe_pitch;
+			prev += vbe_pitch;
+		}
+	}
+	first = 0;
+
+	// Draw cursor
+	prev_coords[0] = x;
+	prev_coords[1] = y;
+	prev = (char *)&cursor_buffer[x * vbe_bpl + y * vbe_pitch];
+	char *draw = (char *)&fb[x * vbe_bpl + y * vbe_pitch];
+	for (int cy = 0; cy <= 19; cy++) {
+		for (int cx = 0; cx <= 12; cx++) {
+			// Performance issue?
+			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 (font->cursor[cy] & ((1 << 12) >> cx)) {
+				draw[vbe_bpl * cx] = (char)terminal_color[2];
+				draw[vbe_bpl * cx + 1] = (char)terminal_color[1];
+				draw[vbe_bpl * cx + 2] = (char)terminal_color[0];
+			}
+		}
+		draw += vbe_pitch;
+		prev += vbe_pitch;
+	}
 }
 
 void vesa_set_color(uint32_t color)
 {
-    vesa_convert_color(terminal_color, color);
-    vesa_convert_color(terminal_background, default_background_color);
+	vesa_convert_color(terminal_color, color);
+	vesa_convert_color(terminal_background, default_background_color);
 }
\ No newline at end of file