aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/test.c10
-rw-r--r--apps/wm.c40
-rw-r--r--libgui/gui.c66
-rw-r--r--libgui/inc/gui.h10
4 files changed, 77 insertions, 49 deletions
diff --git a/apps/test.c b/apps/test.c
index 3bbe824..ee5792d 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -7,12 +7,12 @@ int main()
print("[test loaded]\n");
/* struct window *win = gui_new_window(); */
- msg_send(1, MSG_NEW_WINDOW, NULL);
- struct message *msg = msg_receive_loop();
- struct window *win = (struct window *)msg->data;
+ /* msg_send(1, MSG_NEW_WINDOW, NULL); */
+ /* struct message *msg = msg_receive_loop(); */
+ /* struct window *win = (struct window *)msg->data; */
- const u32 color[3] = { 0xff, 0, 0 };
- gui_fill(win, color);
+ /* const u32 color[3] = { 0xff, 0, 0 }; */
+ /* gui_fill(win, color); */
while (1) {
};
diff --git a/apps/wm.c b/apps/wm.c
index 97bab76..a010928 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -11,6 +11,8 @@
#include <vesa.h>
struct vbe *vbe;
+struct window *direct; // Direct video memory window
+struct window *root; // Root window (wallpaper etc.)
struct list *windows;
void onkey(u32 scancode)
@@ -29,8 +31,9 @@ static struct window *new_window(int x, int y, u16 width, u16 height)
win->y = y;
win->width = width;
win->height = height;
- win->vbe = vbe;
- win->fb = malloc(width * height * (vbe->bpp >> 3));
+ win->bpp = vbe->bpp;
+ win->pitch = win->width * (win->bpp >> 3);
+ win->fb = malloc(height * win->pitch);
return win;
}
@@ -38,27 +41,36 @@ int main(int argc, char **argv)
{
(void)argc;
vbe = (struct vbe *)argv[1];
- windows = list_new();
-
printf("VBE: %dx%d\n", vbe->width, vbe->height);
const u32 color[3] = { 0, 0, 0 };
vesa_fill(vbe, color);
gui_init("/font/spleen-16x32.psfu");
- gui_load_wallpaper(vbe, "/wall.bmp");
- event_map(EVENT_KEYBOARD, onkey);
+ windows = list_new();
+ root = new_window(0, 0, vbe->width, vbe->height);
+ direct = malloc(sizeof(*direct));
+ memcpy(direct, root, sizeof(*direct));
+ direct->fb = vbe->fb;
+
+ const u32 background[3] = { 0x10, 0x10, 0x10 };
+ gui_fill(root, background);
+ gui_load_wallpaper(root, "/wall.bmp");
+ list_add(windows, root);
+
+ // TODO: Remove async events completely
+ /* event_map(EVENT_KEYBOARD, onkey); */
u32 last_time = 0;
struct message *msg;
- while (1) { // TODO: Remove continuous polling?
- /* u32 current_time = time(); */
- /* if (current_time - last_time > 1000 / 60) { // 60Hz */
- /* struct window *win = windows->head->data; */
- /* memcpy(vbe->fb, windows->head->data, */
- /* win->width * win->height * (vbe->bpp >> 3)); */
- /* } */
- /* last_time = current_time; */
+ while (1) {
+ u32 current_time = time();
+ if (current_time - last_time > 1000 / 60) { // 60Hz
+ struct window *win;
+ if (windows->head && (win = windows->head->data))
+ gui_win_on_win(win, direct, 0, 0);
+ }
+ last_time = current_time;
if (!(msg = msg_receive())) {
yield();
diff --git a/libgui/gui.c b/libgui/gui.c
index 3b918e7..cfc33b3 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -40,51 +40,65 @@ void gui_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text)
}
}
-void gui_load_wallpaper(struct vbe *vbe, char *path)
+void gui_load_image(struct window *win, char *path, int x, int y)
{
struct bmp *bmp = bmp_load(path);
- assert(bmp);
+ assert(bmp && bmp->width + x <= win->width);
+ assert(bmp && bmp->height + y <= win->height);
+ // TODO: Support padding with odd widths
+ u8 *srcfb = bmp->data;
+ u8 *destfb = win->fb;
int bpl = bmp->bpp >> 3;
- int x1 = 0;
- int x2 = bmp->width;
- int y1 = 0;
- int y2 = bmp->height;
+ for (u32 cy = 0; cy <= bmp->height; cy++) {
+ for (u32 cx = 0; cx <= bmp->width; cx++) {
+ destfb[bpl * cx + 0] = srcfb[bpl * cx + 0];
+ destfb[bpl * cx + 1] = srcfb[bpl * cx + 1];
+ destfb[bpl * cx + 2] = srcfb[bpl * cx + 2];
+ }
+ srcfb += bmp->pitch;
+ destfb += win->pitch;
+ }
+}
- // TODO: Support padding with odd widths
- /* int pitch = bmp->width * bpl; */
- /* int padding = 1; */
- /* while ((pitch + padding) % 4 != 0) */
- /* padding++; */
- /* int psw = pitch + padding; */
+void gui_load_wallpaper(struct window *win, char *path)
+{
+ gui_load_image(win, path, 0, 0);
+}
- int pos1 = x1 * bpl + y1 * vbe->pitch;
- u8 *draw = &vbe->fb[pos1];
- u8 *data = bmp->data;
- for (int i = 0; i <= y2 - y1; i++) {
- for (int j = 0; j <= x2 - x1; j++) {
- draw[bpl * j] = data[bpl * j];
- draw[bpl * j + 1] = data[bpl * j + 1];
- draw[bpl * j + 2] = data[bpl * j + 2];
+void gui_win_on_win(struct window *src, struct window *dest, int x, int y)
+{
+ // TODO: x, y image coords
+ (void)x;
+ (void)y;
+
+ u8 *srcfb = src->fb;
+ u8 *destfb = dest->fb;
+ int bpl = dest->bpp >> 3;
+ for (u32 cy = 0; cy <= src->height; cy++) {
+ for (u32 cx = 0; cx <= src->width; cx++) {
+ destfb[bpl * cx + 0] = srcfb[bpl * cx + 0];
+ destfb[bpl * cx + 1] = srcfb[bpl * cx + 1];
+ destfb[bpl * cx + 2] = srcfb[bpl * cx + 2];
}
- draw += vbe->pitch;
- data += bmp->pitch;
+ srcfb += src->pitch;
+ destfb += dest->pitch;
}
}
void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 color[3])
{
- int bpl = win->vbe->bpp >> 3;
+ int bpl = win->bpp >> 3;
- int pos1 = x1 * bpl + y1 * win->vbe->pitch;
+ int pos1 = x1 * bpl + y1 * win->pitch;
u8 *draw = &win->fb[pos1];
for (int i = 0; i <= y2 - y1; i++) {
for (int j = 0; j <= x2 - x1; j++) {
- draw[bpl * j] = color[2];
+ draw[bpl * j + 0] = color[2];
draw[bpl * j + 1] = color[1];
draw[bpl * j + 2] = color[0];
}
- draw += win->vbe->pitch;
+ draw += win->pitch;
}
}
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 467496a..ccd4bd9 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -19,15 +19,17 @@ struct font {
struct window {
int x;
int y;
- u16 width;
- u16 height;
- struct vbe *vbe;
+ u32 width;
+ u32 height;
u8 *fb;
+ u32 bpp;
+ u32 pitch;
};
+void gui_load_wallpaper(struct window *win, char *path);
+void gui_win_on_win(struct window *src, struct window *dest, int x, int y);
void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 color[3]);
void gui_fill(struct window *win, const u32 color[3]);
-void gui_load_wallpaper(struct vbe *vbe, char *path);
void gui_init(char *font_path);
/**