Added 'exec' demo program

7 files changed, 58 insertions, 19 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 3e4aaa0..99d60e9 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o wm.o mandelbrot.o window.o test.o
+COBJS = init.o wm.o mandelbrot.o window.o exec.o test.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/exec.c b/apps/exec.c
new file mode 100644
index 0000000..038d2ce
--- /dev/null
+++ b/apps/exec.c
@@ -0,0 +1,29 @@
+#include <gui.h>
+#include <print.h>
+#include <sys.h>
+
+#define HEIGHT 32
+#define WIDTH 300
+#define BORDER 2
+
+void on_submit(struct gui_event_keyboard *event, struct element *elem)
+{
+	(void)event;
+	char *inp = ((struct element_text_input *)elem->data)->text;
+	exec(inp, inp, NULL);
+}
+
+int main()
+{
+	struct element *root =
+		gui_init("Exec", WIDTH + BORDER * 2, HEIGHT + BORDER * 2, COLOR_BLACK);
+	struct element *input =
+		gui_add_text_input(root, BORDER, BORDER, WIDTH, FONT_32, COLOR_WHITE, COLOR_BLACK);
+
+	input->event.on_submit = on_submit;
+
+	gfx_redraw_focused(); // TODO: Remove once partial redrawing is finished
+	gui_event_loop(root);
+
+	return 0;
+}
diff --git a/apps/init.c b/apps/init.c
index 23f0773..73ea745 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -11,8 +11,7 @@ int main(int argc, char **argv)
 	/* printf("[%s loaded]\n", argv[0]); */
 
 	int wm = exec("/wm", "wm", argv[1], NULL);
-	int test = exec("/window", "test", NULL);
-	int mandelbrot = exec("/mandelbrot", "mandelbrot", NULL);
+	int exec = exec("/exec", "test", NULL);
 
-	return wm + mandelbrot + test;
+	return wm + exec;
 }
diff --git a/apps/window.c b/apps/window.c
index 9342009..4f2aec7 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -17,13 +17,14 @@ int main()
 {
 	/* print("[test context loaded]\n"); */
 
-	struct element *root = gui_init("test", 600, 400);
+	struct element *root = gui_init("test", 600, 400, COLOR_BG);
 	struct element *container =
 		gui_add_container(root, 0, 0, root->ctx->width / 2, root->ctx->height, 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, 200, FONT_24, COLOR_WHITE, COLOR_BLACK);
+	(void)text_input;
 
 	button->event.on_click = on_click;
 
diff --git a/apps/wm.c b/apps/wm.c
index b995efb..c0e1da2 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -226,14 +226,11 @@ int main(int argc, char **argv)
 	direct.fb = vbe.fb;
 	list_add(contexts, &root);
 
-	//gfx_fill(&direct, COLOR_BG);
-	//gfx_write(&direct, 0, 0, FONT_32, COLOR_FG, "Welcome to Melvix!");
-	//gfx_write(&direct, 0, 32, FONT_32, COLOR_FG, "Loading resources...");
-
+	/* gfx_write(&direct, 0, 0, FONT_32, COLOR_FG, "Welcome to Melvix!"); */
+	/* gfx_write(&direct, 0, 32, FONT_32, COLOR_FG, "Loading resources..."); */
 	gfx_fill(&root, COLOR_FG);
-	//gfx_border(&root, COLOR_FG, 2);
+	/* gfx_load_wallpaper(&root, "/res/wall.bmp"); */
 	gfx_load_image(&cursor, "/res/cursor.bmp", 0, 0);
-	//gfx_load_wallpaper(&root, "/res/wall.bmp");
 	redraw_all();
 
 	event_register(EVENT_MOUSE);
diff --git a/libgui/gui.c b/libgui/gui.c
index 399192f..675081e 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -2,9 +2,11 @@
 // Mostly GFX function wrappers
 // TODO: Reduce code duplication
 
+#include <assert.h>
 #include <def.h>
 #include <gfx.h>
 #include <gui.h>
+#include <input.h>
 #include <list.h>
 #include <mem.h>
 #include <print.h>
@@ -263,34 +265,45 @@ void gui_event_loop(struct element *container)
 			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->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 &&
-			    event->ch) {
+			    event->ch && event->ch >= ' ') {
 				char *s = ((struct element_text_input *)focused->data)->text;
 				u32 l = strlen(s);
+				if (l >= MAX_INPUT_LENGTH)
+					continue;
 				s[l] = event->ch;
 				s[l + 1] = '\0';
 				gui_sync_text_input(focused);
 				merge_elements(get_root(focused->window_id));
-				gfx_redraw_focused(); //  Only redraw window
+				gfx_redraw_focused();
 			}
 
-			if (focused && focused->event.on_key && event->ch) {
-				focused->event.on_key(event);
+			if (focused && focused->event.on_submit && event->press &&
+			    event->scancode == KEY_ENTER) {
+				focused->event.on_submit(event, focused);
+				// Clear!
+				((struct element_text_input *)focused->data)->text[0] = '\0';
+				gui_sync_text_input(focused);
+				merge_elements(get_root(focused->window_id));
+				gfx_redraw_focused();
 			}
 
+			if (focused && focused->event.on_key && event->press && event->ch)
+				focused->event.on_key(event, focused);
+
 			break;
 		}
 		}
 	}
 }
 
-struct element *gui_init(const char *title, u32 width, u32 height)
+struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg)
 {
 	if (window_count != 0)
 		return NULL;
@@ -300,7 +313,7 @@ struct element *gui_init(const char *title, u32 width, u32 height)
 	if (!win)
 		return NULL;
 
-	gfx_fill(win->ctx, COLOR_BG);
+	gfx_fill(win->ctx, color_bg);
 
 	struct element *container = malloc(sizeof(*container));
 	container->type = GUI_TYPE_ROOT;
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 3f74178..8ed8f4e 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -86,7 +86,7 @@ struct gui_event_mouse {
 	int but3;
 };
 
-struct element *gui_init(const char *title, u32 width, u32 height);
+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,
 			       char *text, u32 color_bg, u32 color_fg);