diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/devdraw/drawclient.c | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/devdraw/drawclient.c')
| -rw-r--r-- | src/cmd/devdraw/drawclient.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/cmd/devdraw/drawclient.c b/src/cmd/devdraw/drawclient.c index 87df3f18..71c7142d 100644 --- a/src/cmd/devdraw/drawclient.c +++ b/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 { @@ -20,7 +20,7 @@ void startsrv(void) { int pid, p[2]; - + if(pipe(p) < 0) sysfatal("pipe"); if((pid=fork()) < 0) @@ -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; } @@ -56,12 +56,11 @@ void 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"); } @@ -70,9 +69,9 @@ void 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", @@ -86,12 +85,12 @@ void 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[] = { @@ -125,4 +124,3 @@ fprint(2, "%s...\n", p); } exits(0); } - |