shithub: mez

--- a/guitest.c

+++ b/guitest.c

@@ -10,9 +10,8 @@

 Mousectl *mc;

 Keyboardctl *kc;

-Image *cols[NCOL], *cmdcols[NCOL];

-char buf[8192];

-Rune lorem[8192];

+char buf[32000];

+Rune lorem[32000];

 enum

@@ -44,6 +43,17 @@

 	return p;

+void*

+erealloc(void *ptr, ulong size)

+{

+	void *p;

+	if((p = realloc(ptr, size)) == nil)

+		error("Out of memory");

+	setmalloctag(p, getcallerpc(&ptr));

+	return p;

+}

 uint

 lines(Rune *text)

@@ -57,59 +67,67 @@

 #define max(a, b) ((a)>(b)?(a):(b))

+#define min(a, b) ((a)<(b)?(a):(b))

-Rune*

-offset(Rune *origin, int line)

+void

+textdraw(Text *t)

-	int i;

-	Rune *r;

+	Rectangle scrpos;

-	r = origin;

-	for(i = 0; i < line; i++){

-		origin = runestrchr(r, L'\n');

-		if(origin == nil)

-			break;

-		r = origin+1;

+	draw(t->screen, t->screen->r, t->cols[BACK], nil, ZP);

+	draw(t->screen, t->scrollr, t->cols[BORD], nil, ZP);

+	scrpos = t->scrollr;

+	scrpos.min.y = t->scrollr.min.y+max(0, Dy(t->scrollr))*t->topline/t->nlines;

+	scrpos.max.y = scrpos.min.y+Dy(screen->r)*t->Frame.maxlines/t->nlines;

+	scrpos = insetrect(scrpos, 1);

+	draw(screen, scrpos, t->cols[BACK], nil, ZP);

+	frinsert(t, t->text + t->lines[t->topline], t->text + t->textlen, 0);

+	flushimage(display, 1);

+}

+void

+textaddline(Text *t, uint sol)

+{

+	if(t->nlines == t->cap){

+		t->cap *= 2;

+		t->lines = erealloc(t->lines, t->cap*sizeof(*t->lines));

-	return r;

+	t->lines[t->nlines++] = sol;

-Rectangle scrollr;

 void

-drawtext(Chan *chan, int resize, Image *screen)

+textinit(Text *t)

-	Rectangle scrollcur, bodyr;

+	Rune *rp;

+	uint sol;

-	scrollr = screen->r;

-	scrollr.max.x = screen->r.min.x + Scrollwid + 1;

+	t->scrollr = t->screen->r;

+	t->scrollr.max.x = t->screen->r.min.x + Scrollwid + 1;

-	bodyr.min.x = screen->r.min.x + Scrollwid + Scrollgap + Margin;

-	bodyr.min.y = screen->r.min.y;

-	bodyr.max = screen->r.max;

+	t->bodyr.min.x = t->screen->r.min.x + Scrollwid + Scrollgap + Margin;

+	t->bodyr.min.y = t->screen->r.min.y;

+	t->bodyr.max = t->screen->r.max;

-	if(resize){

-		frclear(chan, 0);

-		frinit(chan, bodyr, display->defaultfont, screen, cols);

-	}

+	t->cap = 1024;

+	t->lines = emallocz(t->cap*sizeof(*t->lines), 1);

+	t->nlines = sol = 0;

+	for(rp = t->text; *rp != L'\0'; rp++)

+		if(*rp == L'\n'){

+			textaddline(t, sol);

+			sol = rp + 1 - t->text;

+		}

+	t->topline = 0;

-	draw(screen, screen->r, cols[BACK], nil, ZP);

-	frinsert(chan, offset(chan->body, chan->curline), chan->body + chan->bodylen, 0);

-	draw(screen, scrollr, cols[BORD], nil, ZP);

-	scrollcur = scrollr;

-	scrollcur.min.y = screen->r.min.y + max(0, Dy(screen->r)*chan->curline/chan->totlines);

-	scrollcur.max.y = scrollcur.min.y+Dy(screen->r)*chan->maxlines/chan->totlines;

-	scrollcur = insetrect(scrollcur, 1);

-	draw(screen, scrollcur, cols[BACK], nil, ZP);

-	flushimage(display, 1);

+	frclear(t, 0);

+	frinit(t, t->bodyr, display->defaultfont, t->screen, t->cols);

 void

-setcurline(int y, Chan *chan)

+texttopline(Text *t, int y)

-	chan->curline = (y-scrollr.min.y)*chan->totlines/Dy(scrollr);

+	t->topline = min(t->nlines-1, max(0, y-t->scrollr.min.y)*t->nlines/Dy(t->scrollr));

 void

@@ -120,13 +138,12 @@

 	Chan *chan;

 	char *s, *wsys;

 	int len, fd;

-	Screen *_screennicks;

-	Image *screennicks;

 	len = readn(0, buf, sizeof(buf));

 	buf[len] = '\0';

 	for(s = buf, rs = lorem; *s != '\0'; s+=len, rs++)

 		len = chartorune(rs, s);

+	*rs = L'\0';

 	if(initdraw(nil, nil, "guitest") < 0)

 		sysfatal("initdraw: %r");

@@ -134,16 +151,19 @@

 		sysfatal("initmouse failed: %r");

 	if((kc = initkeyboard(nil)) == nil)

 		sysfatal("initmouse failed: %r");

-	cols[BACK] = allocimagemix(display, DPurpleblue, DWhite);

-	cols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);

-	cols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue);

