o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: update drawclient test program to run again

Browse source
This commit is contained in:
Russ Cox 2020-01-08 22:49:36 -05:00
parent bf59f0ed28
commit cc3d97d52a
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cmd/devdraw/drawclient.c
View file

@ -4,7 +4,7 @@
#include <draw.h> #include <draw.h>
#include <mouse.h> #include <mouse.h>
#include <cursor.h> #include <cursor.h>
#include <drawsrv.h> #include <drawfcall.h>
typedef struct Cmd Cmd; typedef struct Cmd Cmd;
struct Cmd { struct Cmd {
@ -29,7 +29,7 @@ startsrv(void)
close(p[0]); close(p[0]);
dup(p[1], 0); dup(p[1], 0);
dup(p[1], 1); dup(p[1], 1);
execl("o.drawsrv", "o.drawsrv", "-D", nil); execl("./o.devdraw", "o.devdraw", "-D", nil);
sysfatal("exec: %r"); sysfatal("exec: %r");
} }
close(p[1]); close(p[1]);
@ -47,7 +47,7 @@ fprint(2, "write %d to %d\n", n, fd);
n = readwsysmsg(fd, buf, sizeof buf); n = readwsysmsg(fd, buf, sizeof buf);
nn = convM2W(buf, n, m); nn = convM2W(buf, n, m);
assert(nn == n); assert(nn == n);
if(m->op == Rerror) if(m->type == Rerror)
return -1; return -1;
return 0; return 0;
} }
@ -58,10 +58,9 @@ cmdinit(int argc, char **argv)
Wsysmsg m; Wsysmsg m;
memset(&m, 0, sizeof m); memset(&m, 0, sizeof m);
m.op = Tinit; m.type = Tinit;
m.winsize = "100x100"; m.winsize = "100x100";
m.label = "label"; m.label = "label";
m.font = "";
if(domsg(&m) < 0) if(domsg(&m) < 0)
sysfatal("domsg"); sysfatal("domsg");
} }
@ -72,7 +71,7 @@ cmdmouse(int argc, char **argv)
Wsysmsg m; Wsysmsg m;
memset(&m, 0, sizeof m); memset(&m, 0, sizeof m);
m.op = Trdmouse; m.type = Trdmouse;
if(domsg(&m) < 0) if(domsg(&m) < 0)
sysfatal("domsg"); sysfatal("domsg");
print("%c %d %d %d\n", print("%c %d %d %d\n",
@ -88,10 +87,10 @@ cmdkbd(int argc, char **argv)
Wsysmsg m; Wsysmsg m;
memset(&m, 0, sizeof m); memset(&m, 0, sizeof m);
m.op = Trdkbd; m.type = Trdkbd;
if(domsg(&m) < 0) if(domsg(&m) < 0)
sysfatal("domsg"); sysfatal("domsg");
print("%s\n", m.runes); print("%d\n", m.rune);
} }
Cmd cmdtab[] = { Cmd cmdtab[] = {

2
src/cmd/devdraw/mkfile
View file

@ -20,7 +20,7 @@ HFILES=\
<$PLAN9/src/mkone <$PLAN9/src/mkone
$O.drawclient: drawclient.$O drawfcall.$O $O.drawclient: drawclient.$O
$LD -o $target $prereq $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 $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