1 files changed, 19 insertions, 27 deletions

diff --git a/libgui/gfx.c b/libgui/gfx.c
index 7e52389..13cdcd3 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -68,12 +68,8 @@ static void write_char(struct context *ctx, int x, int y, struct font *font, u32
 		for (int cx = 0; cx < font->width; cx++) {
 			u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
 			u8 bit = bits >> (7 - cx % 8) & 1;
-			if (bit) {
-				draw[bypp * cx] = GET_BLUE(c);
-				draw[bypp * cx + 1] = GET_GREEN(c);
-				draw[bypp * cx + 2] = GET_RED(c);
-				draw[bypp * cx + 3] = GET_ALPHA(c);
-			}
+			if (bit)
+				memset(&draw[bypp * cx], c, bypp);
 		}
 		draw += ctx->pitch;
 	}
@@ -84,12 +80,8 @@ static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2,
 	int bypp = ctx->bpp >> 3;
 	u8 *draw = &ctx->fb[x1 * bypp + y1 * ctx->pitch];
 	for (int i = 0; i < y2 - y1; i++) {
-		for (int j = 0; j < x2 - x1; j++) {
-			draw[bypp * j] = GET_BLUE(c);
-			draw[bypp * j + 1] = GET_GREEN(c);
-			draw[bypp * j + 2] = GET_RED(c);
-			draw[bypp * j + 3] = GET_ALPHA(c);
-		}
+		for (int j = 0; j < x2 - x1; j++)
+			memset(&draw[bypp * j], c, bypp);
 		draw += ctx->pitch;
 	}
 }
@@ -148,7 +140,7 @@ void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width
 	u8 *srcfb = &src->fb[x * bypp + y * src->pitch];
 	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
 	for (u32 cy = 0; cy < height; cy++) {
-		memcpy(destfb, srcfb, width * (dest->bpp >> 3));
+		memcpy(destfb, srcfb, width * bypp);
 		srcfb += src->pitch;
 		destfb += dest->pitch;
 	}
@@ -172,16 +164,21 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y)
 	u8 *srcfb = src->fb;
 	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
 	for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) {
+		int diff = 0;
+		// TODO: Fix cursor
 		for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
-			if (srcfb[bypp * cx + 3]) {
-				destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
-				destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
-				destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
-				destfb[bypp * cx + 3] = srcfb[bypp * cx + 3];
+			if (srcfb[3]) {
+				destfb[0] = srcfb[0];
+				destfb[1] = srcfb[1];
+				destfb[2] = srcfb[2];
+				destfb[3] = srcfb[3];
+				srcfb += bypp;
+				destfb += bypp;
+				diff += bypp;
 			}
 		}
-		srcfb += src->pitch;
-		destfb += dest->pitch;
+		srcfb += src->pitch - diff;
+		destfb += dest->pitch - diff;
 	}
 }
 
@@ -207,13 +204,8 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
 	for (u32 i = 0; i < ctx->height; i++) {
 		for (u32 j = 0; j < ctx->width; j++) {
 			if (j <= width - 1 || i <= width - 1 ||
-			    j - ctx->width + width + 1 <= width ||
-			    i - ctx->height + width <= width) {
-				draw[bypp * j + 0] = GET_BLUE(c);
-				draw[bypp * j + 1] = GET_GREEN(c);
-				draw[bypp * j + 2] = GET_RED(c);
-				draw[bypp * j + 3] = GET_ALPHA(c);
-			}
+			    j - ctx->width + width + 1 <= width || i - ctx->height + width <= width)
+				memset(&draw[bypp * j], c, bypp);
 		}
 		draw += ctx->pitch;
 	}