-	cols[TEXT] = display->black;

-	cols[HTEXT] = display->black;

 	chan = emallocz(sizeof(*chan), 1);

-	chan->body = lorem;

-	chan->bodylen = runestrlen(chan->body);

-	chan->totlines = lines(chan->body);

+	chan->body.text = lorem;

+	chan->body.textlen = runestrlen(chan->body.text);

+	chan->body.cols[BACK] = allocimagemix(display, DPurpleblue, DWhite);

+	chan->body.cols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);

+	chan->body.cols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue);

+	chan->body.cols[TEXT] = display->black;

+	chan->body.cols[HTEXT] = display->black;

+	chan->body.screen = screen;

+	textinit(&chan->body);

 	if((wsys = getenv("wsys")) == nil)

 		sysfatal("cannot find $wsys: %r");

 	if((fd = open(wsys, ORDWR)) < 0)

@@ -150,9 +170,7 @@

 		sysfatal("cannot open $wsys: %r");

 	if(mount(fd, -1, "/mnt/wsysnicks", MREPL, "new") < 0)

 		sysfatal("cannot create new window: %r");

-	screennicks = nil;

-	_screennicks = nil;

-	if(gengetwindow(display, "/mnt/wsysnicks/winname", &screennicks, &_screennicks, Refnone) < 0)

+	if(gengetwindow(display, "/mnt/wsysnicks/winname", &chan->nicks.screen, &chan->nicks._screen, Refnone) < 0)

 		sysfatal("cannot get window: %r");

 	Alt a[NCHAN+1] = {

@@ -161,8 +179,8 @@

 		[KEYBD] = {kc->c, &r, CHANRCV},

 		[NCHAN] = {nil, nil, CHANEND},

};

-	drawtext(chan, 1, screen);

-	draw(screennicks, screennicks->r, cols[BACK], nil, ZP);

+	textdraw(&chan->body);

+	draw(chan->nicks.screen, chan->nicks.screen->r, chan->body.cols[HIGH], nil, ZP);

 	flushimage(display, 1);

 	for(;;)switch(alt(a)){

 	default:

@@ -172,11 +190,11 @@

 			goto end;

 		break;

 	case MOUSE:

-		if(!ptinrect(m.xy, scrollr))

+		if(!ptinrect(m.xy, chan->body.scrollr))

 			break;

 		while(m.buttons == 2){

-			setcurline(m.xy.y, chan);

-			drawtext(chan, 0, screen);

+			texttopline(&chan->body, m.xy.y);

+			textdraw(&chan->body);

 			readmouse(mc);

 			m = *mc;

@@ -184,7 +202,8 @@

 	case RESIZE:

 		if(getwindow(display, Refnone) < 0)

 			sysfatal("%s: %r", argv0);

-		drawtext(chan, 1, screen);

+		textinit(&chan->body);

+		textdraw(&chan->body);

 		break;

 end:

--- a/mez.c

+++ b/mez.c

@@ -154,8 +154,8 @@

 	if(up == nil)

 		error("could not get a password");

 	app.passwd = up->passwd;

-	fd = connect(&app, -1);

-	for(int i = 0; i < 100; i++){

+	fd = connect(&app, 3);

+	for(int i = 0; i < 10000; i++){

 		print(rmsg(fd));

 	free(up);

--- a/mez.h

+++ b/mez.h

@@ -1,16 +1,24 @@

 typedef struct App App;

-typedef struct Net Net;

 typedef struct Chan Chan;

+typedef struct Net Net;

+typedef struct Text Text;

 struct App {

 	char *host, *user, *passwd;

};

-struct Chan {

+struct Text {

 	Frame;

-	Rune *body, *nicks, *topic;

-	int bodylen, curline, totlines;

-	Rectangle scrollr;

+	Rune *text;

+	uint textlen, topline, nlines, cap, *lines;

+	Rectangle scrollr, bodyr;

+	Image *screen, *cols[NCOL];

+	Screen *_screen;

+};

+struct Chan {

+	Text body, nicks;

+	Rune *topic;

};

 struct Net {