Widget fg/bg and gfx filters

4 files changed, 99 insertions, 27 deletions

diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c
index a0f5b22..db09d21 100644
--- a/libs/libgui/gfx.c
+++ b/libs/libgui/gfx.c
@@ -145,7 +145,7 @@ void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, c
 	}
 }
 
-void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
+void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, const char *path)
 {
 	// TODO: Support x, y
 	// TODO: Detect image type
@@ -162,18 +162,38 @@ void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
 	bmp.pitch = bmp.size.x * (bmp.bpp >> 3);
 
 	// TODO: Fix reversed png in decoder
-	int bypp = bmp.bpp >> 3;
-	// u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch];
+	u8 bypp = bmp.bpp >> 3;
+	/* u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch]; */
 	u8 *srcfb = bmp.data;
 	u8 *destfb = &ctx->fb[bypp];
-	for (u32 cy = 0; cy < bmp.size.y; cy++) {
-		memcpy(destfb, srcfb, bmp.pitch);
-		// srcfb -= bmp->pitch;
-		srcfb += bmp.pitch;
-		destfb += ctx->pitch;
+	for (u32 cy = 0; cy < bmp.size.y && cy + pos.y < ctx->size.y; cy++) {
+		int diff = 0;
+		for (u32 cx = 0; cx < bmp.size.x && cx + pos.x < ctx->size.x; cx++) {
+			if (srcfb[bypp - 1]) {
+				if (filter == GFX_FILTER_NONE) {
+					memcpy(destfb, srcfb, bypp);
+				} else if (filter == GFX_FILTER_INVERT) {
+					destfb[0] = 0xff - srcfb[0];
+					destfb[1] = 0xff - srcfb[1];
+					destfb[2] = 0xff - srcfb[2];
+					destfb[3] = srcfb[3];
+				}
+			}
+
+			srcfb += bypp;
+			destfb += bypp;
+			diff += bypp;
+		}
+		srcfb += bmp.pitch - diff;
+		destfb += ctx->pitch - diff;
 	}
 }
 
+void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
+{
+	gfx_load_image_filter(ctx, pos, GFX_FILTER_NONE, path);
+}
+
 void gfx_load_wallpaper(struct context *ctx, const char *path)
 {
 	gfx_load_image(ctx, vec2(0, 0), path);
@@ -195,16 +215,17 @@ void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size)
 // TODO: Optimize!
 void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
 {
-	if (src->size.x == dest->size.x && src->size.y == dest->size.y) {
-		memcpy(dest->fb, src->fb, dest->pitch * dest->size.y);
-		return;
-	}
+	// TODO: Some kind of alpha-acknowledging memcpy?
+	/* if (src->size.x == dest->size.x && src->size.y == dest->size.y) { */
+	/* 	memcpy(dest->fb, src->fb, dest->pitch * dest->size.y); */
+	/* 	return; */
+	/* } */
 
 	if (src->size.x > dest->size.x || src->size.y > dest->size.y)
 		return;
 
 	// TODO: Negative x and y
-	int bypp = dest->bpp >> 3;
+	u8 bypp = dest->bpp >> 3;
 	u8 *srcfb = src->fb;
 	u8 *destfb = &dest->fb[pos.x * bypp + pos.y * dest->pitch];
 	for (u32 cy = 0; cy < src->size.y && cy + pos.y < dest->size.y; cy++) {
diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h
index 1999b0c..83736fd 100644
--- a/libs/libgui/gfx.h
+++ b/libs/libgui/gfx.h
@@ -46,6 +46,10 @@
 /* #define WF_RELATIVE (1 << 4) */
 
 enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 };
+enum gfx_filter {
+	GFX_FILTER_NONE,
+	GFX_FILTER_INVERT,
+};
 
 // Generalized font struct
 struct font {
@@ -67,6 +71,7 @@ struct font *gfx_resolve_font(enum font_type font_type);
 void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch);
 void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text);
 void gfx_load_image(struct context *ctx, vec2 pos, const char *path);
+void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, const char *path);
 void gfx_load_wallpaper(struct context *ctx, const char *path);
 void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size);
 void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos);
diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index 99b3b5c..e8291f5 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -13,7 +13,9 @@
 struct gui_widget {
 	u32 id;
 	vec2 pos;
-	struct context ctx;
+	/* struct context ctx; */
+	struct context fg;
+	struct context bg;
 	struct list *children;
 
 	struct {
@@ -106,17 +108,47 @@ static struct gui_widget *gui_widget_by_id(u32 win_id, u32 widget_id)
  * GFX wrappers
  */
 
-res gui_fill(u32 win_id, u32 widget_id, u32 c)
+res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c)
+{
+	struct gui_widget *widget = gui_widget_by_id(win_id, widget_id);
+	if (!widget)
+		return_errno(ENOENT);
+
+	if (layer == GUI_LAYER_BG)
+		gfx_fill(&widget->bg, c);
+	else if (layer == GUI_LAYER_FG)
+		gfx_fill(&widget->fg, c);
+	else
+		return_errno(EINVAL);
+
+	return_errno(EOK);
+}
+
+res gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+			  enum gfx_filter filter, const char *path)
 {
+	UNUSED(size); // TODO: Add image scaling
+
 	struct gui_widget *widget = gui_widget_by_id(win_id, widget_id);
 	if (!widget)
 		return_errno(ENOENT);
 
-	gfx_fill(&widget->ctx, c);
+	if (layer == GUI_LAYER_BG)
+		gfx_load_image_filter(&widget->bg, pos, filter, path);
+	else if (layer == GUI_LAYER_FG)
+		gfx_load_image_filter(&widget->fg, pos, filter, path);
+	else
+		return_errno(EINVAL);
 
 	return_errno(EOK);
 }
 
