HTTP and browser stuff

6 files changed, 86 insertions, 21 deletions

diff --git a/apps/browser.c b/apps/browser.c
index 68a61c1..de8481c 100644
--- a/apps/browser.c
+++ b/apps/browser.c
@@ -11,18 +11,9 @@
 #include <str.h>
 
 static struct element *root;
+static struct element *code_label;
 static struct element *output;
 
-char *http_get(char *url)
-{
-	char *query = malloc(27 + strlen(url)); // TODO: Dynamic http length etc
-	query[0] = '\0';
-	strcat(query, "GET / HTTP/1.1\r\nHost: ");
-	strcat(query, url);
-	strcat(query, "\r\n\r\n");
-	return query;
-}
-
 // Temporary: Will be moved to libnet
 char **dns_split(char *url, char **buf)
 {
@@ -39,30 +30,43 @@ void on_submit(void *event, struct element *box)
 {
 	(void)event;
 	char *url = ((struct element_text_input *)box->data)->text;
-	char *query = http_get(url);
+
+	char *path = strchr(url, '/');
+	if (path) {
+		path[0] = '\0';
+		path++;
+	}
+	char *query = http_query_get(url, path ? path : "/");
+
 	char *dns[2];
 	dns_split(url, dns);
 	struct element_text_box *l = output->data;
+	struct element_label *c = code_label->data;
 
 	struct socket *socket = net_open(S_TCP);
 	if (socket && net_connect(socket, dns_request(dns[0], dns[1]), 80)) {
 		net_send(socket, query, strlen(query));
-		u8 buf[4096] = { 0 };
+		char buf[4096] = { 0 };
 		net_receive(socket, buf, 4096);
-		l->text = (char *)buf;
-		gui_sync(root, output);
+		l->text = http_data(buf);
+		c->text = http_code(buf);
 	} else {
-		print("Couldn't connect!\n");
+		l->text = strdup("Can't connect to server.");
+		c->text = strdup("000");
 	}
+	gui_sync(root, output);
+	gui_sync(root, code_label);
 	/* net_close(socket); */ // TODO: Fix net close before FIN/ACK got ACK'ed
 }
 
 int main()
 {
-	root = gui_init("browser", 600, 400, COLOR_BG);
+	// TODO: Dynamic element positioning
+	root = gui_init("browser", 640, 400, COLOR_BG);
+	code_label = gui_add_label(root, 2, 2, FONT_24, "000", COLOR_WHITE, COLOR_BLACK);
 	struct element *text_input =
-		gui_add_text_input(root, 10, 10, 580, FONT_24, COLOR_WHITE, COLOR_BLACK);
-	output = gui_add_text_box(root, 10, 50, 580, 340, FONT_24, "Enter URL and press Enter :)",
+		gui_add_text_input(root, 40, 2, 598, FONT_24, COLOR_WHITE, COLOR_BLACK);
+	output = gui_add_text_box(root, 2, 28, 636, 370, FONT_16, "Enter URL and press Enter :)",
 				  COLOR_WHITE, COLOR_BLACK);
 
 	text_input->event.on_submit = on_submit;
diff --git a/libgui/gfx.c b/libgui/gfx.c
index 74f0138..066ab81 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -108,13 +108,20 @@ void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32
 	u32 cnt = 0;
 	for (u32 i = 0; i < strlen(text); i++) {
 		// TODO: Should this be here?
-		if (text[i] == '\n') {
+		if (text[i] == '\r') {
+			cnt = 0;
+		} else if (text[i] == '\n') {
 			cnt = 0;
 			y += font->height;
 		} else {
+			// TODO: Overflow on single line input
+			if ((cnt + 1) * font->width > ctx->width) {
+				cnt = 0;
+				y += font->height;
+			}
 			write_char(ctx, x + cnt * font->width, y, font, c, text[i]);
+			cnt++;
 		}
-		cnt++;
 	}
 	/* gfx_redraw(); */
 }
diff --git a/libnet/Makefile b/libnet/Makefile
index 507a564..95baa33 100644
--- a/libnet/Makefile
+++ b/libnet/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = dns.o
+COBJS = dns.o http.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
diff --git a/libnet/http.c b/libnet/http.c
new file mode 100644
index 0000000..b1febbc
--- /dev/null
+++ b/libnet/http.c
@@ -0,0 +1,43 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <def.h>
+#include <mem.h>
+#include <print.h>
+#include <str.h>
+
+char *http_data(char *r)
+{
+	char *h = NULL;
+	for (u32 i = 0; i < strlen(r); ++i) {
+		if (r[i] == '\r' && r[i + 1] == '\n' && r[i + 2] == '\r' && r[i + 3] == '\n') {
+			h = &r[i + 4];
+			break;
+		}
+	}
+	return h;
+}
+
+char *http_code(char *r)
+{
+	char *code = malloc(4);
+	char tmp = r[12];
+	r[12] = '\0';
+	memcpy(code, r + 9, 3);
+	code[3] = '\0';
+	r[12] = tmp;
+	return code;
+}
+
+char *http_query_get(const char *url, const char *path)
+{
+	char *query = malloc(27 + strlen(url)); // TODO: Dynamic http length etc
+	query[0] = '\0';
+	strcat(query, "GET ");
+	if (path[0] != '/')
+		strcat(query, "/");
+	strcat(query, path);
+	strcat(query, " HTTP/1.1\r\nHost: ");
+	strcat(query, url);
+	strcat(query, "\r\n\r\n");
+	return query;
+}
diff --git a/libnet/inc/http.h b/libnet/inc/http.h
new file mode 100644
index 0000000..30de9ba
--- /dev/null
+++ b/libnet/inc/http.h
@@ -0,0 +1,10 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef HTTP_H
+#define HTTP_H
+
+char *http_data(char *response);
+char *http_query_get(const char *url, const char *path);
+char *http_code(char *r);
+
+#endif
diff --git a/libnet/inc/net.h b/libnet/inc/net.h
index fa4284c..6ff9619 100644
--- a/libnet/inc/net.h
+++ b/libnet/inc/net.h
@@ -3,6 +3,7 @@
 #ifndef NET_H
 #define NET_H
 
+#include <http.h>
 #include <socket.h>
 #include <sys.h>