2 files changed, 18 insertions, 33 deletions

diff --git a/libgui/inc/vesa.h b/libgui/inc/vesa.h
index e34cdc0..bd758a5 100644
--- a/libgui/inc/vesa.h
+++ b/libgui/inc/vesa.h
@@ -37,21 +37,14 @@ struct vbe {
 	u8 reserved_position;
 	u8 direct_color_attributes;
 
-	u32 framebuffer;
+	u8 *fb;
 	u32 off_screen_mem_off;
 	u16 off_screen_mem_size;
 	u8 reserved1[206];
 };
 
-struct vbe *vbe;
-int vbe_width;
-int vbe_height;
-int vbe_bpl;
-int vbe_pitch;
-u8 *fb;
-
-void vesa_fill(const u32 color[3]);
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3]);
-void vesa_init(struct vbe *info);
+void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3]);
+void vesa_fill(struct vbe *vbe, const u32 color[3]);
+void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3]);
 
 #endif
diff --git a/libgui/vesa.c b/libgui/vesa.c
index 2d3e107..df2c692 100644
--- a/libgui/vesa.c
+++ b/libgui/vesa.c
@@ -3,40 +3,32 @@
 #include <def.h>
 #include <vesa.h>
 
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3])
+void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3])
 {
-	int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
-	u8 *draw = &fb[pos1];
+	int bpl = vbe->bpp >> 3;
+
+	int pos1 = x1 * bpl + y1 * vbe->pitch;
+	u8 *draw = &vbe->fb[pos1];
 	for (int i = 0; i <= y2 - y1; i++) {
 		for (int j = 0; j <= x2 - x1; j++) {
-			draw[vbe_bpl * j] = color[2];
-			draw[vbe_bpl * j + 1] = color[1];
-			draw[vbe_bpl * j + 2] = color[0];
+			draw[bpl * j] = color[2];
+			draw[bpl * j + 1] = color[1];
+			draw[bpl * j + 2] = color[0];
 		}
-		draw += vbe_pitch;
+		draw += vbe->pitch;
 	}
 }
 
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3])
+void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3])
 {
-	u8 pos = x * vbe_bpl + y * vbe_pitch;
-	u8 *draw = &fb[pos];
+	u8 pos = x * (vbe->bpp >> 3) + y * vbe->pitch;
+	u8 *draw = &vbe->fb[pos];
 	draw[pos] = (char)color[2];
 	draw[pos + 1] = (char)color[1];
 	draw[pos + 2] = (char)color[0];
 }
 
-void vesa_fill(const u32 color[3])
-{
-	vesa_draw_rectangle(0, 0, vbe->width - 1, vbe->height - 1, color);
-}
-
-void vesa_init(struct vbe *info)
+void vesa_fill(struct vbe *vbe, const u32 color[3])
 {
-	vbe = info;
-	vbe_height = vbe->height;
-	vbe_width = vbe->width;
-	vbe_bpl = vbe->bpp >> 3;
-	vbe_pitch = vbe->pitch;
-	fb = (u8 *)vbe->framebuffer;
+	vesa_draw_rectangle(vbe, 0, 0, vbe->width - 1, vbe->height - 1, color);
 }