diff options
Diffstat (limited to 'libgui/gui.c')
| -rw-r--r-- | libgui/gui.c | 58 |
1 files changed, 35 insertions, 23 deletions
diff --git a/libgui/gui.c b/libgui/gui.c index a22ee51..9c35505 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -1,5 +1,6 @@ // MIT License, Copyright (c) 2020 Marvin Borner // Some GUI functions +// TODO: Better support for bpp < 32 #include <assert.h> #include <bmp.h> @@ -12,7 +13,7 @@ struct font *font; -static void write_char(struct window *win, int x, int y, const u32 c[3], char ch) +static void write_char(struct window *win, int x, int y, u32 c, char ch) { int bypp = win->bpp >> 3; @@ -25,36 +26,38 @@ static void write_char(struct window *win, int x, int y, const u32 c[3], char ch u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8]; u8 bit = bits >> (7 - cx % 8) & 1; if (bit) { - draw[bypp * cx] = c[2]; - draw[bypp * cx + 1] = c[1]; - draw[bypp * cx + 2] = c[0]; + 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); } } draw += win->pitch; } } -static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3]) +static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c) { int bypp = win->bpp >> 3; 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]; - draw[bypp * j + 1] = c[1]; - draw[bypp * j + 2] = c[0]; + 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); } draw += win->pitch; } } -void gui_write_char(struct window *win, int x, int y, const u32 c[3], char ch) +void gui_write_char(struct window *win, int x, int y, u32 c, char ch) { write_char(win, x, y, c, ch); gui_redraw(); } -void gui_write(struct window *win, int x, int y, const u32 c[3], char *text) +void gui_write(struct window *win, int x, int y, u32 c, char *text) { for (u32 i = 0; i < strlen(text); i++) { write_char(win, x + i * font->width, y, c, text[i]); @@ -70,11 +73,11 @@ void gui_load_image(struct window *win, char *path, int x, int y) // TODO: Support padding with odd widths int bypp = bmp->bpp >> 3; - u8 *srcfb = &bmp->data[bypp]; + u8 *srcfb = &bmp->data[bypp + bmp->width * bmp->pitch]; u8 *destfb = &win->fb[bypp]; for (u32 cy = 0; cy < bmp->height; cy++) { memcpy(destfb, srcfb, bmp->pitch); - srcfb += bmp->pitch; + srcfb -= bmp->pitch; destfb += win->pitch; } gui_redraw(); @@ -88,8 +91,8 @@ void gui_load_wallpaper(struct window *win, char *path) 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]; + 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)); srcfb += src->pitch; @@ -97,6 +100,7 @@ void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, } } +// TODO: Support alpha values other than 0x0 and 0xff (blending) // TODO: Optimize! void gui_win_on_win(struct window *dest, struct window *src, int x, int y) { @@ -107,28 +111,35 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y) } int bypp = dest->bpp >> 3; - u8 *srcfb = &src->fb[bypp]; - u8 *destfb = &dest->fb[(x + 1) * bypp + y * dest->pitch]; + u8 *srcfb = src->fb; + u8 *destfb = &dest->fb[x * bypp + y * dest->pitch]; for (u32 cy = 0; cy < src->height; cy++) { - memcpy(destfb, srcfb, src->pitch); + for (u32 cx = 0; cx < src->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]; + } + } srcfb += src->pitch; destfb += dest->pitch; } } -void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3]) +void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c) { draw_rectangle(win, x1, y1, x2, y2, c); gui_redraw(); } -void gui_fill(struct window *win, const u32 c[3]) +void gui_fill(struct window *win, u32 c) { draw_rectangle(win, 0, 0, win->width, win->height, c); gui_redraw(); } -void gui_border(struct window *win, const u32 c[3], u32 width) +void gui_border(struct window *win, u32 c, u32 width) { if (width <= 0) return; @@ -140,9 +151,10 @@ void gui_border(struct window *win, const u32 c[3], u32 width) if (j <= width - 1 || i <= width - 1 || j - win->width + width + 1 <= width || i - win->height + width <= width) { - draw[bypp * j + 0] = c[2]; - draw[bypp * j + 1] = c[1]; - draw[bypp * j + 2] = c[0]; + 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); } } draw += win->pitch; |