shithub: drawterm

Download patch

ref: 3e13a4a3faadf796d42f3e624a7d3ddd642fa22a
parent: 50dcc5c0f721600c26bfa8e237b6bb0c2530786a
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Thu Mar 17 18:01:24 EDT 2016

term: only call flushmemscreen() when we got the drawlock

--- a/kern/term.c	Thu Mar 17 15:01:00 2016
+++ b/kern/term.c	Thu Mar 17 18:01:24 2016
@@ -34,10 +34,8 @@
 static void
 screenflush(void)
 {
-	qlock(&drawlock);
 	flushmemscreen(flushr);
 	flushr = Rect(10000, 10000, -10000, -10000);
-	qunlock(&drawlock);
 }
 
 static void
@@ -115,7 +113,6 @@
 	memimagedraw(gscreen, r, gscreen, p, nil, p, S);
 	r = Rpt(Pt(window.min.x, window.max.y-o), window.max);
 	memimagedraw(gscreen, r, back, ZP, nil, ZP, S);
-	flushmemscreen(gscreen->r);
 	curpos.y -= o;
 }
 
@@ -133,8 +130,10 @@
 
 	switch(buf[0]) {
 	case '\n':
-		if(curpos.y+h >= window.max.y)
+		if(curpos.y+h >= window.max.y){
 			scroll();
+			flushr = window;
+		}
 		curpos.y += h;
 		screenputc("\r");
 		break;
@@ -181,27 +180,25 @@
 static void
 termscreenputs(char *s, int n)
 {
-	int i, locked;
-	Rune r;
-	char buf[4];
+	static char rb[UTFmax+1];
+	static int nrb;
+	int locked;
+	char *e;
 
 	lock(&screenlock);
 	locked = canqlock(&drawlock);
-	while(n > 0){
-		i = chartorune(&r, s);
-		if(i == 0){
-			s++;
-			--n;
-			continue;
+	e = s + n;
+	while(s < e){
+		rb[nrb++] = *s++;
+		if(nrb >= UTFmax || fullrune(rb, nrb)){
+			rb[nrb] = 0;
+			screenputc(rb);
+			nrb = 0;
 		}
-		memmove(buf, s, i);
-		buf[i] = 0;
-		n -= i;
-		s += i;
-		screenputc(buf);
 	}
-	if(locked)
+	if(locked){
+		screenflush();
 		qunlock(&drawlock);
-	screenflush();
+	}
 	unlock(&screenlock);
 }