aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/test.c9
-rw-r--r--apps/wm.c12
-rw-r--r--libgui/gui.c58
-rw-r--r--libgui/inc/gui.h18
-rw-r--r--res/cursor.bmpbin0 -> 4234 bytes
-rwxr-xr-xrun2
6 files changed, 58 insertions, 41 deletions
diff --git a/apps/test.c b/apps/test.c
index 93ee07a..6585c33 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -12,15 +12,12 @@ int main()
struct window *win = gui_new_window();
- const u32 background[3] = { 0x28, 0x2c, 0x34 };
- gui_fill(win, background);
- const u32 border[3] = { 0xab, 0xb2, 0xbf };
- gui_border(win, border, 2);
- const u32 text[3] = { 0xab, 0xb2, 0xbf };
+ gui_fill(win, BG_COLOR);
+ gui_border(win, FG_COLOR, 2);
gui_init("/font/spleen-12x24.psfu");
char *hello = "Hello, world!";
- gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, text, hello);
+ gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, FG_COLOR, hello);
while (1) {
yield();
diff --git a/apps/wm.c b/apps/wm.c
index c045914..4d2620a 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -57,17 +57,15 @@ int main(int argc, char **argv)
windows = list_new();
root = new_window(0, 0, vbe->width, vbe->height);
exchange = new_window(0, 0, vbe->width, vbe->height);
- cursor = new_window(0, 0, 16, 32);
+ cursor = new_window(0, 0, 32, 32);
direct = malloc(sizeof(*direct));
memcpy(direct, root, sizeof(*direct));
direct->fb = vbe->fb;
list_add(windows, root);
- const u32 background[3] = { 0x28, 0x2c, 0x34 };
- gui_fill(root, background);
- const u32 border[3] = { 0xab, 0xb2, 0xbf };
- gui_border(root, border, 2);
- gui_fill(cursor, border);
+ gui_fill(root, BG_COLOR);
+ gui_border(root, FG_COLOR, 2);
+ gui_load_image(cursor, "/res/cursor.bmp", 0, 0);
// TODO: Fix wallpaper
/* gui_load_wallpaper(root, "/wall.bmp"); */
redraw_all();
@@ -128,7 +126,6 @@ int main(int argc, char **argv)
cursor->height);
cursor->x = mouse_x;
cursor->y = mouse_y;
- gui_win_on_win(direct, cursor, cursor->x, cursor->y);
if (event->but1 && mouse_x + (int)focused->width < vbe->width - 1 &&
mouse_y + (int)focused->height < vbe->height - 1) {
@@ -136,6 +133,7 @@ int main(int argc, char **argv)
focused->y = mouse_y;
redraw_all(); // TODO: Function to redraw one window
}
+ gui_win_on_win(direct, cursor, cursor->x, cursor->y);
break;
}
default:
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;
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 6244e22..308e3a1 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -8,6 +8,13 @@
#include <sys.h>
#include <vesa.h>
+#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 FG_COLOR 0xffabb2bf
+#define BG_COLOR 0xff282c34
+
// Generalized font struct
struct font {
char *chars;
@@ -26,14 +33,15 @@ struct window {
u32 pitch;
};
-void gui_write_char(struct window *win, int x, int y, const u32 c[3], char ch);
-void gui_write(struct window *win, int x, int y, const u32 c[3], char *text);
+void gui_write_char(struct window *win, int x, int y, u32 c, char ch);
+void gui_write(struct window *win, int x, int y, u32 c, char *text);
+void gui_load_image(struct window *win, char *path, int x, int y);
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);
void gui_win_on_win(struct window *dest, struct window *src, int x, int y);
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 c[3]);
-void gui_fill(struct window *win, const u32 c[3]);
-void gui_border(struct window *win, const u32 c[3], u32 width);
+void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c);
+void gui_fill(struct window *win, u32 c);
+void gui_border(struct window *win, u32 c, u32 width);
void gui_init(char *font_path);
/**
diff --git a/res/cursor.bmp b/res/cursor.bmp
new file mode 100644
index 0000000..4086a01
--- /dev/null
+++ b/res/cursor.bmp
Binary files differ
diff --git a/run b/run
index bb927b9..2fe9082 100755
--- a/run
+++ b/run
@@ -52,6 +52,8 @@ make_cross() {
make_disk() {
rm -rf disk && mkdir -p disk/font/
+ cp -r res/ disk/
+
cd disk/font/
VERSION="1.8.1"
wget -q "https://github.com/fcambus/spleen/releases/download/$VERSION/spleen-$VERSION.tar.gz"