xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libdraw: exit mouseproc() on read error instead of spinning

Browse source
This commit is contained in:
cinap_lenrek 2013-04-27 04:10:39 +02:00
parent 3f8c1dc2fa
commit a72a7c1cc2
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sys/src/libdraw/mouse.c
View file

@ -39,24 +39,30 @@ static
void void
_ioproc(void *arg) _ioproc(void *arg)
{ {
int n, one; int n, nerr, one;
char buf[1+5*12]; char buf[1+5*12];
Mouse m; Mouse m;
Mousectl *mc; Mousectl *mc;
mc = arg; mc = arg;
threadsetname("mouseproc"); threadsetname("mouseproc");
one = 1;
memset(&m, 0, sizeof m); memset(&m, 0, sizeof m);
loop: nerr = 0;
while(mc->mfd >= 0){ while(mc->mfd >= 0){
n = read(mc->mfd, buf, sizeof buf); n = read(mc->mfd, buf, sizeof buf);
if(n != 1+4*12) if(n != 1+4*12){
goto loop; yield(); /* if error is due to exiting, we'll exit here */
fprint(2, "mouse: bad count %d not 49: %r\n", n);
if(n<0 || ++nerr>10)
threadexits("read error");
continue;
}
nerr = 0;
switch(buf[0]){ switch(buf[0]){
case 'r': case 'r':
one = 1;
if(send(mc->resizec, &one) < 0) if(send(mc->resizec, &one) < 0)
goto loop; continue;
/* fall through */ /* fall through */
case 'm': case 'm':
m.xy.x = atoi(buf+1+0*12); m.xy.x = atoi(buf+1+0*12);
@ -64,7 +70,7 @@ loop:
m.buttons = atoi(buf+1+2*12); m.buttons = atoi(buf+1+2*12);
m.msec = atoi(buf+1+3*12); m.msec = atoi(buf+1+3*12);
if(send(mc->c, &m) < 0) if(send(mc->c, &m) < 0)
goto loop; continue;
/* /*
* mc->Mouse is updated after send so it doesn't have wrong value if we block during send. * mc->Mouse is updated after send so it doesn't have wrong value if we block during send.
* This means that programs should receive into mc->Mouse (see readmouse() above) if * This means that programs should receive into mc->Mouse (see readmouse() above) if