diff options
| -rw-r--r-- | apps/test.c | 21 | ||||
| -rw-r--r-- | apps/wm.c | 23 | ||||
| -rw-r--r-- | kernel/main.c | 2 | ||||
| -rw-r--r-- | libgui/gui.c | 18 |
4 files changed, 34 insertions, 30 deletions
diff --git a/apps/test.c b/apps/test.c index ee5792d..0fecbf4 100644 --- a/apps/test.c +++ b/apps/test.c @@ -1,3 +1,5 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + #include <def.h> #include <gui.h> #include <print.h> @@ -6,15 +8,18 @@ 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; */ - - /* const u32 color[3] = { 0xff, 0, 0 }; */ - /* gui_fill(win, color); */ + struct window *win = gui_new_window(); + u32 color[3] = { 0xff, 0, 0 }; + gui_fill(win, color); + u32 last_time = 0; while (1) { - }; + u32 current_time = time(); + if (current_time - last_time > 1000 / 60) { // 60Hz + win->x += 10; + }; + last_time = current_time; + yield(); + } return 0; } @@ -13,6 +13,7 @@ struct vbe *vbe; struct window *direct; // Direct video memory window struct window *root; // Root window (wallpaper etc.) +struct window *exchange; // Exchange buffer struct list *windows; void onkey(u32 scancode) @@ -49,28 +50,30 @@ 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); direct = malloc(sizeof(*direct)); memcpy(direct, root, sizeof(*direct)); direct->fb = vbe->fb; + list_add(windows, root); - const u32 background[3] = { 0x10, 0x10, 0x10 }; + const u32 background[3] = { 0x0, 0x0, 0x0 }; gui_fill(root, background); - gui_load_wallpaper(root, "/wall.bmp"); - list_add(windows, root); + // TODO: Fix wallpaper + /* gui_load_wallpaper(root, "/wall.bmp"); */ // TODO: Remove async events completely /* event_map(EVENT_KEYBOARD, onkey); */ - u32 last_time = 0; struct message *msg; 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); + if (windows->head && windows->head->data) { + struct node *iterator = windows->head; + do { + struct window *win = iterator->data; + gui_win_on_win(win, exchange, win->x, win->y); + } while ((iterator = iterator->next) != NULL); + gui_win_on_win(exchange, direct, 0, 0); } - last_time = current_time; if (!(msg = msg_receive())) { yield(); diff --git a/kernel/main.c b/kernel/main.c index c4b51cf..42f0d54 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -12,7 +12,7 @@ void kernel_main(struct vid_info *vid_info) { - HEAP = 0x00200000; + HEAP = 0x00f00000; HEAP_START = HEAP; // For malloc function boot_passed = vid_info; diff --git a/libgui/gui.c b/libgui/gui.c index cfc33b3..434ad6c 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -50,8 +50,8 @@ void gui_load_image(struct window *win, char *path, int x, int y) u8 *srcfb = bmp->data; u8 *destfb = win->fb; int bpl = bmp->bpp >> 3; - for (u32 cy = 0; cy <= bmp->height; cy++) { - for (u32 cx = 0; cx <= bmp->width; cx++) { + 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]; @@ -68,15 +68,11 @@ void gui_load_wallpaper(struct window *win, char *path) 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; + u8 *destfb = &dest->fb[x * (dest->bpp >> 3) + y * dest->pitch]; int bpl = dest->bpp >> 3; - for (u32 cy = 0; cy <= src->height; cy++) { - for (u32 cx = 0; cx <= src->width; cx++) { + 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]; @@ -92,8 +88,8 @@ void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, cons 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++) { + for (int i = 0; i < y2 - y1; i++) { + for (int j = 0; j < x2 - x1; j++) { draw[bpl * j + 0] = color[2]; draw[bpl * j + 1] = color[1]; draw[bpl * j + 2] = color[0]; |