Begin implement terminal

1 files changed, 16 insertions, 116 deletions

diff --git a/src/sysbin/login/main.c b/src/sysbin/login/main.c
index 3c02a4b..5d8840b 100644
--- a/src/sysbin/login/main.c
+++ b/src/sysbin/login/main.c
@@ -3,132 +3,32 @@
 #include <user_region.h>
 #include <debug.h>
 
-#include <gip.h>
-#include <draw.h>
-#include <keyboard.h>
-
-typedef struct {
-	fb_info_t mode;
-	fd_t fd;
-	fb_t *fb;
-
-	uint32_t sv_features, cl_features;
-} loginc_t;
-
-void c_buffer_info(gip_handler_t *s, gip_msg_header *p, gip_buffer_info_msg *m);
-void c_key_down(gip_handler_t *s, gip_msg_header *p);
-void c_key_up(gip_handler_t *s, gip_msg_header *p);
-void c_unknown_msg(gip_handler_t *s, gip_msg_header *p);
-void c_fd_error(gip_handler_t *s);
-
-void c_async_initiate(gip_handler_t *s, gip_msg_header *p, void* msgdata, void* hdata);
-
-gip_handler_callbacks_t loginc_cb = {
-	.reset = 0,
-	.initiate = 0,
-	.ok = 0,
-	.failure = 0,
-	.enable_features = 0,
-	.disable_features = 0,
-	.query_mode = 0,
-	.set_mode = 0,
-	.buffer_info = c_buffer_info,
-	.mode_info = 0,
-	.buffer_damage = 0,
-	.key_down = c_key_down,
-	.key_up = c_key_up,
-	.unknown_msg = c_unknown_msg,
-	.fd_error = c_fd_error,
-};
-
-keyboard_t *kb;
+#include <syscall.h>
 
 int main(int argc, char **argv) {
 	dbg_print("[login] Starting up.\n");
 
-	kb = init_keyboard();
-
-	loginc_t loginc;
-	memset(&loginc, 0, sizeof(loginc));
-
-	gip_handler_t *h = new_gip_handler(&loginc_cb, &loginc);
-	ASSERT(h != 0);
-
-	h->mainloop_item.fd = 1;
-	mainloop_add_fd(&h->mainloop_item);
-
-	gip_msg_header reset_msg = { .code = GIPC_RESET, .arg = 0 };
-	gip_cmd(h, &reset_msg, 0, c_async_initiate, 0);
-
-	mainloop_run();
-
-	return 0;
-}
-
-void c_buffer_info(gip_handler_t *s, gip_msg_header *p, gip_buffer_info_msg *m) {
-	dbg_printf("[login] Got buffer info msg\n");
-
-	loginc_t *c = (loginc_t*)s->data;
-
-	if (c->fb != 0) {
-		g_delete_fb(c->fb);
-		c->fb = 0;
-	}
-	if (c->fd != 0) {
-		close(c->fd);
-		c->fd = 0;
+	// just launch a terminal
+	pid_t term_pid = new_proc();
+	if (term_pid == 0) {
+		PANIC("[login] Could not launch terminal");
 	}
 
-	c->fd = use_token(&m->tok);
-	if (c->fd != 0) {
-		memcpy(&c->mode, &m->geom, sizeof(fb_info_t));
-
-		dbg_printf("[login] Got buffer on FD %d, %dx%dx%d\n",
-			c->fd, c->mode.width, c->mode.height, c->mode.bpp);
-
-		c->fb = g_fb_from_file(c->fd, &m->geom);
-		if (c->fb != 0) {
-			color_t black = g_color_rgb(c->fb, 0, 0, 0);
-			color_t grey = g_color_rgb(c->fb, 128, 128, 128);
-			g_fillrect(c->fb, 0, 0, m->geom.width, m->geom.height, black);
-			g_fillrect(c->fb, 50, 50, 50, 50, grey);
+	bool ok;
 
-			font_t *f = g_load_font("default");
-			if (f != 0) {
-				g_write(c->fb, 50, 100, "Hello, world!", f, grey);
-				g_free_font(f);
-			} else {
-				dbg_printf("Could not load font 'default'\n");
-			}
-		} else {
-			dbg_printf("Could not open framebuffer file %d\n", c->fd);
-		}
+	ok = bind_fs(term_pid, "root", "root")
+			&& bind_fs(term_pid, "sys", "sys")
+			&& bind_fs(term_pid, "config", "config")
+			&& bind_fd(term_pid, 1, 1);
+	if (!ok) PANIC("[login] Could not bind to terminal process.");
 
-	}
-}
+	ok = proc_exec(term_pid, "sys:/bin/terminal.bin");
+	if (!ok) PANIC("[login] Could not run terminal.bin");
 
-void c_key_down(gip_handler_t *s, gip_msg_header *p) {
-	keyboard_press(kb, p->arg);
-}
+	proc_status_t s;
+	proc_wait(term_pid, true, &s);
 
-void c_key_up(gip_handler_t *s, gip_msg_header *p) {
-	key_t k = keyboard_release(kb, p->arg);
-	if (k.chr) dbg_printf("%c", k.chr);
-}
-
-void c_unknown_msg(gip_handler_t *s, gip_msg_header *p) {
-	// TODO
-}
-
-void c_fd_error(gip_handler_t *s) {
-	// TODO
-}
-
-void c_async_initiate(gip_handler_t *s, gip_msg_header *p, void* msgdata, void* hdata) {
-	loginc_t *c = (loginc_t*)s->data;
-	c->sv_features = p->arg;
-
-	dbg_printf("[login] Got initiate reply to reset request (features 0x%p).\n", c->sv_features);
+	return 0;
 }
 
 /* vim: set ts=4 sw=4 tw=0 noet :*/