+res gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+		   const char *path)
+{
+	return gui_load_image_filter(win_id, widget_id, layer, pos, size, GFX_FILTER_NONE, path);
+}
+
 /**
  * Widgets
  */
@@ -132,8 +164,8 @@ static res gui_sub_widget_at(struct gui_widget *widget, vec2 pos, struct gui_wid
 	struct node *iterator = widget->children->head;
 	while (iterator) {
 		struct gui_widget *w = iterator->data;
-		if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->ctx.size.x && pos.y >= w->pos.y &&
-		    pos.y <= w->pos.y + w->ctx.size.y)
+		if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->bg.size.x && pos.y >= w->pos.y &&
+		    pos.y <= w->pos.y + w->bg.size.y)
 			ret = w;
 
 		if (w->children->head) {
@@ -169,8 +201,8 @@ static res gui_widget_at(u32 win_id, vec2 pos, struct gui_widget *widget)
 	struct node *iterator = win->widgets->head;
 	while (iterator) {
 		struct gui_widget *w = iterator->data;
-		if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->ctx.size.x && pos.y >= w->pos.y &&
-		    pos.y <= w->pos.y + w->ctx.size.y)
+		if (pos.x >= w->pos.x && pos.x <= w->pos.x + w->bg.size.x && pos.y >= w->pos.y &&
+		    pos.y <= w->pos.y + w->bg.size.y)
 			ret = w;
 
 		if (w->children->head) {
@@ -199,7 +231,8 @@ static res gui_sync_sub_widgets(struct gui_widget *widget)
 	struct node *iterator = widget->children->head;
 	while (iterator) {
 		struct gui_widget *w = iterator->data;
-		gfx_ctx_on_ctx(&widget->ctx, &w->ctx, w->pos);
+		gfx_ctx_on_ctx(&widget->bg, &w->bg, w->pos);
+		gfx_ctx_on_ctx(&widget->fg, &w->fg, w->pos);
 		iterator = iterator->next;
 	}
 
@@ -214,7 +247,8 @@ static res gui_sync_widget(u32 win_id, u32 widget_id)
 		return_errno(ENOENT);
 
 	gui_sync_sub_widgets(widget);
-	gfx_ctx_on_ctx(&win->ctx, &widget->ctx, widget->pos);
+	gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos);
+	gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
 
 	return_errno(EOK);
 }
@@ -232,7 +266,8 @@ static res gui_sync_widgets(u32 win_id)
 	while (iterator) {
 		struct gui_widget *widget = iterator->data;
 		gui_sync_sub_widgets(widget);
-		gfx_ctx_on_ctx(&win->ctx, &widget->ctx, widget->pos);
+		gfx_ctx_on_ctx(&win->ctx, &widget->bg, widget->pos);
+		gfx_ctx_on_ctx(&win->ctx, &widget->fg, widget->pos);
 		iterator = iterator->next;
 	}
 
@@ -275,12 +310,14 @@ static vec2 gui_offset_widget(struct gui_widget *parent, struct gui_widget *chil
 static struct gui_widget *gui_new_plain_widget(vec2 size, vec2 pos, u8 bpp)
 {
 	struct gui_widget *widget = zalloc(sizeof(*widget));
-	struct context *ctx = zalloc(sizeof(*ctx));
+	struct context *bg = zalloc(sizeof(*bg));
+	struct context *fg = zalloc(sizeof(*fg));
 
 	static u32 id = 0;
 	widget->id = id++;
 	widget->pos = pos;
-	widget->ctx = *gfx_new_ctx(ctx, size, bpp);
+	widget->bg = *gfx_new_ctx(bg, size, bpp);
+	widget->fg = *gfx_new_ctx(fg, size, bpp);
 	widget->children = list_new();
 
 	return widget;
@@ -292,7 +329,7 @@ res gui_add_widget(u32 win_id, u32 widget_id, vec2 size, vec2 pos)
 	if (!parent)
 		return_errno(ENOENT);
 
-	struct gui_widget *child = gui_new_plain_widget(size, pos, parent->ctx.bpp);
+	struct gui_widget *child = gui_new_plain_widget(size, pos, parent->bg.bpp);
 	list_add(parent->children, child);
 
 	return child->id;
diff --git a/libs/libgui/gui.h b/libs/libgui/gui.h
index ff475ae..5190155 100644
--- a/libs/libgui/gui.h
+++ b/libs/libgui/gui.h
@@ -13,10 +13,19 @@ enum gui_listener {
 	GUI_LISTEN_MOUSECLICK,
 };
 
+enum gui_layer {
+	GUI_LAYER_BG,
+	GUI_LAYER_FG,
+};
+
 res gui_new_window(void);
 res gui_redraw_window(u32 id);
 
-res gui_fill(u32 win_id, u32 widget_id, u32 c);
+res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c);
+res gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+		   const char *path);
+res gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+			  enum gfx_filter filter, const char *path);
 
 res gui_add_widget(u32 win_id, u32 widget_id, vec2 size, vec2 pos);
 res gui_new_widget(u32 win_id, vec2 size, vec2 pos);