aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/chess/main.c2
-rw-r--r--apps/view/Makefile7
-rw-r--r--apps/view/main.c37
-rw-r--r--apps/wm/main.c7
-rw-r--r--libs/libc/inc/math.h7
-rw-r--r--libs/libc/math.c26
-rw-r--r--libs/libgui/Makefile1
-rw-r--r--libs/libgui/bmp.c29
-rw-r--r--libs/libgui/bmp.h39
-rw-r--r--libs/libgui/gfx.c124
-rw-r--r--libs/libgui/gfx.h20
-rw-r--r--libs/libgui/gui.c10
-rw-r--r--libs/libgui/gui.h4
-rw-r--r--res/test.pngbin0 -> 205944 bytes
14 files changed, 200 insertions, 113 deletions
diff --git a/apps/chess/main.c b/apps/chess/main.c
index a546e63..64911dc 100644
--- a/apps/chess/main.c
+++ b/apps/chess/main.c
@@ -64,7 +64,7 @@ static void load_image(struct piece *tile)
enum gfx_filter filter = IS_COLOR(tile->piece, BLACK) ? GFX_FILTER_NONE : GFX_FILTER_INVERT;
/* assert(gui_fill(win, tile->widget, GUI_LAYER_FG, 0) == EOK); */
- gui_load_image_filter(win, tile->widget, GUI_LAYER_FG, vec2(0, 0), vec2(TILE, TILE), filter,
+ gui_draw_image_filter(win, tile->widget, GUI_LAYER_FG, vec2(0, 0), vec2(TILE, TILE), filter,
icon);
}
diff --git a/apps/view/Makefile b/apps/view/Makefile
new file mode 100644
index 0000000..c4c6860
--- /dev/null
+++ b/apps/view/Makefile
@@ -0,0 +1,7 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+NAME = view
+OBJS = main.o
+LIBS = -lgui -lc
+
+include ../generic.mk
diff --git a/apps/view/main.c b/apps/view/main.c
new file mode 100644
index 0000000..20661a7
--- /dev/null
+++ b/apps/view/main.c
@@ -0,0 +1,37 @@
+// MIT License, Copyright (c) 2021 Marvin Borner
+
+#include <def.h>
+#include <libgui/gui.h>
+
+#define SCALING_FACTOR 0.1
+
+static vec2 size = { 800, 800 };
+static const char *path;
+
+static void mousemove(struct gui_event_mouse *event)
+{
+ if (event->scroll) {
+ size = vec2_mul(size, event->scroll < 0 ? SCALING_FACTOR + 1 : 1 - SCALING_FACTOR);
+ gui_fill(event->win, event->widget, GUI_LAYER_FG, COLOR_WHITE);
+ gui_draw_image(event->win, event->widget, GUI_LAYER_FG, vec2(0, 0), size, path);
+ gui_redraw_widget(event->win, event->widget);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ UNUSED(argc);
+ UNUSED(argv);
+
+ path = "/res/test.png";
+
+ u32 win = gui_new_custom_window(APPNAME, vec2(0, 0), size);
+ u32 canvas = gui_new_widget(win, GUI_MAIN, vec2(0, 0), size);
+ gui_fill(win, canvas, GUI_LAYER_BG, COLOR_WHITE);
+ gui_listen_widget(win, canvas, GUI_LISTEN_MOUSEMOVE, (u32)mousemove);
+
+ gui_redraw_window(win);
+ gui_loop();
+
+ return 0;
+}
diff --git a/apps/wm/main.c b/apps/wm/main.c
index 25478ff..771bd44 100644
--- a/apps/wm/main.c
+++ b/apps/wm/main.c
@@ -476,9 +476,10 @@ static void window_bar_draw(struct window *win, char name[64])
return;
gfx_write(&win->ctx, vec2(BAR_MARGIN, BAR_MARGIN), FONT_24, COLOR_WHITE, name);
- gfx_load_image_filter(&win->ctx,
+ gfx_draw_image_filter(&win->ctx,
vec2(win->ctx.size.x - BAR_CLOSE_SIZE - BAR_MARGIN, BAR_MARGIN),
- GFX_FILTER_INVERT, "/icons/close-" STRINGIFY(BAR_CLOSE_SIZE) ".png");
+ vec2(BAR_CLOSE_SIZE, BAR_CLOSE_SIZE), GFX_FILTER_INVERT,
+ "/icons/close-" STRINGIFY(BAR_CLOSE_SIZE) ".png");
}
/**
@@ -751,7 +752,7 @@ int main(int argc, char **argv)
assert(io_control(IO_BUS, IOCTL_BUS_REGISTER, "wm") == EOK);
- assert(exec("paint", NULL) == EOK);
+ assert(exec("view", NULL) == EOK);
u8 msg[1024] = { 0 };
struct event_keyboard event_keyboard = { 0 };
diff --git a/libs/libc/inc/math.h b/libs/libc/inc/math.h
index 4a38c5f..813ebf1 100644
--- a/libs/libc/inc/math.h
+++ b/libs/libc/inc/math.h
@@ -19,9 +19,14 @@
f32 powf(f32 base, f32 exp);
f64 pow(f64 base, f64 exp);
-f32 sqrtf(f64 num);
+f32 sqrtf(f32 num);
f64 sqrt(f64 num);
+f32 lerpf(f32 from, f32 to, f32 trans);
+f64 lerp(f64 from, f64 to, f64 trans);
+f32 blerpf(f32 a, f32 b, f32 c, f32 d, f32 transx, f32 transy);
+f64 blerp(f64 a, f64 b, f64 c, f64 d, f64 transx, f64 transy);
+
f32 sinf(f32 angle);
f64 sin(f64 angle);
f32 cosf(f32 angle);
diff --git a/libs/libc/math.c b/libs/libc/math.c
index 23b1ca4..606281c 100644
--- a/libs/libc/math.c
+++ b/libs/libc/math.c
@@ -32,7 +32,7 @@ f64 pow(f64 base, f64 exp)
// TODO: More efficient sqrt?
-f32 sqrtf(f64 num)
+f32 sqrtf(f32 num)
{
return powf(num, .5);
}
@@ -43,6 +43,30 @@ f64 sqrt(f64 num)
}
/**
+ * Interpolations
+ */
+
+f32 lerpf(f32 from, f32 to, f32 trans)
+{
+ return from + (to - from) * trans;
+}
+
+f64 lerp(f64 from, f64 to, f64 trans)
+{
+ return from + (to - from) * trans;
+}
+
+f32 blerpf(f32 a, f32 b, f32 c, f32 d, f32 transx, f32 transy)
+{
+ return lerpf(lerpf(a, b, transx), lerpf(c, d, transx), transy);
+}
+
+f64 blerp(f64 a, f64 b, f64 c, f64 d, f64 transx, f64 transy)
+{
+ return lerp(lerp(a, b, transx), lerp(c, d, transx), transy);
+}
+
+/**
* Trigonometric functions
*/
diff --git a/libs/libgui/Makefile b/libs/libgui/Makefile
index 2f76e61..a8f3a62 100644
--- a/libs/libgui/Makefile
+++ b/libs/libgui/Makefile
@@ -1,7 +1,6 @@
# MIT License, Copyright (c) 2020 Marvin Borner
COBJS = psf.o \
- bmp.o \
png.o \
gfx.o \
gui.o \
diff --git a/libs/libgui/bmp.c b/libs/libgui/bmp.c
deleted file mode 100644
index 5576d16..0000000
--- a/libs/libgui/bmp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <def.h>
-#include <libgui/bmp.h>
-#include <mem.h>
-#include <print.h>
-#include <sys.h>
-
-struct bmp *bmp_load(const char *path)
-{
- void *buf = sread(path);
- if (!buf)
- return NULL;
-
- struct bmp_header *h = buf;
- if (h->signature[0] != 'B' || h->signature[1] != 'M')
- return NULL;
-
- // TODO: Support padding with odd widths
- struct bmp_info *info = (struct bmp_info *)((u32)buf + sizeof(*h));
- struct bmp *bmp = malloc(sizeof(*bmp));
- bmp->size.x = info->width;
- bmp->size.y = info->height;
- bmp->data = (u8 *)((u32)buf + h->offset);
- bmp->bpp = info->bpp;
- bmp->pitch = bmp->size.x * (bmp->bpp >> 3);
-
- return bmp;
-}
diff --git a/libs/libgui/bmp.h b/libs/libgui/bmp.h
deleted file mode 100644
index f7fb57f..0000000
--- a/libs/libgui/bmp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#ifndef BMP_H
-#define BMP_H
-
-#include <def.h>
-#include <vec.h>
-
-struct bmp_header {
- u8 signature[2];
- u32 size;
- u32 reserved;
- u32 offset;
-} PACKED;
-
-struct bmp_info {
- u32 size;
- u32 width;
- u32 height;
- u16 planes;
- u16 bpp;
- u32 compression;
- u32 compressed_size;
- u32 x_pixel_meter;
- u32 y_pixel_meter;
- u32 colors;
- u32 important_colors;
-};
-
-struct bmp {
- vec2 size;
- u8 *data;
- u32 bpp;
- u32 pitch;
-};
-
-struct bmp *bmp_load(const char *path) NONNULL;
-
-#endif
diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c
index 373c099..1341a5a 100644
--- a/libs/libgui/gfx.c
+++ b/libs/libgui/gfx.c
@@ -5,12 +5,12 @@
#include <assert.h>
#include <crypto.h>
-#include <libgui/bmp.h>
#include <libgui/gfx.h>
#include <libgui/msg.h>
#include <libgui/png.h>
#include <libgui/psf.h>
#include <list.h>
+#include <math.h>
#include <mem.h>
#include <str.h>
#include <sys.h>
@@ -102,6 +102,19 @@ struct gfx_context *gfx_new_ctx(struct gfx_context *ctx, vec2 size, u8 bpp)
return ctx;
}
+struct gfx_context *gfx_clone(struct gfx_context *ctx)
+{
+ struct gfx_context *new = zalloc(sizeof(*new));
+ gfx_new_ctx(new, ctx->size, ctx->bpp);
+ assert(new->bytes == ctx->bytes);
+ memcpy(new->fb, ctx->fb, ctx->bytes);
+ return new;
+}
+
+/**
+ * Font/text
+ */
+
// On-demand font loading
static u8 fonts_loaded = 0;
struct gfx_font *gfx_resolve_font(enum font_type font_type)
@@ -147,9 +160,13 @@ void gfx_write(struct gfx_context *ctx, vec2 pos, enum font_type font_type, u32
}
}
+/**
+ * Image drawing/caching
+ */
+
struct gfx_image_cache {
u32 hash;
- struct bmp *bmp;
+ struct gfx_context *ctx;
};
struct list *gfx_image_cache_list = NULL;
@@ -159,8 +176,8 @@ static void gfx_image_cache_clear(void)
struct node *iterator = gfx_image_cache_list->head;
while (iterator) {
struct gfx_image_cache *cache = iterator->data;
- free(cache->bmp->data);
- free(cache->bmp);
+ free(cache->ctx->fb);
+ free(cache->ctx);
free(cache);
iterator = iterator->next;
}
@@ -176,7 +193,7 @@ static void gfx_image_cache_init(void)
}
}
-static struct bmp *gfx_image_cache_get(const char *path)
+static struct gfx_context *gfx_image_cache_get(const char *path)
{
gfx_image_cache_init();
@@ -185,61 +202,65 @@ static struct bmp *gfx_image_cache_get(const char *path)
struct node *iterator = gfx_image_cache_list->head;
while (iterator) {
struct gfx_image_cache *cache = iterator->data;
- if (cache->hash == hash) {
- return cache->bmp;
- }
+ if (cache->hash == hash)
+ return cache->ctx;
iterator = iterator->next;
}
return NULL;
}
-static void gfx_image_cache_save(const char *path, struct bmp *bmp)
+static void gfx_image_cache_save(const char *path, struct gfx_context *ctx)
{
gfx_image_cache_init();
struct gfx_image_cache *cache = zalloc(sizeof(*cache));
cache->hash = crc32(0, path, strlen(path));
- cache->bmp = bmp;
+ cache->ctx = ctx;
list_add(gfx_image_cache_list, cache);
}
-void gfx_load_image_filter(struct gfx_context *ctx, vec2 pos, enum gfx_filter filter,
+void gfx_draw_image_filter(struct gfx_context *ctx, vec2 pos, vec2 size, enum gfx_filter filter,
const char *path)
{
// TODO: Detect image type
- struct bmp *bmp = gfx_image_cache_get(path);
+ struct gfx_context *bmp = gfx_image_cache_get(path);
if (!bmp) {
bmp = zalloc(sizeof(*bmp));
- u32 error = png_decode32_file(&bmp->data, &bmp->size.x, &bmp->size.y, path);
+ u32 error = png_decode32_file(&bmp->fb, &bmp->size.x, &bmp->size.y, path);
if (error)
- err(1, "error %u: %s\n", error, png_error_text(error));
+ err(1, "error %d: %s\n", error, png_error_text(error));
bmp->bpp = 32;
bmp->pitch = bmp->size.x * (bmp->bpp >> 3);
+ bmp->bytes = bmp->size.y * bmp->pitch;
gfx_image_cache_save(path, bmp);
}
+ // Scaling clones!
+ bmp = gfx_scale(bmp, size);
+
assert(bmp->size.x + pos.x <= ctx->size.x);
assert(bmp->size.y + pos.y <= ctx->size.y);
- // TODO: Fix reversed png in decoder
u8 bypp = bmp->bpp >> 3;
- /* u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch]; */
- u8 *srcfb = bmp->data;
+ u8 *srcfb = bmp->fb;
u8 *destfb = &ctx->fb[pos.x * bypp + pos.y * 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);
+ destfb[0] = srcfb[2];
+ destfb[1] = srcfb[1];
+ destfb[2] = srcfb[0];
+ destfb[3] = srcfb[3];
} else if (filter == GFX_FILTER_INVERT) {
- destfb[0] = 0xff - srcfb[0];
+ destfb[0] = 0xff - srcfb[2];
destfb[1] = 0xff - srcfb[1];
- destfb[2] = 0xff - srcfb[2];
+ destfb[2] = 0xff - srcfb[0];
destfb[3] = srcfb[3];
}
}
@@ -251,22 +272,75 @@ void gfx_load_image_filter(struct gfx_context *ctx, vec2 pos, enum gfx_filter fi
srcfb += bmp->pitch - diff;
destfb += ctx->pitch - diff;
}
+
+ free(bmp);
+ free(bmp->fb);
}
-void gfx_load_image(struct gfx_context *ctx, vec2 pos, const char *path)
+void gfx_draw_image(struct gfx_context *ctx, vec2 pos, vec2 size, const char *path)
{
- gfx_load_image_filter(ctx, pos, GFX_FILTER_NONE, path);
+ gfx_draw_image_filter(ctx, pos, size, GFX_FILTER_NONE, path);
}
void gfx_load_wallpaper(struct gfx_context *ctx, const char *path)
{
- gfx_load_image(ctx, vec2(0, 0), path);
+ gfx_draw_image(ctx, vec2(0, 0), ctx->size, path);
}
-void gfx_draw_pixel(struct gfx_context *ctx, vec2 pos1, u32 c)
+/**
+ * Context transformations
+ */
+
+// Using bilinear interpolation
+// TODO: Fix alpha channel scaling
+struct gfx_context *gfx_scale(struct gfx_context *ctx, vec2 size)
{
+ if (vec2_eq(ctx->size, size))
+ return gfx_clone(ctx);
+
u8 bypp = ctx->bpp >> 3;
- u8 *draw = &ctx->fb[pos1.x * bypp + pos1.y * ctx->pitch];
+
+ struct gfx_context *new = zalloc(sizeof(*new));
+ gfx_new_ctx(new, size, ctx->bpp);
+
+ for (u32 x = 0, y = 0; y < size.y; x++) {
+ if (x > size.x) {
+ x = 0;
+ y++;
+ }
+
+ f32 gx = x / (f32)size.x * (ctx->size.x - 1);
+ f32 gy = y / (f32)size.y * (ctx->size.y - 1);
+ u32 gxi = (u32)gx;
+ u32 gyi = (u32)gy;
+
+ u32 a = *(u32 *)&ctx->fb[(gxi + 0) * bypp + (gyi + 0) * ctx->pitch];
+ u32 b = *(u32 *)&ctx->fb[(gxi + 1) * bypp + (gyi + 0) * ctx->pitch];
+ u32 c = *(u32 *)&ctx->fb[(gxi + 0) * bypp + (gyi + 1) * ctx->pitch];
+ u32 d = *(u32 *)&ctx->fb[(gxi + 1) * bypp + (gyi + 1) * ctx->pitch];
+
+ u32 color = 0;
+ for (u8 i = 0; i < bypp - 1; i++) {
+ color |= ((u8)blerpf(GET_COLOR(a, i), GET_COLOR(b, i), GET_COLOR(c, i),
+ GET_COLOR(d, i), gx - gxi, gy - gyi))
+ << (i << 3);
+ }
+
+ color |= 0xffu << ((bypp - 1) << 3);
+ gfx_draw_pixel(new, vec2(x, y), color);
+ }
+
+ return new;
+}
+
+/**
+ * General drawing functions
+ */
+
+void gfx_draw_pixel(struct gfx_context *ctx, vec2 pos, u32 c)
+{
+ u8 bypp = ctx->bpp >> 3;
+ u8 *draw = &ctx->fb[pos.x * bypp + pos.y * ctx->pitch];
draw[0] = GET_BLUE(c);
draw[1] = GET_GREEN(c);
draw[2] = GET_RED(c);
diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h
index 855e060..cb89ff5 100644
--- a/libs/libgui/gfx.h
+++ b/libs/libgui/gfx.h
@@ -10,10 +10,11 @@
#define WM_PATH "wm"
-#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
-#define GET_RED(color) ((color >> 16) & 0x000000FF)
-#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
-#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+#define GET_COLOR(color, n) (((color) >> ((n) << 3)) & 0xff)
+#define GET_ALPHA(color) (GET_COLOR((color), 3))
+#define GET_RED(color) (GET_COLOR((color), 2))
+#define GET_GREEN(color) (GET_COLOR((color), 1))
+#define GET_BLUE(color) (GET_COLOR((color), 0))
#define COLOR_TRANSPARENT 0x00000000
#define COLOR_INVISIBLE 0x00000000
@@ -90,6 +91,7 @@ struct gfx_rect {
};
struct gfx_context *gfx_new_ctx(struct gfx_context *ctx, vec2 size, u8 bpp) NONNULL;
+struct gfx_context *gfx_clone(struct gfx_context *ctx) NONNULL;
/**
* Text stuff
@@ -108,8 +110,8 @@ int gfx_font_width(enum font_type);
* Image loading
*/
-void gfx_load_image(struct gfx_context *ctx, vec2 pos, const char *path) NONNULL;
-void gfx_load_image_filter(struct gfx_context *ctx, vec2 pos, enum gfx_filter filter,
+void gfx_draw_image(struct gfx_context *ctx, vec2 pos, vec2 size, const char *path) NONNULL;
+void gfx_draw_image_filter(struct gfx_context *ctx, vec2 pos, vec2 size, enum gfx_filter filter,
const char *path) NONNULL;
void gfx_load_wallpaper(struct gfx_context *ctx, const char *path) NONNULL;
@@ -121,6 +123,12 @@ void gfx_copy(struct gfx_context *dest, struct gfx_context *src, vec2 pos, vec2
void gfx_ctx_on_ctx(struct gfx_context *dest, struct gfx_context *src, vec2 pos, u8 alpha) NONNULL;
/**
+ * Context transformations
+ */
+
+struct gfx_context *gfx_scale(struct gfx_context *ctx, vec2 size) NONNULL;
+
+/**
* Drawing functions
*/
diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index cc45bfb..1496239 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -167,7 +167,7 @@ void gui_write(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, enum f
gui_error(EINVAL);
}
-void gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+void gui_draw_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
@@ -177,17 +177,17 @@ void gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2
gui_error(ENOENT);
if (layer == GUI_LAYER_BG)
- gfx_load_image_filter(&widget->bg, pos, filter, path);
+ gfx_draw_image_filter(&widget->bg, pos, size, filter, path);
else if (layer == GUI_LAYER_FG)
- gfx_load_image_filter(&widget->fg, pos, filter, path);
+ gfx_draw_image_filter(&widget->fg, pos, size, filter, path);
else
gui_error(EINVAL);
}
-void gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+void gui_draw_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
const char *path)
{
- gui_load_image_filter(win_id, widget_id, layer, pos, size, GFX_FILTER_NONE, path);
+ gui_draw_image_filter(win_id, widget_id, layer, pos, size, GFX_FILTER_NONE, path);
}
void gui_draw_rectangle(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos1, vec2 pos2,
diff --git a/libs/libgui/gui.h b/libs/libgui/gui.h
index c3e1d10..e148c45 100644
--- a/libs/libgui/gui.h
+++ b/libs/libgui/gui.h
@@ -49,9 +49,9 @@ void gui_clear(u32 win_id, u32 widget_id, enum gui_layer layer);
void gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c);
void gui_write(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, enum font_type font_type,
u32 c, const char *text);
-void gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+void gui_draw_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
const char *path) NONNULL;
-void gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
+void gui_draw_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size,
enum gfx_filter filter, const char *path) NONNULL;
void gui_draw_rectangle(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos1, vec2 pos2,
u32 c);
diff --git a/res/test.png b/res/test.png
new file mode 100644
index 0000000..a63dac1
--- /dev/null
+++ b/res/test.png
Binary files differ