diff options
| -rw-r--r-- | apps/window.c | 19 | ||||
| -rw-r--r-- | apps/wm.c | 78 | ||||
| -rw-r--r-- | libgui/gui.c | 61 | ||||
| -rw-r--r-- | libgui/inc/gfx.h | 12 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 22 |
5 files changed, 134 insertions, 58 deletions
diff --git a/apps/window.c b/apps/window.c index 601f187..ffd860d 100644 --- a/apps/window.c +++ b/apps/window.c @@ -8,19 +8,22 @@ #include <print.h> #include <str.h> +void on_click() +{ + print("CLICK!\n"); +} + int main() { print("[test context loaded]\n"); struct element *container = gui_init("test", 0, 0); - gui_add_button(container, 10, 10, 100, 20, "hallo", COLOR_RED); + struct element_button *button = + gui_add_button(container, 10, 10, 100, 20, "hallo", COLOR_RED); + + button->on_click = on_click; + + gui_event_loop(container); - struct message *msg; - while (1) { - if (!(msg = msg_receive())) { - yield(); - continue; - } - } return 0; } @@ -84,7 +84,34 @@ static void redraw_all() memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height); } -// TODO: Send relative mouse position event to focused context +#define SHIFT_PRESSED 1 << 0 +#define ALT_PRESSED 1 << 1 +#define CTRL_PRESSED 1 << 2 +static u32 special_keys_pressed; +static void handle_keyboard(struct event_keyboard *event) +{ + if (event->magic != KEYBOARD_MAGIC || !focused) + return; + + if (event->scancode == KEY_LEFTSHIFT || event->scancode == KEY_RIGHTSHIFT) + special_keys_pressed ^= SHIFT_PRESSED; + else if (event->scancode == KEY_LEFTALT || event->scancode == KEY_RIGHTALT) + special_keys_pressed ^= ALT_PRESSED; + else if (event->scancode == KEY_LEFTCTRL || event->scancode == KEY_RIGHTCTRL) + special_keys_pressed ^= CTRL_PRESSED; + + struct gui_event_keyboard *msg = malloc(sizeof(*msg)); + + if (special_keys_pressed & SHIFT_PRESSED) + msg->ch = keymap->shift_map[event->scancode]; + else + msg->ch = keymap->map[event->scancode]; + + msg->press = event->press; + msg->scancode = event->scancode; + msg_send(focused->pid, GUI_KEYBOARD, msg); +} + static int mouse_skip = 0; static int mouse_pressed[3] = { 0 }; static void handle_mouse(struct event_mouse *event) @@ -109,12 +136,14 @@ static void handle_mouse(struct event_mouse *event) // Restore cursor buffer backup gfx_copy(&direct, &exchange, cursor.x, cursor.y, cursor.width, cursor.height); + int mod_pressed = special_keys_pressed & ALT_PRESSED; + // Context focus if (!mouse_pressed[0] && !mouse_pressed[1]) focused = context_at(mouse_x, mouse_y); // Context position - if (event->but1 && !mouse_pressed[1]) { + if (mod_pressed && event->but1 && !mouse_pressed[1]) { mouse_pressed[0] = 1; if (focused && !(focused->flags & WF_NO_DRAG)) { focused->x = mouse_x; @@ -124,13 +153,13 @@ static void handle_mouse(struct event_mouse *event) redraw_all(); // TODO: Function to redraw one context } } - } else if (mouse_pressed[0]) { + } else if (mod_pressed && mouse_pressed[0]) { mouse_pressed[0] = 0; redraw_all(); } // Context size - if (event->but2 && !mouse_pressed[0]) { + if (mod_pressed && event->but2 && !mouse_pressed[0]) { if (focused && !mouse_pressed[1]) { mouse_x = focused->x + focused->width; mouse_y = focused->y + focused->height; @@ -144,7 +173,7 @@ static void handle_mouse(struct event_mouse *event) redraw_all(); // TODO: Function to redraw one context } mouse_pressed[1] = 1; - } else if (mouse_pressed[1]) { + } else if (mod_pressed && mouse_pressed[1]) { mouse_pressed[1] = 0; redraw_all(); } @@ -153,33 +182,16 @@ static void handle_mouse(struct event_mouse *event) cursor.y = mouse_y; gfx_ctx_on_ctx(&direct, &cursor, cursor.x, cursor.y); mouse_skip++; -} -#define SHIFT_PRESSED 1 << 0 -#define ALT_PRESSED 1 << 1 -#define CTRL_PRESSED 1 << 2 -static u32 special_keys_pressed; -static void handle_keyboard(struct event_keyboard *event) -{ - if (event->magic != KEYBOARD_MAGIC || !focused) + if (!focused) return; - - struct msg_keyboard *msg = malloc(sizeof(*msg)); - if (event->scancode == KEY_LEFTSHIFT || event->scancode == KEY_RIGHTSHIFT) - special_keys_pressed ^= SHIFT_PRESSED; - else if (event->scancode == KEY_LEFTALT || event->scancode == KEY_RIGHTALT) - special_keys_pressed ^= ALT_PRESSED; - else if (event->scancode == KEY_LEFTCTRL || event->scancode == KEY_RIGHTCTRL) - special_keys_pressed ^= CTRL_PRESSED; - - if (special_keys_pressed & SHIFT_PRESSED) - msg->ch = keymap->shift_map[event->scancode]; - else - msg->ch = keymap->map[event->scancode]; - - msg->press = event->press; - msg->scancode = event->scancode; - msg_send(focused->pid, WM_KEYBOARD, msg); + struct gui_event_mouse *msg = malloc(sizeof(*msg)); + msg->x = mouse_x - focused->x; + msg->y = mouse_y - focused->y; + msg->but1 = event->but1; + msg->but2 = event->but2; + msg->but3 = event->but3; + msg_send(focused->pid, GUI_MOUSE, msg); } // TODO: Clean this god-function @@ -224,7 +236,7 @@ int main(int argc, char **argv) } switch (msg->type) { - case WM_NEW_CONTEXT: + case GFX_NEW_CONTEXT: printf("New context for pid %d\n", msg->src); struct context *ctx = msg->data; int width = ctx->width ? ctx->width : 1000; @@ -237,9 +249,9 @@ int main(int argc, char **argv) if (!(ctx->flags & WF_RELATIVE)) focused = ctx; redraw_all(); - msg_send(msg->src, WM_NEW_CONTEXT, ctx); + msg_send(msg->src, GFX_NEW_CONTEXT, ctx); break; - case WM_REDRAW: + case GFX_REDRAW: redraw_all(); break; case EVENT_MOUSE: diff --git a/libgui/gui.c b/libgui/gui.c index 7ea341c..aa5c494 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -6,13 +6,15 @@ #include <gui.h> #include <list.h> #include <mem.h> +#include <print.h> +#include <sys.h> #define MAX_WINDOWS 10 u32 window_count = 0; static struct window windows[MAX_WINDOWS] = { 0 }; -struct window *new_window(const char *title, int x, int y, u32 width, u32 height, int flags) +static struct window *new_window(const char *title, int x, int y, u32 width, u32 height, int flags) { if (window_count + 1 >= MAX_WINDOWS) return NULL; @@ -37,9 +39,9 @@ struct window *new_window(const char *title, int x, int y, u32 width, u32 height return win; } -void merge_elements(struct element *container) +static void merge_elements(struct element *container) { - if (!container->childs || !container->childs->head) + if (!container || !container->childs || !container->childs->head) return; struct node *iterator = container->childs->head; @@ -52,8 +54,26 @@ void merge_elements(struct element *container) } } -struct element *gui_add_button(struct element *container, int x, int y, u32 width, u32 height, - const char *text, u32 color) +static struct element *element_at(struct element *container, int x, int y) +{ + if (!container || !container->childs || !container->childs->head) + return NULL; + + struct element *ret = NULL; + struct node *iterator = container->childs->head; + while (iterator != NULL) { + struct context *ctx = ((struct element *)iterator->data)->ctx; + if (ctx != container->ctx && ctx->flags & WF_RELATIVE && x >= ctx->x && + x <= ctx->x + (int)ctx->width && y >= ctx->y && y <= ctx->y + (int)ctx->height) + ret = iterator->data; + iterator = iterator->next; + } + + return ret; +} + +struct element_button *gui_add_button(struct element *container, int x, int y, u32 width, + u32 height, const char *text, u32 color) { if (!container || !container->childs) return NULL; @@ -76,7 +96,36 @@ struct element *gui_add_button(struct element *container, int x, int y, u32 widt list_add(container->childs, button); merge_elements(container); - return button; + return button->data; +} + +void gui_event_loop(struct element *container) +{ + if (!container) + return; + + struct message *msg; + while (1) { + if (!(msg = msg_receive())) { + yield(); + continue; + } + + switch (msg->type) { + case GUI_MOUSE: { + struct gui_event_mouse *event = msg->data; + struct element *elem = element_at(container, event->x, event->y); + if (!elem) + continue; + + if (elem->type == GUI_TYPE_BUTTON) { + struct element_button *button = elem->data; + if (event->but1 && button->on_click) + button->on_click(); + } + } + } + } } struct element *gui_init(const char *title, u32 width, u32 height) diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h index fe48ac2..2ce588c 100644 --- a/libgui/inc/gfx.h +++ b/libgui/inc/gfx.h @@ -39,7 +39,7 @@ #define WF_NO_RESIZE (1 << 2) #define WF_RELATIVE (1 << 3) -enum message_type { WM_NEW_CONTEXT = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD }; +enum message_type { GFX_NEW_CONTEXT = EVENT_MAX + 1, GFX_REDRAW }; // Generalized font struct struct font { @@ -61,12 +61,6 @@ struct context { int flags; }; -struct msg_keyboard { - char ch; - int press; - int scancode; -}; - void gfx_write_char(struct context *ctx, int x, int y, u32 c, char ch); void gfx_write(struct context *ctx, int x, int y, u32 c, char *text); void gfx_load_image(struct context *ctx, char *path, int x, int y); @@ -86,7 +80,7 @@ int gfx_font_width(); */ #define gfx_new_ctx(ctx) \ - (msg_send(2, WM_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data) -#define gfx_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization) + (msg_send(2, GFX_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data) +#define gfx_redraw() (msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization) #endif diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index ea1e40e..e7573f8 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -10,11 +10,14 @@ #define MAX_CHILDS 100 +// TODO: Improve event types (maybe as struct header) +enum window_event_type { GUI_KEYBOARD = 10, GUI_MOUSE, GUI_MAX }; enum element_type { GUI_TYPE_CONTAINER, GUI_TYPE_BUTTON, GUI_TYPE_TEXTBOX }; struct element_button { const char *text; u32 color; + void (*on_click)(); }; struct element_textbox { @@ -37,8 +40,23 @@ struct window { struct context *ctx; }; +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 element *gui_init(const char *title, u32 width, u32 height); -struct element *gui_add_button(struct element *container, int x, int y, u32 width, u32 height, - const char *text, u32 color); +void gui_event_loop(struct element *container); +struct element_button *gui_add_button(struct element *container, int x, int y, u32 width, + u32 height, const char *text, u32 color); #endif |