4 files changed, 9 insertions, 114 deletions

diff --git a/src/user/app/vterm/draw.c b/src/user/app/vterm/draw.c
index 1a40ede..50c56ed 100644
--- a/src/user/app/vterm/draw.c
+++ b/src/user/app/vterm/draw.c
@@ -4,66 +4,8 @@
 #include <string.h>
 
 struct framebuf fb;
-handle_t fb_fd;
 struct rect dirty;
 
-
-void dirty_mark(uint32_t x, uint32_t y) {
-	if (dirty.x1 > x) dirty.x1 = x;
-	if (dirty.x2 < x) dirty.x2 = x;
-	if (dirty.y1 > y) dirty.y1 = y;
-	if (dirty.y2 < y) dirty.y2 = y;
-}
-
-static void flush_combined(struct rect pix) {
-	size_t low  = fb.pitch * pix.y1 + 4 * pix.x1;
-	size_t high = fb.pitch * pix.y2 + 4 * pix.y2 + 4;
-
-	_syscall_write(fb_fd, fb.b + low, high - low, low, 0);
-}
-
-static void flush_split(struct rect pix) {
-	static uint64_t execbuf[EXECBUF_MAX_LEN / sizeof(uint64_t)];
-	if (7 * (pix.y2 - pix.y1) * sizeof(uint64_t) >= sizeof execbuf) {
-		flush_combined(pix);
-		return;
-	}
-
-	size_t epos = 0;
-	for (uint32_t y = pix.y1; y < pix.y2; y++) {
-		size_t low  = fb.pitch * y + 4 * pix.x1;
-		size_t high = fb.pitch * y + 4 * pix.x2 + 4;
-
-		execbuf[epos++] = EXECBUF_SYSCALL;
-		execbuf[epos++] = _SYSCALL_WRITE;
-		execbuf[epos++] = fb_fd;
-		execbuf[epos++] = fb.b + low;
-		execbuf[epos++] = high - low;
-		execbuf[epos++] = low;
-		execbuf[epos++] = 0;
-	}
-	_syscall_execbuf(execbuf, epos * sizeof(uint64_t));
-}
-
-void flush(void) {
-	if (~dirty.x1 == 0) return;
-
-	struct rect pix;
-	pix.x1 = dirty.x1 * font.w;
-	pix.x2 = dirty.x2 * font.w + font.w - 1;
-	pix.y1 = dirty.y1 * font.h;
-	pix.y2 = dirty.y2 * font.h + font.h - 1;
-	if (pix.x2 >= fb.width)  pix.x2 = fb.width - 1;
-	if (pix.y2 >= fb.height) pix.y2 = fb.height - 1;
-
-	/* the threshold is mostly arbitrary, wasn't based on any real benchmarks */
-	if (pix.x2 - pix.x1 > fb.width - 600) flush_combined(pix);
-	else flush_split(pix);
-
-	dirty.x1 = ~0; dirty.y1 = ~0;
-	dirty.x2 =  0; dirty.y2 =  0;
-}
-
 void scroll(void) {
 	// TODO memmove. this is UD
 	size_t row_len = fb.pitch * font.h;
diff --git a/src/user/app/vterm/font.c b/src/user/app/vterm/font.c
index 368d534..e4f124f 100644
--- a/src/user/app/vterm/font.c
+++ b/src/user/app/vterm/font.c
@@ -53,7 +53,8 @@ void font_blit(uint32_t glyph, int x, int y) {
 		return;
 	}
 
-	dirty_mark(x, y);
+	dirty_mark(&dirty, x * font.w, y * font.h);
+	dirty_mark(&dirty, (x+1) * font.w - 1, (y+1) * font.h - 1);
 
 	char *bitmap = font_data + font.glyph_size * glyph;
 	for (size_t i = 0; i < font.w; i++) {
diff --git a/src/user/app/vterm/vterm.c b/src/user/app/vterm/vterm.c
index 50a7b98..7ae24c2 100644
--- a/src/user/app/vterm/vterm.c
+++ b/src/user/app/vterm/vterm.c
@@ -29,50 +29,11 @@ void in_char(char c) {
 	while ((cursor.y + 1) * font.h >= fb.height) scroll();
 }
 
-int main();
-
-void fb_setup(void) {
-	#define BASEPATH "/kdev/video/"
-	char path[64], *spec;
-	size_t pos;
-	FILE *f;
-
-	f = fopen(BASEPATH, "r");
-	if (!f) {
-		eprintf("couldn't open %s", BASEPATH);
-		exit(1);
-	}
-
-	pos = strlen(BASEPATH);
-	memcpy(path, BASEPATH, pos);
-	spec = path + pos;
-	fread(spec, 1, sizeof(path) - pos, f);
-	/* assumes the read went correctly */
-	fclose(f);
-
-	fb_fd = _syscall_open(path, strlen(path), 0);
-	if (fb_fd < 0) {
-		eprintf("failed to open %s", path);
-		exit(1);
-	}
-
-	fb.width  = strtol(spec, &spec, 0);
-	if (*spec++ != 'x') { eprintf("bad filename format"); exit(1); }
-	fb.height = strtol(spec, &spec, 0);
-	if (*spec++ != 'x') { eprintf("bad filename format"); exit(1); }
-	fb.bpp = strtol(spec, &spec, 0);
-	fb.len = _syscall_getsize(fb_fd);
-	fb.pitch = fb.len / fb.height;
-	fb.b = malloc(fb.len);
-
-	if (fb.bpp != 32) {
-		eprintf("unsupported format %ux%ux%u", fb.width, fb.height, fb.bpp);
-		exit(1);
-	}
-}
-
 int main(void) {
-	fb_setup();
+	if (fb_setup(&fb, "/kdev/video/") < 0) {
+		eprintf("fb_setup error");
+		return 1;
+	}
 	font_load("/init/font.psf");
 
 	static char buf[512];
@@ -90,7 +51,7 @@ int main(void) {
 				} else {
 					for (size_t i = 0; i < res.len; i++)
 						in_char(buf[i]);
-					flush();
+					dirty_flush(&dirty, &fb);
 					_syscall_fs_respond(NULL, res.len, 0);
 				}
 				break;
diff --git a/src/user/app/vterm/vterm.h b/src/user/app/vterm/vterm.h
index 5cfc609..b006ede 100644
--- a/src/user/app/vterm/vterm.h
+++ b/src/user/app/vterm/vterm.h
@@ -2,6 +2,7 @@
 #include <camellia/types.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <user/lib/draw/draw.h>
 
 #define eprintf(fmt, ...) fprintf(stderr, "vterm: "fmt"\n" __VA_OPT__(,) __VA_ARGS__)
 
@@ -21,20 +22,10 @@ extern void *font_data;
 void font_load(const char *path);
 void font_blit(uint32_t glyph, int x, int y);
 
-
-struct framebuf {
-	size_t len, width, height, pitch;
-	uint8_t bpp;
-	char *b;
-};
 extern struct framebuf fb;
-extern handle_t fb_fd;
 
-struct rect {
-	uint32_t x1, y1, x2, y2;
-};
 extern struct rect dirty;
-void dirty_mark(uint32_t x, uint32_t y);
+void vdirty_mark(uint32_t x, uint32_t y);
 void flush(void);
 void scroll(void);