--- ray/src/rt/devmain.c 1989/10/25 15:37:42 1.1 +++ ray/src/rt/devmain.c 1989/11/01 16:12:22 1.3 @@ -22,6 +22,8 @@ static char SCCSid[] = "$SunId$ LBL"; int (*wrnvec)(), (*errvec)(), (*cmdvec)(); /* error vectors, unused */ +long nrays = 0; /* fake it */ + struct driver *dev = NULL; /* output device */ FILE *devin, *devout; /* communications channels */ @@ -30,14 +32,18 @@ int notified = 0; /* notified parent of input? */ char *progname; /* driver name */ -int r_clear(), r_paintr(), r_getcur(), r_comout(), r_comin(); +int r_clear(), r_paintr(), r_getcur(), r_comout(), r_comin(), r_mycomin(); int (*dev_func[NREQUESTS])() = { /* request handlers */ r_clear, r_paintr, r_getcur, r_comout, r_comin }; +char mybuf[512] = ""; +char *mybufp(); + + main(argc, argv) /* set up communications and main loop */ int argc; char *argv[]; @@ -57,10 +63,8 @@ char *argv[]; quit(1); } /* open device */ - if ((dev = dinit(argv[0], argv[3])) == NULL) { - stderr_v("initialization failure\n"); + if ((dev = dinit(argv[0], argv[3])) == NULL) quit(1); - } putw(COM_RECVM, devout); /* verify initialization */ putw(dev->xsiz, devout); putw(dev->ysiz, devout); @@ -101,14 +105,15 @@ r_paintr() /* paint a rectangle */ COLOR col; int xmin, ymin, xmax, ymax; + nrays += 5; /* pretend */ fread(col, sizeof(COLOR), 1, devin); xmin = getw(devin); ymin = getw(devin); xmax = getw(devin); ymax = getw(devin); (*dev->paintr)(col, xmin, ymin, xmax, ymax); /* check for input */ - if (dev->inpready > notified) { + if (!notified && dev->inpready > 0) { + notified = 1; kill(getppid(), SIGIO); - notified = dev->inpready; } } @@ -178,10 +183,25 @@ register FILE *fp; } -repaint(xmin, ymin, xmax, ymax) /* repaint section of display */ -int xmin, ymin, xmax, ymax; +r_mycomin() /* get command from my buffer */ { - stderr_v("repaint called!\n"); /* no can do! */ + register char *cp; + /* get next command */ + for (cp = mybuf; *cp != '\n'; cp++) + ; + *cp++ = '\0'; + (*dev->comout)(mybuf); /* echo my command */ + /* send it as reply */ + putc(COM_COMIN, devout); + myputs(mybuf, devout); + fflush(devout); + /* get next command */ + (*dev->comout)("\n"); + strcpy(mybuf, cp); + if (mybuf[0]) + kill(getppid(), SIGIO); /* signal more */ + else + dev_func[COM_COMIN] = r_comin; /* else reset */ } @@ -199,4 +219,23 @@ register char *s; fflush(stderr); inline = 0; } +} + + +char * +mybufp() /* return buffer for my command */ +{ + if (dev_func[COM_COMIN] != r_mycomin) { + dev_func[COM_COMIN] = r_mycomin; + kill(getppid(), SIGIO); + } + return(mybuf+strlen(mybuf)); +} + + +repaint(xmin, ymin, xmax, ymax) /* repaint section of display */ +int xmin, ymin, xmax, ymax; +{ + sprintf(mybufp(), "repaint %d %d %d %d\n", + xmin, ymin, xmax, ymax); }