064ea89caa
a deadlock has been observed with samterm (thanks burnzez), that shows the mouse ioproc being stuck in sending on the resize channel, while the mouse consumer is stuck in a readmouse() loop wanting a rectangle to be drawn by the user: recv(v=0x42df50)+0x28 /sys/src/libthread/channel.c:321 readmouse(mc=0x42df50)+0x54 /sys/src/libdraw/mouse.c:34 getrect(.ret=0x41bce0,but=0x4,mc=0x42df50)+0x62 /sys/src/libdraw/getrect.c:49 r=0x41bc70 rc=0x41bc70 getr(rp=0x41bce0)+0x24 /sys/src/cmd/samterm/main.c:244 p=0x6b000004f6 r=0x2 sweeptext(new=0x0,tag=0x2d)+0x12 /sys/src/cmd/samterm/menu.c:208 r=0x2 t=0x42df50 inmesg(type=0x2,count=0x2)+0x1ab /sys/src/cmd/samterm/mesg.c:136 m=0x10000002d l=0x2d00001b00 i=0x43829000000001 t=0x438290 lp=0x42e050 rcv()+0x7a /sys/src/cmd/samterm/mesg.c:77 threadmain(argv=0x7ffffeffef90)+0x173 /sys/src/cmd/samterm/main.c:63 so avoid blocking in the mouse ioproc by using nbsend() instead of send() for writing to the resize channel.
144 lines
2.5 KiB
C
144 lines
2.5 KiB
C
#include <u.h>
|
|
#include <libc.h>
|
|
#include <draw.h>
|
|
#include <thread.h>
|
|
#include <cursor.h>
|
|
#include <mouse.h>
|
|
|
|
void
|
|
moveto(Mousectl *m, Point pt)
|
|
{
|
|
fprint(m->mfd, "m%d %d", pt.x, pt.y);
|
|
m->xy = pt;
|
|
}
|
|
|
|
void
|
|
closemouse(Mousectl *mc)
|
|
{
|
|
if(mc == nil)
|
|
return;
|
|
close(mc->mfd);
|
|
close(mc->cfd);
|
|
mc->mfd = mc->cfd = -1;
|
|
threadint(mc->pid);
|
|
}
|
|
|
|
int
|
|
readmouse(Mousectl *mc)
|
|
{
|
|
if(mc->image){
|
|
Display *d = mc->image->display;
|
|
if(d->bufp > d->buf)
|
|
flushimage(d, 1);
|
|
}
|
|
if(recv(mc->c, &mc->Mouse) < 0){
|
|
fprint(2, "readmouse: %r\n");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static
|
|
void
|
|
_ioproc(void *arg)
|
|
{
|
|
int n, nerr, one;
|
|
char buf[1+5*12];
|
|
Mouse m;
|
|
Mousectl *mc;
|
|
|
|
mc = arg;
|
|
threadsetname("mouseproc");
|
|
memset(&m, 0, sizeof m);
|
|
nerr = 0;
|
|
while(mc->mfd >= 0){
|
|
n = read(mc->mfd, buf, sizeof buf);
|
|
if(n != 1+4*12){
|
|
yield(); /* if error is due to exiting, we'll exit here */
|
|
if(mc->mfd < 0)
|
|
break;
|
|
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]){
|
|
case 'r':
|
|
one = 1;
|
|
if(nbsend(mc->resizec, &one) < 0)
|
|
continue;
|
|
/* fall through */
|
|
case 'm':
|
|
m.xy.x = atoi(buf+1+0*12);
|
|
m.xy.y = atoi(buf+1+1*12);
|
|
m.buttons = atoi(buf+1+2*12);
|
|
m.msec = (ulong)atoll(buf+1+3*12);
|
|
if(send(mc->c, &m) < 0)
|
|
continue;
|
|
/*
|
|
* 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
|
|
* they want full synchrony.
|
|
*/
|
|
mc->Mouse = m;
|
|
break;
|
|
}
|
|
}
|
|
free(mc->file);
|
|
chanfree(mc->c);
|
|
chanfree(mc->resizec);
|
|
free(mc);
|
|
}
|
|
|
|
Mousectl*
|
|
initmouse(char *file, Image *i)
|
|
{
|
|
Mousectl *mc;
|
|
char *t, *sl;
|
|
|
|
mc = mallocz(sizeof(Mousectl), 1);
|
|
if(file == nil)
|
|
file = "/dev/mouse";
|
|
mc->file = strdup(file);
|
|
mc->mfd = open(file, ORDWR|OCEXEC);
|
|
if(mc->mfd < 0){
|
|
free(mc);
|
|
return nil;
|
|
}
|
|
t = malloc(strlen(file)+16);
|
|
if (t == nil) {
|
|
close(mc->mfd);
|
|
free(mc);
|
|
return nil;
|
|
}
|
|
strcpy(t, file);
|
|
sl = utfrrune(t, '/');
|
|
if(sl)
|
|
strcpy(sl, "/cursor");
|
|
else
|
|
strcpy(t, "/dev/cursor");
|
|
mc->cfd = open(t, ORDWR|OCEXEC);
|
|
free(t);
|
|
mc->image = i;
|
|
mc->c = chancreate(sizeof(Mouse), 0);
|
|
mc->resizec = chancreate(sizeof(int), 1);
|
|
mc->pid = proccreate(_ioproc, mc, 4096);
|
|
return mc;
|
|
}
|
|
|
|
void
|
|
setcursor(Mousectl *mc, Cursor *c)
|
|
{
|
|
char curs[2*4+2*2*16];
|
|
|
|
if(c == nil)
|
|
write(mc->cfd, curs, 0);
|
|
else{
|
|
BPLONG(curs+0*4, c->offset.x);
|
|
BPLONG(curs+1*4, c->offset.y);
|
|
memmove(curs+2*4, c->clr, 2*2*16);
|
|
write(mc->cfd, curs, sizeof curs);
|
|
}
|
|
}
|