diff options
| -rw-r--r-- | apps/test.c | 8 | ||||
| -rw-r--r-- | apps/wm.c | 25 | ||||
| -rw-r--r-- | libgui/gui.c | 27 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 3 |
4 files changed, 42 insertions, 21 deletions
diff --git a/apps/test.c b/apps/test.c index 0fecbf4..efc7432 100644 --- a/apps/test.c +++ b/apps/test.c @@ -9,16 +9,10 @@ int main() print("[test loaded]\n"); struct window *win = gui_new_window(); - u32 color[3] = { 0xff, 0, 0 }; + u32 color[3] = { 0xff, 0xff, 0xff }; 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; @@ -14,6 +14,7 @@ struct vbe *vbe; struct window *direct; // Direct video memory window struct window *root; // Root window (wallpaper etc.) struct window *exchange; // Exchange buffer +struct window *focused; // The focused window struct list *windows; static struct window *new_window(int x, int y, u16 width, u16 height) @@ -49,6 +50,8 @@ int main(int argc, char **argv) const u32 background[3] = { 0x0, 0x0, 0x0 }; gui_fill(root, background); + const u32 border[3] = { 0xff, 0xff, 0xff }; + gui_border(root, border, 2); // TODO: Fix wallpaper /* gui_load_wallpaper(root, "/wall.bmp"); */ @@ -56,15 +59,6 @@ int main(int argc, char **argv) struct message *msg; while (1) { - 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); - } - if (!(msg = msg_receive())) { yield(); continue; @@ -73,12 +67,23 @@ int main(int argc, char **argv) switch (msg->type) { case MSG_NEW_WINDOW: printf("New window for pid %d\n", msg->src); - struct window *win = new_window(0, 0, 200, 200); + struct window *win = + new_window(vbe->width / 2 - 100, vbe->height / 2 - 100, 200, 200); msg_send(msg->src, MSG_NEW_WINDOW, win); list_add(windows, win); + focused = win; break; case EVENT_KEYBOARD: printf("Keypress %d!\n", msg->data); + focused->x += 50; + if (windows->head && windows->head->data) { + struct node *iterator = windows->head; + do { + struct window *win = iterator->data; + gui_win_on_win(exchange, win, win->x, win->y); + } while ((iterator = iterator->next) != NULL); + gui_win_on_win(direct, exchange, 0, 0); + } break; default: printf("Unknown WM request %d from pid %d", msg->type, msg->src); diff --git a/libgui/gui.c b/libgui/gui.c index 434ad6c..118bd95 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -66,13 +66,13 @@ void gui_load_wallpaper(struct window *win, char *path) gui_load_image(win, path, 0, 0); } -void gui_win_on_win(struct window *src, struct window *dest, int x, int y) +void gui_win_on_win(struct window *dest, struct window *src, int x, int y) { u8 *srcfb = src->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 - 1; cy++) { + for (u32 cx = 0; cx < src->width - 1; 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]; @@ -103,6 +103,27 @@ void gui_fill(struct window *win, const u32 color[3]) gui_draw_rectangle(win, 0, 0, win->width - 1, win->height - 1, color); } +void gui_border(struct window *win, const u32 color[3], u32 width) +{ + if (width <= 0) + return; + + int bpl = win->bpp >> 3; + u8 *draw = win->fb; + for (u32 i = 0; i < win->height; i++) { + for (u32 j = 0; j < win->width; j++) { + if (j <= width - 1 || i <= width - 1 || + j - win->width + width + 1 <= width || + i - win->height + width + 1 <= width) { + draw[bpl * j + 0] = color[2]; + draw[bpl * j + 1] = color[1]; + draw[bpl * j + 2] = color[0]; + } + } + draw += win->pitch; + } +} + void gui_init(char *font_path) { font = psf_parse(read(font_path)); diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 700500e..e0cffdf 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -27,9 +27,10 @@ struct window { }; 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_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 color[3]); void gui_fill(struct window *win, const u32 color[3]); +void gui_border(struct window *win, const u32 color[3], u32 width); void gui_init(char *font_path); /** |