diff options
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rw-r--r-- | apps/init.c | 4 | ||||
| -rw-r--r-- | apps/window.c | 42 | ||||
| -rw-r--r-- | apps/wm.c | 146 | ||||
| -rw-r--r-- | libgui/Makefile | 1 | ||||
| -rw-r--r-- | libgui/gui.c | 627 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 125 | ||||
| -rw-r--r-- | libgui/inc/msg.h | 6 | ||||
| -rw-r--r-- | libtxt/Makefile | 2 |
9 files changed, 130 insertions, 825 deletions
diff --git a/apps/Makefile b/apps/Makefile index 6164010..eec133d 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,6 +1,6 @@ # MIT License, Copyright (c) 2020 Marvin Borner -COBJS = init.o wm.o test.o#mandelbrot.o window.o exec.o files.o test.o cc.o browser.o server.o +COBJS = init.o wm.o test.o window.o #mandelbrot.o window.o exec.o files.o test.o cc.o browser.o server.o CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy diff --git a/apps/init.c b/apps/init.c index 08f2d80..87f0d82 100644 --- a/apps/init.c +++ b/apps/init.c @@ -12,7 +12,7 @@ int main(int argc, char **argv) log("%s loaded\n", argv[0]); int wm = exec("/bin/wm", "wm", argv[1], NULL); - /* int exec = exec("/bin/exec", "test", NULL); */ + int test = exec("/bin/window", "test", NULL); - return wm; //+ exec; + return wm + test; } diff --git a/apps/window.c b/apps/window.c index 6d738dc..5608ae3 100644 --- a/apps/window.c +++ b/apps/window.c @@ -1,44 +1,14 @@ -// MIT License, Copyright (c) 2020 Marvin Borner +// MIT License, Copyright (c) 2021 Marvin Borner -#include <conv.h> -#include <def.h> -#include <gfx.h> +#include <assert.h> #include <gui.h> -#include <input.h> #include <print.h> -#include <str.h> - -void on_click(void *e, struct element *elem) -{ - (void)e; - - struct element_button *b = elem->data; - b->color_bg = COLOR_MAGENTA; - b->color_fg = COLOR_WHITE; - gui_sync(elem); - - u32 time = time(); - while (time + 200 > time()) - yield(); - - b->color_bg = COLOR_WHITE; - b->color_fg = COLOR_BLACK; - gui_sync(elem); -} int main() { - struct element *root = gui_init("test", 600, 400, COLOR_BG); - struct element *container = gui_add_container(root, 0, 0, 50, 100, COLOR_RED); - struct element *button = - gui_add_button(container, 10, 10, FONT_24, "Button", COLOR_WHITE, COLOR_BLACK); - struct element *text_input = - gui_add_text_input(container, 10, 50, 70, FONT_24, COLOR_WHITE, COLOR_BLACK); - (void)text_input; - - button->event.on_click = on_click; - - gui_event_loop(root); - + struct gui_window win = { 0 }; + assert(gui_new_window(&win) > 0); + /* assert(gui_redraw_window(win.id) > 0); */ + log("%d\n", win.ctx->size.x); return 0; } @@ -3,6 +3,7 @@ #include <assert.h> #include <def.h> #include <gfx.h> +#include <gui.h> #include <input.h> #include <keymap.h> #include <list.h> @@ -52,8 +53,22 @@ static struct { u8 right : 1; } mouse = { 0 }; -static struct window *window_create(struct client client, const char *name, struct vec2 pos, - struct vec2 size, u32 flags) +static void buffer_flush() +{ +#ifdef FLUSH_TIMEOUT + static u32 time_flush = 0; + u32 time_now = time(); + if (time_now - time_flush > FLUSH_TIMEOUT) { + memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes); + time_flush = time_now; + } +#else + memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes); +#endif +} + +static struct window *window_new(struct client client, const char *name, struct vec2 pos, + struct vec2 size, u32 flags) { struct window *win = malloc(sizeof(*win)); win->id = rand(); @@ -67,6 +82,7 @@ static struct window *window_create(struct client client, const char *name, stru win->client = client; win->flags = flags; win->pos = pos; + win->pos_prev = pos; list_add(windows, win); return win; } @@ -89,20 +105,6 @@ static void window_destroy(struct window *win) free(win); } -static void buffer_flush() -{ -#ifdef FLUSH_TIMEOUT - static u32 time_flush = 0; - u32 time_now = time(); - if (time_now - time_flush > FLUSH_TIMEOUT) { - memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes); - time_flush = time_now; - } -#else - memcpy(direct->ctx.fb, root->ctx.fb, root->ctx.bytes); -#endif -} - // Beautiful static void windows_at_rec(vec2 pos1, vec2 pos2, struct list *list) { @@ -183,25 +185,21 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud return (struct rectangle){ .pos1 = pos1, .pos2 = pos2, .data = data }; } -static void redraw_window(struct window *win) +static void window_redraw(struct window *win) { - if (win->ctx.size.x == win->ctx.size.y) { - struct rectangle rec = - rectangle_at(win->pos_prev, vec2_add(win->pos_prev, win->ctx.size), win); - - u8 *srcfb = rec.data; - u8 *destfb = &root->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * root->ctx.pitch]; - for (u32 cy = 0; cy < win->ctx.size.y; cy++) { - memcpy(destfb, srcfb, win->ctx.size.x * bypp); - srcfb += win->ctx.pitch; - destfb += root->ctx.pitch; - } - - free(rec.data); - } else { - log("Rectangle splitting isn't supported yet!\n"); + struct rectangle rec = + rectangle_at(win->pos_prev, vec2_add(win->pos_prev, win->ctx.size), win); + + u8 *srcfb = rec.data; + u8 *destfb = &root->ctx.fb[rec.pos1.x * bypp + rec.pos1.y * root->ctx.pitch]; + for (u32 cy = 0; cy < win->ctx.size.y; cy++) { + memcpy(destfb, srcfb, win->ctx.size.x * bypp); + srcfb += win->ctx.pitch; + destfb += root->ctx.pitch; } + free(rec.data); + gfx_ctx_on_ctx(&root->ctx, &win->ctx, win->pos); buffer_flush(); } @@ -259,7 +257,59 @@ static void handle_event_mouse(struct event_mouse *event) cursor->pos = mouse.pos; if (!vec2_eq(cursor->pos, cursor->pos_prev)) - redraw_window(cursor); + window_redraw(cursor); +} + +static void handle_message_new_window(struct message *msg) +{ + if (!msg->data) { + msg_send(msg->src, GUI_NEW_WINDOW | MSG_FAILURE, NULL); + return; + } + struct gui_window *buf = msg->data; + struct window *win = window_new((struct client){ .pid = msg->src }, "idk", vec2(100, 100), + vec2(600, 400), 0); + buf->id = win->id; + buf->ctx = &win->ctx; + buf->pos = &win->pos; + msg_send(msg->src, GUI_NEW_WINDOW | MSG_SUCCESS, NULL); + window_redraw(win); +} + +static void handle_message_redraw_window(struct message *msg) +{ + if (!msg->data) { + msg_send(msg->src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL); + return; + } + u32 id = *(u32 *)msg->data; + struct window *win = window_find(id); + if (!win) { + msg_send(msg->src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL); + return; + } + msg_send(msg->src, GUI_REDRAW_WINDOW | MSG_SUCCESS, NULL); + window_redraw(win); +} + +static void handle_message(struct message *msg) +{ + if (msg->magic != MSG_MAGIC) { + log("Message magic doesn't match!\n"); + return; + } + + switch (msg->type) { + case GUI_NEW_WINDOW: + handle_message_new_window(msg); + break; + case GUI_REDRAW_WINDOW: + handle_message_redraw_window(msg); + break; + default: + log("Message type %d not implemented!\n", msg->type); + msg_send(msg->src, MSG_FAILURE, NULL); + } } int main(int argc, char **argv) @@ -272,22 +322,22 @@ int main(int argc, char **argv) windows = list_new(); keymap = keymap_parse("/res/keymaps/en.keymap"); - direct = window_create(wm_client, "direct", vec2(0, 0), vec2(screen.width, screen.height), - WF_NO_WINDOW | WF_NO_FB | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); + direct = window_new(wm_client, "direct", vec2(0, 0), vec2(screen.width, screen.height), + WF_NO_WINDOW | WF_NO_FB | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); direct->ctx.fb = screen.fb; direct->flags ^= WF_NO_FB; - root = window_create(wm_client, "root", vec2(0, 0), vec2(screen.width, screen.height), - WF_NO_WINDOW | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); + root = window_new(wm_client, "root", vec2(0, 0), vec2(screen.width, screen.height), + WF_NO_WINDOW | WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); wallpaper = - window_create(wm_client, "wallpaper", vec2(0, 0), vec2(screen.width, screen.height), - WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); - cursor = window_create(wm_client, "cursor", vec2(0, 0), vec2(32, 32), - WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); + window_new(wm_client, "wallpaper", vec2(0, 0), vec2(screen.width, screen.height), + WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); + cursor = window_new(wm_client, "cursor", vec2(0, 0), vec2(32, 32), + WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); /* gfx_write(&direct->ctx, vec2(0, 0), FONT_32, COLOR_FG, "Loading Melvix..."); */ gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png"); gfx_load_wallpaper(&cursor->ctx, "/res/cursor.png"); - redraw_window(wallpaper); + window_redraw(wallpaper); struct message msg = { 0 }; struct event_keyboard event_keyboard = { 0 }; @@ -307,19 +357,13 @@ int main(int argc, char **argv) handle_event_mouse(&event_mouse); continue; } else if (poll_ret == 2) { - if (read(listeners[poll_ret], &msg, 0, sizeof(msg)) <= 0) - continue; + if (read(listeners[poll_ret], &msg, 0, sizeof(msg)) > 0) + handle_message(&msg); + continue; } } else { err(1, "POLL ERROR!\n"); } - - if (msg.magic != MSG_MAGIC) { - log("Message magic doesn't match!\n"); - continue; - } - - log("not implemented!\n"); }; // TODO: Execute? diff --git a/libgui/Makefile b/libgui/Makefile index cb02fed..b37bc3b 100644 --- a/libgui/Makefile +++ b/libgui/Makefile @@ -4,6 +4,7 @@ COBJS = psf.o \ bmp.o \ png.o \ gfx.o \ + gui.o \ msg.o CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld diff --git a/libgui/gui.c b/libgui/gui.c index 8eb7ce9..2083f23 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -1,624 +1,25 @@ -// MIT License, Copyright (c) 2020 Marvin Borner -// Mostly GFX function wrappers -// TODO: Reduce code duplication +// MIT License, Copyright (c) 2021 Marvin Borner -#include <assert.h> #include <def.h> -#include <gfx.h> #include <gui.h> -#include <input.h> -#include <list.h> -#include <mem.h> -#include <msg.h> -#include <str.h> -#include <sys.h> +#include <print.h> -// TODO: Use list (and add index-based access) -#define MAX_WINDOWS 10 -#define BORDER 2 -#define PERC(c, e) ((u32)((double)(c) * (double)(e) / 100.0)) +#define WM_PATH "/bin/wm" -u32 window_count = 0; -static struct window windows[MAX_WINDOWS] = { 0 }; - -static struct window *new_window(const char *title, int x, int y, u32 width, u32 height, int flags) -{ - assert(window_count + 1 <= MAX_WINDOWS); - - struct window *win = &windows[window_count + 1]; - win->ctx = malloc(sizeof(*win->ctx)); - win->ctx->x = x > 0 ? x : 50; - win->ctx->y = y > 0 ? y : 50; - win->ctx->width = width > 0 ? width : 600; - win->ctx->height = height > 0 ? height : 400; - win->ctx->flags = flags; - win->id = window_count + 1; - win->title = title; - win->childs = list_new(); - - gfx_new_ctx(win->ctx); - - if (!win->ctx->fb) - return NULL; - - window_count++; - - return win; -} - -static struct element *get_root(u32 window_id) -{ - struct list *childs = windows[window_id].childs; - if (!childs || !childs->head || !childs->head->data) - return NULL; - return childs->head->data; -} - -static void merge_elements(struct element *container) -{ - if (!container || !container->childs || !container->childs->head) - return; - - struct node *iterator = container->childs->head; - while (iterator != NULL) { - struct element *elem = iterator->data; - struct context *ctx = elem->ctx; - merge_elements(elem); - gfx_ctx_on_ctx(container->ctx, ctx, ctx->x, ctx->y); - iterator = iterator->next; - } -} - -static void free_context(struct context *ctx) -{ - if (!ctx) - return; - - free(ctx->fb); - ctx->fb = NULL; - free(ctx); - ctx = NULL; -} - -static void remove_childs(struct element *elem); -static void remove_element(struct element *elem) -{ - if (!elem) - return; - - remove_childs(elem); - free_context(elem->ctx); - free(elem->data); - elem->data = NULL; - free(elem); - elem = NULL; -} - -static void remove_childs(struct element *elem) -{ - if (!elem || !elem->childs || !elem->childs->head) - return; - - struct node *iterator = elem->childs->head; - while (iterator != NULL) { - struct element *child = iterator->data; - remove_element(child); - iterator = iterator->next; - } - - list_destroy(elem->childs); -} - -static void remove_window(struct window *win) -{ - if (!win || !win->childs || !win->childs->head) - return; - - struct node *iterator = win->childs->head; - while (iterator != NULL) { - struct element *child = iterator->data; - remove_element(child); - iterator = iterator->next; - } - - free_context(win->ctx); - list_destroy(win->childs); -} - -static void remove_all() -{ - for (int i = 0; i < MAX_WINDOWS; i++) { - remove_window(&windows[i]); - } -} - -static struct element *element_at(struct element *container, int x, int y) -{ - if (!container || !container->childs || !container->childs->head) - return NULL; - - struct node *iterator = container->childs->head; - while (iterator != NULL) { - struct context *ctx = ((struct element *)iterator->data)->ctx; - - int relative_x, relative_y; - if (container->type == GUI_TYPE_ROOT) { - relative_x = ctx->x; - relative_y = ctx->y; - } else { - relative_x = ctx->x + container->ctx->x; - relative_y = ctx->y + container->ctx->y; - } - - if (ctx != container->ctx && ctx->flags & WF_RELATIVE && x >= relative_x && - x <= relative_x + (int)ctx->width && y >= relative_y && - y <= relative_y + (int)ctx->height) { - struct element *recursive = NULL; - if ((recursive = element_at(iterator->data, x, y))) - return recursive; - else - return iterator->data; - } - - iterator = iterator->next; - } - - return NULL; -} - -static int absolute_x_off(struct element *elem) -{ - if (!elem->parent) - return 0; - - int x = 0; - - struct element *iterator = elem; - while ((iterator = iterator->parent) && iterator->ctx) - if (iterator->parent) - x += iterator->ctx->x; - - return x; -} - -static int absolute_y_off(struct element *elem) -{ - if (!elem->parent) - return 0; - - int y = 0; - - struct element *iterator = elem; - while ((iterator = iterator->parent) && iterator->ctx) { - if (iterator->parent) - y += iterator->ctx->y; - } - - return y; -} - -struct context *gui_get_context(int x, int y, u32 width, u32 height) +s32 gui_new_window(struct gui_window *win) { - struct context *ctx = malloc(sizeof(*ctx)); - ctx->pid = getpid(); - ctx->x = x; - ctx->y = y; - ctx->width = width; - ctx->height = height; - ctx->bpp = 32; // TODO: Dynamic bpp - ctx->pitch = ctx->width * (ctx->bpp >> 3); - ctx->fb = malloc(ctx->height * ctx->pitch); - memset(ctx->fb, 0, ctx->height * ctx->pitch); - ctx->flags = WF_RELATIVE; - return ctx; -} - -void gui_sync_button(struct element *elem) -{ - assert(elem->type == GUI_TYPE_BUTTON); - struct element_button *button = elem->data; - - if (!elem->ctx) { - elem->ctx = - gui_get_context(button->x, button->y, - strlen(button->text) * gfx_font_width(button->font_type), - gfx_font_height(button->font_type)); - } - - gfx_fill(elem->ctx, button->color_bg); - gfx_write(elem->ctx, 0, 0, button->font_type, button->color_fg, button->text); -} - -void gui_sync_label(struct element *elem) -{ - assert(elem->type == GUI_TYPE_LABEL); - struct element_label *label = elem->data; - - if (!elem->ctx) { - elem->ctx = gui_get_context(label->x, label->y, - strlen(label->text) * gfx_font_width(label->font_type), - gfx_font_height(label->font_type)); - } - - gfx_fill(elem->ctx, label->color_bg); - gfx_write(elem->ctx, 0, 0, label->font_type, label->color_fg, label->text); -} - -void gui_sync_text_box(struct element *elem) -{ - assert(elem->type == GUI_TYPE_TEXT_BOX); - struct element_text_box *text_box = elem->data; - - int abs_x = absolute_x_off(elem) + text_box->x; - int abs_y = absolute_y_off(elem) + text_box->y; - if (!elem->ctx || - PERC(elem->parent->ctx->width, text_box->width) - abs_x != elem->ctx->width || - PERC(elem->parent->ctx->height, text_box->height) - abs_y != elem->ctx->height) { - free_context(elem->ctx); - elem->ctx = - gui_get_context(text_box->x, text_box->y, - PERC(elem->parent->ctx->width, text_box->width) - abs_x, - PERC(elem->parent->ctx->height, text_box->height) - abs_y); - } - - gfx_fill(elem->ctx, text_box->color_bg); - gfx_write(elem->ctx, 0, 0, text_box->font_type, text_box->color_fg, text_box->text); -} - -void gui_sync_text_input(struct element *elem) -{ - assert(elem->type == GUI_TYPE_TEXT_INPUT); - struct element_text_input *text_input = elem->data; - - int abs_x = absolute_x_off(elem) + text_input->x; - if (!elem->ctx || - PERC(elem->parent->ctx->width, text_input->width) - abs_x != elem->ctx->width || - (u32)gfx_font_height(text_input->font_type) != elem->ctx->height) { - free_context(elem->ctx); - elem->ctx = - gui_get_context(text_input->x, text_input->y, - PERC(elem->parent->ctx->width, text_input->width) - abs_x, - gfx_font_height(text_input->font_type)); - } - - gfx_fill(elem->ctx, text_input->color_bg); - gfx_write(elem->ctx, 0, 0, text_input->font_type, text_input->color_fg, text_input->text); -} - -void gui_sync_container(struct element *elem) -{ - assert(elem->type == GUI_TYPE_CONTAINER); - struct element_container *container = elem->data; - - int abs_x = absolute_x_off(elem) + container->x; - int abs_y = absolute_y_off(elem) + container->y; - if (!elem->ctx || - PERC(elem->parent->ctx->width, container->width) - abs_x != elem->ctx->width || - PERC(elem->parent->ctx->height, container->height) - abs_y != elem->ctx->height) { - free_context(elem->ctx); - elem->ctx = - gui_get_context(container->x, container->y, - PERC(elem->parent->ctx->width, container->width) - abs_x, - PERC(elem->parent->ctx->height, container->height) - abs_y); - } - - gfx_fill(elem->ctx, container->color_bg); - // TODO: Handle container flags -} - -void gui_only_sync(struct element *elem) -{ - switch (elem->type) { - case GUI_TYPE_BUTTON: - gui_sync_button(elem); - break; - case GUI_TYPE_LABEL: - gui_sync_label(elem); - break; - case GUI_TYPE_TEXT_BOX: - gui_sync_text_box(elem); - break; - case GUI_TYPE_TEXT_INPUT: - gui_sync_text_input(elem); - break; - case GUI_TYPE_CONTAINER: - gui_sync_container(elem); - break; - default: - break; - } -} - -void gui_sync(struct element *elem) -{ - gui_only_sync(elem); - merge_elements(get_root(elem->window_id)); - gfx_redraw_focused(); -} - -void gui_sync_recursive(struct element *container) -{ - if (!container || !container->childs || !container->childs->head) - return; - - struct node *iterator = container->childs->head; - while (iterator != NULL) { - gui_only_sync(iterator->data); - gui_sync_recursive(iterator->data); - iterator = iterator->next; - } -} - -void gui_sync_window(u32 window_id) -{ - struct element *root = get_root(window_id); - - if (!root || !root->childs || !root->childs->head) - return; - - struct node *iterator = root->childs->head; - while (iterator != NULL) { - gui_only_sync(iterator->data); - gui_sync_recursive(iterator->data); - iterator = iterator->next; - } - - merge_elements(root); - gfx_redraw_focused(); -} - -struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type, - const char *text, u32 color_bg, u32 color_fg) -{ - if (!container || !container->childs || !gfx_resolve_font(font_type)) - return NULL; - - struct element *button = malloc(sizeof(*button)); - button->type = GUI_TYPE_BUTTON; - button->window_id = container->window_id; - button->ctx = NULL; - button->parent = container; - button->childs = list_new(); - button->data = malloc(sizeof(struct element_button)); - ((struct element_button *)button->data)->x = x; - ((struct element_button *)button->data)->y = y; - ((struct element_button *)button->data)->text = strdup(text); - ((struct element_button *)button->data)->color_fg = color_fg; - ((struct element_button *)button->data)->color_bg = color_bg; - ((struct element_button *)button->data)->font_type = font_type; - - list_add(container->childs, button); - gui_sync(button); - - return button; -} - -struct element *gui_add_label(struct element *container, int x, int y, enum font_type font_type, - const char *text, u32 color_bg, u32 color_fg) -{ - if (!container || !container->childs || !gfx_resolve_font(font_type)) - return NULL; - - struct element *label = malloc(sizeof(*label)); - label->type = GUI_TYPE_LABEL; - label->window_id = container->window_id; - label->ctx = NULL; - label->parent = container; - label->childs = list_new(); - label->data = malloc(sizeof(struct element_label)); - ((struct element_label *)label->data)->x = x; - ((struct element_label *)label->data)->y = y; - ((struct element_label *)label->data)->text = strdup(text); - ((struct element_label *)label->data)->color_fg = color_fg; - ((struct element_label *)label->data)->color_bg = color_bg; - ((struct element_label *)label->data)->font_type = font_type; - - list_add(container->childs, label); - gui_sync(label); - - return label; -} - -struct element *gui_add_text_box(struct element *container, int x, int y, u32 width, u32 height, - enum font_type font_type, const char *text, u32 color_bg, - u32 color_fg) -{ - if (!container || !container->childs || !gfx_resolve_font(font_type)) - return NULL; - - struct element *text_box = malloc(sizeof(*text_box)); - text_box->type = GUI_TYPE_TEXT_BOX; - text_box->window_id = container->window_id; - text_box->ctx = NULL; - text_box->parent = container; - text_box->childs = list_new(); - text_box->data = malloc(sizeof(struct element_text_box)); - ((struct element_text_box *)text_box->data)->x = x; - ((struct element_text_box *)text_box->data)->y = y; - ((struct element_text_box *)text_box->data)->width = width; - ((struct element_text_box *)text_box->data)->height = height; - ((struct element_text_box *)text_box->data)->text = strdup(text); - ((struct element_text_box *)text_box->data)->color_fg = color_fg; - ((struct element_text_box *)text_box->data)->color_bg = color_bg; - ((struct element_text_box *)text_box->data)->font_type = font_type; - - list_add(container->childs, text_box); - gui_sync(text_box); - - return text_box; -} - -struct element *gui_add_text_input(struct element *container, int x, int y, u32 width, - enum font_type font_type, u32 color_bg, u32 color_fg) -{ - if (!container || !container->childs || !gfx_resolve_font(font_type)) - return NULL; - - struct element *text_input = malloc(sizeof(*text_input)); - text_input->type = GUI_TYPE_TEXT_INPUT; - text_input->window_id = container->window_id; - text_input->ctx = NULL; - text_input->parent = container; - text_input->childs = list_new(); - text_input->data = malloc(sizeof(struct element_text_input)); - ((struct element_text_input *)text_input->data)->x = x; - ((struct element_text_input *)text_input->data)->y = y; - ((struct element_text_input *)text_input->data)->width = width; - ((struct element_text_input *)text_input->data)->text[0] = '\0'; - ((struct element_text_input *)text_input->data)->color_fg = color_fg; - ((struct element_text_input *)text_input->data)->color_bg = color_bg; - ((struct element_text_input *)text_input->data)->font_type = font_type; - - list_add(container->childs, text_input); - gui_sync(text_input); - - return text_input; -} - -struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height, - u32 color_bg) -{ - if (!container || !container->childs) - return NULL; - - struct element *new_container = malloc(sizeof(*new_container)); - new_container->type = GUI_TYPE_CONTAINER; - new_container->window_id = container->window_id; - new_container->ctx = NULL; - new_container->parent = container; - new_container->childs = list_new(); - new_container->data = malloc(sizeof(struct element_container)); - ((struct element_container *)new_container->data)->x = x; - ((struct element_container *)new_container->data)->y = y; - ((struct element_container *)new_container->data)->width = width; - ((struct element_container *)new_container->data)->height = height; - ((struct element_container *)new_container->data)->color_bg = color_bg; - ((struct element_container *)new_container->data)->flags = 0; - - list_add(container->childs, new_container); - gui_sync(new_container); - - return new_container; -} - -void gui_remove_childs(struct element *elem) -{ - remove_childs(elem); - elem->childs = list_new(); - gui_sync(elem); -} - -void gui_remove_element(struct element *elem) -{ - if (!elem) - return; - - u32 id = elem->window_id; - struct element *root = get_root(id); - u8 is_root = root == elem; - remove_element(elem); - elem = NULL; - if (!is_root) { - merge_elements(get_root(id)); - gfx_redraw_focused(); - } -} - -// TODO: Split into small functions -void gui_event_loop(struct element *container) -{ - if (!container) - return; - struct message msg = { 0 }; - struct element *focused = NULL; - while (1) { - assert(msg_receive(&msg) > 0); - - switch (msg.type) { - case GUI_KILL: { - remove_all(); - exit(0); - } - case GUI_MOUSE: { - struct gui_event_mouse *event = msg.data; - focused = element_at(container, event->x, event->y); - if (focused && focused->event.on_click && event->but1) - focused->event.on_click(event, focused); - break; - } - case GUI_KEYBOARD: { - struct gui_event_keyboard *event = msg.data; - - if (focused && focused->type == GUI_TYPE_TEXT_INPUT && event->press) { - char *s = ((struct element_text_input *)focused->data)->text; - u32 l = strlen(s); - if (event->ch >= ' ') { - if (l >= MAX_INPUT_LENGTH) - continue; - s[l] = event->ch; - s[l + 1] = '\0'; - gui_sync(focused); - } else if (event->scancode == KEY_BACKSPACE && l > 0) { - s[l - 1] = '\0'; - gui_sync(focused); - } - } - - if (focused && focused->event.on_submit && event->press && - event->scancode == KEY_ENTER) { - focused->event.on_submit(event, focused); - // Clear! - char *t = ((struct element_text_input *)focused->data)->text; - memset(t, 0, strlen(t)); - gui_sync(focused); - } - - if (focused && focused->event.on_key && event->press && event->ch) - focused->event.on_key(event, focused); - - break; - } - case GUI_RESIZE: { - struct gui_event_resize *event = msg.data; - struct element *root = get_root(container->window_id); - root->ctx = event->new_ctx; - gui_sync_window(container->window_id); - break; - } - default: { - log("Unknown GUI request %d\n", msg.type); - } - } - } - - exit(1); + if (msg_send(pidof(WM_PATH), GUI_NEW_WINDOW, win) > 0 && msg_receive(&msg) > 0 && + msg.type == (GUI_NEW_WINDOW | MSG_SUCCESS)) + return win->id; + return -1; } -struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg) +s32 gui_redraw_window(u32 id) { - if (window_count != 0) - return NULL; - - // TODO: Add center flag - struct window *win = - new_window(title, 30, 30, width + BORDER * 2, height + BORDER * 2, WF_DEFAULT); - if (!win) - return NULL; - - gfx_fill(win->ctx, color_bg); - - struct element *container = malloc(sizeof(*container)); - container->type = GUI_TYPE_ROOT; - container->window_id = win->id; - container->ctx = win->ctx; - container->childs = list_new(); - container->data = NULL; - list_add(win->childs, container); - - struct element *root = gui_add_container(container, BORDER, BORDER, 100, 100, COLOR_BLACK); - if (!root) - return NULL; - - return root; + struct message msg = { 0 }; + if (msg_send(pidof(WM_PATH), GUI_REDRAW_WINDOW, &id) > 0 && msg_receive(&msg) > 0 && + msg.type == (GUI_REDRAW_WINDOW | MSG_SUCCESS)) + return id; + return -1; } diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 380d02b..460bf88 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -1,133 +1,18 @@ -// MIT License, Copyright (c) 2020 Marvin Borner -// Mostly GFX function wrappers +// MIT License, Copyright (c) 2021 Marvin Borner #ifndef GUI_H #define GUI_H #include <def.h> #include <gfx.h> -#include <list.h> -// TODO: Remove limits -#define MAX_CHILDS 100 -#define MAX_INPUT_LENGTH 100 - -enum element_type { - GUI_TYPE_ROOT, - GUI_TYPE_CONTAINER, - GUI_TYPE_BUTTON, - GUI_TYPE_LABEL, - GUI_TYPE_TEXT_BOX, - GUI_TYPE_TEXT_INPUT -}; - -enum container_flags { SPLIT }; - -struct element_event { - void (*on_click)(); - void (*on_key)(); - void (*on_submit)(); -}; - -struct element_container { - int x; - int y; - u32 width; - u32 height; - u32 color_bg; - enum container_flags flags; -}; - -struct element_button { - int x; - int y; - char *text; - u32 color_fg; - u32 color_bg; - enum font_type font_type; -}; - -struct element_label { - int x; - int y; - char *text; - u32 color_fg; - u32 color_bg; - enum font_type font_type; -}; - -struct element_text_box { - int x; - int y; - char *text; - u32 width; - u32 height; - u32 color_fg; - u32 color_bg; - enum font_type font_type; -}; - -struct element_text_input { - int x; - int y; - u32 width; - char text[MAX_INPUT_LENGTH]; - u32 color_fg; - u32 color_bg; - enum font_type font_type; -}; - -struct element { - enum element_type type; - u32 window_id; - struct context *ctx; // Coordinates are relative to container - struct element_event event; - void *attributes; - struct element *parent; - struct list *childs; - void *data; // Who needs static types anyways :) -}; - -struct window { +struct gui_window { u32 id; - const char *title; - struct list *childs; struct context *ctx; + vec2 *pos; }; -struct gui_event_keyboard { - char ch; - int press; - int scancode; -}; - -struct gui_event_mouse { - int x; - int y; - int but1; - int but2; - int but3; -}; - -struct gui_event_resize { - struct context *new_ctx; -}; - -struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg); -void gui_event_loop(struct element *container); -struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type, - const char *text, u32 color_bg, u32 color_fg); -struct element *gui_add_label(struct element *container, int x, int y, enum font_type font_type, - const char *text, u32 color_bg, u32 color_fg); -struct element *gui_add_text_box(struct element *container, int x, int y, u32 width, u32 height, - enum font_type font_type, const char *text, u32 color_bg, - u32 color_fg); -struct element *gui_add_text_input(struct element *container, int x, int y, u32 width, - enum font_type font_type, u32 color_bg, u32 color_fg); -struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height, - u32 color_bg); -void gui_sync(struct element *elem); -void gui_remove_childs(struct element *elem); -void gui_remove_element(struct element *elem); +s32 gui_new_window(struct gui_window *win); +s32 gui_redraw_window(u32 id); #endif diff --git a/libgui/inc/msg.h b/libgui/inc/msg.h index e120b70..db00460 100644 --- a/libgui/inc/msg.h +++ b/libgui/inc/msg.h @@ -6,6 +6,8 @@ #include <def.h> #define MSG_MAGIC 0x42042069 +#define MSG_SUCCESS (1 << 29) +#define MSG_FAILURE (1 << 30) struct message { u32 magic; @@ -15,12 +17,14 @@ struct message { }; enum message_type { - // GFX + // GFX // TODO: Remove GFX_NEW_CONTEXT, GFX_REDRAW, GFX_REDRAW_FOCUSED, // GUI + GUI_NEW_WINDOW, + GUI_REDRAW_WINDOW, GUI_KILL, GUI_KEYBOARD, GUI_MOUSE, diff --git a/libtxt/Makefile b/libtxt/Makefile index 087b54c..72b828f 100644 --- a/libtxt/Makefile +++ b/libtxt/Makefile @@ -1,6 +1,6 @@ # MIT License, Copyright (c) 2020 Marvin Borner -COBJS = keymap.o xml.o html.o +COBJS = keymap.o #xml.o html.o CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar |