commit - bf59f0ed282f9c9b1ae0660e5af0ac86c0d247b5
commit + cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e
blob - f61392894d4cf635a5bb3cb13ca4c9fdd6b62ccd
blob + 71c7142d1c7a25267f2fcfaa4033c449811bf54e
--- src/cmd/devdraw/drawclient.c
+++ src/cmd/devdraw/drawclient.c
@@ -4,7 +4,7 @@
 #include <draw.h>
 #include <mouse.h>
 #include <cursor.h>
-#include <drawsrv.h>
+#include <drawfcall.h>
 
 typedef struct Cmd Cmd;
 struct Cmd {
@@ -29,7 +29,7 @@ startsrv(void)
 		close(p[0]);
 		dup(p[1], 0);
 		dup(p[1], 1);
-		execl("o.drawsrv", "o.drawsrv", "-D", nil);
+		execl("./o.devdraw", "o.devdraw", "-D", nil);
 		sysfatal("exec: %r");
 	}
 	close(p[1]);
@@ -47,7 +47,7 @@ fprint(2, "write %d to %d\n", n, fd);
 	n = readwsysmsg(fd, buf, sizeof buf);
 	nn = convM2W(buf, n, m);
 	assert(nn == n);
-	if(m->op == Rerror)
+	if(m->type == Rerror)
 		return -1;
 	return 0;
 }
@@ -58,10 +58,9 @@ cmdinit(int argc, char **argv)
 	Wsysmsg m;
 
 	memset(&m, 0, sizeof m);
-	m.op = Tinit;
+	m.type = Tinit;
 	m.winsize = "100x100";
 	m.label = "label";
-	m.font = "";
 	if(domsg(&m) < 0)
 		sysfatal("domsg");
 }
@@ -72,7 +71,7 @@ cmdmouse(int argc, char **argv)
 	Wsysmsg m;
 
 	memset(&m, 0, sizeof m);
-	m.op = Trdmouse;
+	m.type = Trdmouse;
 	if(domsg(&m) < 0)
 		sysfatal("domsg");
 	print("%c %d %d %d\n",
@@ -88,10 +87,10 @@ cmdkbd(int argc, char **argv)
 	Wsysmsg m;
 
 	memset(&m, 0, sizeof m);
-	m.op = Trdkbd;
+	m.type = Trdkbd;
 	if(domsg(&m) < 0)
 		sysfatal("domsg");
-	print("%s\n", m.runes);
+	print("%d\n", m.rune);
 }
 
 Cmd cmdtab[] = {
blob - 7f0c2a2031696ea5d3037e3af16b6114966fc8bf
blob + e60b427f32d4a7365b8c6097599478486aa0a963
--- src/cmd/devdraw/mkfile
+++ src/cmd/devdraw/mkfile
@@ -20,7 +20,7 @@ HFILES=\
 
 <$PLAN9/src/mkone
 
-$O.drawclient: drawclient.$O drawfcall.$O
+$O.drawclient: drawclient.$O
 	$LD -o $target $prereq
 
 $O.snarf: x11-alloc.$O x11-cload.$O x11-draw.$O x11-fill.$O x11-get.$O x11-init.$O x11-itrans.$O x11-keysym2ucs.$O x11-load.$O x11-pixelbits.$O x11-unload.$O x11-wsys.$O snarf.$O latin1.$O devdraw.$O