Some optimizations and window moving

1 files changed, 19 insertions, 17 deletions

diff --git a/libgui/gui.c b/libgui/gui.c
index 331c940..a22ee51 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -37,9 +37,7 @@ static void write_char(struct window *win, int x, int y, const u32 c[3], char ch
 static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3])
 {
 	int bypp = win->bpp >> 3;
-
-	int pos1 = x1 * bypp + y1 * win->pitch;
-	u8 *draw = &win->fb[pos1];
+	u8 *draw = &win->fb[x1 * bypp + y1 * win->pitch];
 	for (int i = 0; i < y2 - y1; i++) {
 		for (int j = 0; j < x2 - x1; j++) {
 			draw[bypp * j] = c[2];
@@ -71,15 +69,11 @@ void gui_load_image(struct window *win, char *path, int x, int y)
 	assert(bmp && bmp->height + y <= win->height);
 
 	// TODO: Support padding with odd widths
-	u8 *srcfb = bmp->data;
-	u8 *destfb = win->fb;
 	int bypp = bmp->bpp >> 3;
+	u8 *srcfb = &bmp->data[bypp];
+	u8 *destfb = &win->fb[bypp];
 	for (u32 cy = 0; cy < bmp->height; cy++) {
-		for (u32 cx = 0; cx < bmp->width; cx++) {
-			destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
-			destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
-			destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
-		}
+		memcpy(destfb, srcfb, bmp->pitch);
 		srcfb += bmp->pitch;
 		destfb += win->pitch;
 	}
@@ -91,6 +85,18 @@ void gui_load_wallpaper(struct window *win, char *path)
 	gui_load_image(win, path, 0, 0);
 }
 
+void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height)
+{
+	int bypp = dest->bpp >> 3;
+	u8 *srcfb = &src->fb[(x + 1) * bypp + y * src->pitch];
+	u8 *destfb = &dest->fb[(x + 1) * bypp + y * dest->pitch];
+	for (u32 cy = 0; cy < height; cy++) {
+		memcpy(destfb, srcfb, width * (dest->bpp >> 3));
+		srcfb += src->pitch;
+		destfb += dest->pitch;
+	}
+}
+
 // TODO: Optimize!
 void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
 {
@@ -101,14 +107,10 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
 	}
 
 	int bypp = dest->bpp >> 3;
-	u8 *srcfb = src->fb;
-	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
+	u8 *srcfb = &src->fb[bypp];
+	u8 *destfb = &dest->fb[(x + 1) * bypp + y * dest->pitch];
 	for (u32 cy = 0; cy < src->height; cy++) {
-		for (u32 cx = 0; cx < src->width; cx++) {
-			destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
-			destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
-			destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
-		}
+		memcpy(destfb, srcfb, src->pitch);
 		srcfb += src->pitch;
 		destfb += dest->pitch;
 	}