4 files changed, 18 insertions, 3 deletions
diff --git a/src/libdraw/drawclient.c b/src/libdraw/drawclient.c
index 9376f9c0..c38f4801 100644
--- a/src/libdraw/drawclient.c
+++ b/src/libdraw/drawclient.c
@@ -333,7 +333,7 @@ _displayrdkbd(Display *d, Rune *r)
 {
 	Wsysmsg tx, rx;
 
-	tx.type = Trdkbd;
+	tx.type = Trdkbd4;
 	if(displayrpc(d, &tx, &rx, nil) < 0)
 		return -1;
 	*r = rx.rune;
diff --git a/src/libdraw/drawfcall.c b/src/libdraw/drawfcall.c
index eea14095..94115384 100644
--- a/src/libdraw/drawfcall.c
+++ b/src/libdraw/drawfcall.c
@@ -50,6 +50,7 @@ sizeW2M(Wsysmsg *m)
 	case Rcursor:
 	case Rcursor2:
 	case Trdkbd:
+	case Trdkbd4:
 	case Rlabel:
 	case Rctxt:
 	case Rinit:
@@ -73,6 +74,8 @@ sizeW2M(Wsysmsg *m)
 		return 4+1+1+_stringsize(m->error);
 	case Rrdkbd:
 		return 4+1+1+2;
+	case Rrdkbd4:
+		return 4+1+1+4;
 	case Tlabel:
 		return 4+1+1+_stringsize(m->label);
 	case Tctxt:
@@ -117,6 +120,7 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
 	case Rcursor:
 	case Rcursor2:
 	case Trdkbd:
+	case Trdkbd4:
 	case Rlabel:
 	case Rctxt:
 	case Rinit:
@@ -166,6 +170,9 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
 	case Rrdkbd:
 		PUT2(p+6, m->rune);
 		break;
+	case Rrdkbd4:
+		PUT(p+6, m->rune);
+		break;
 	case Tlabel:
 		PUTSTRING(p+6, m->label);
 		break;
@@ -221,6 +228,7 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
 	case Rcursor:
 	case Rcursor2:
 	case Trdkbd:
+	case Trdkbd4:
 	case Rlabel:
 	case Rctxt:
 	case Rinit:
@@ -270,6 +278,9 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
 	case Rrdkbd:
 		GET2(p+6, m->rune);
 		break;
+	case Rrdkbd4:
+		GET(p+6, m->rune);
+		break;
 	case Tlabel:
 		GETSTRING(p+6, &m->label);
 		break;
@@ -360,6 +371,10 @@ drawfcallfmt(Fmt *fmt)
 		return fmtprint(fmt, "Trdkbd");
 	case Rrdkbd:
 		return fmtprint(fmt, "Rrdkbd rune=%C", m->rune);
+	case Trdkbd4:
+		return fmtprint(fmt, "Trdkbd4");
+	case Rrdkbd4:
+		return fmtprint(fmt, "Rrdkbd4 rune=%C", m->rune);
 	case Tlabel:
 		return fmtprint(fmt, "Tlabel label='%s'", m->label);
 	case Rlabel:
diff --git a/src/libdraw/event.c b/src/libdraw/event.c
index 9d7e10c2..e2d5f707 100644
--- a/src/libdraw/event.c
+++ b/src/libdraw/event.c
@@ -284,7 +284,7 @@ extract(int canblock)
 			}
 		}else if(i == Skeyboard){
 			if(eslave[i].rpc == nil)
-				eslave[i].rpc = startrpc(Trdkbd);
+				eslave[i].rpc = startrpc(Trdkbd4);
 			if(eslave[i].rpc){
 				/* if ready, don't block in select */
 				if(eslave[i].rpc->p)
diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c
index 9312eb43..8714a8c7 100644
--- a/src/libdraw/openfont.c
+++ b/src/libdraw/openfont.c
@@ -69,7 +69,7 @@ openfont1(Display *d, char *name)
 		n = _drawflength(fd);
 	if(fd < 0 && strncmp(fname, "/mnt/font/", 10) == 0) {
 		fd = _fontpipe(fname+10);
-		n = 128*1024;
+		n = 1024*1024;
 	}
 	if(fd < 0){
 		free(nambuf);