--- ray/src/rt/devmain.c 1990/02/22 11:46:24 1.8 +++ ray/src/rt/devmain.c 1990/08/02 13:40:23 1.13 @@ -14,8 +14,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include -#include - #include "color.h" #include "driver.h" @@ -26,8 +24,6 @@ struct driver *dev = NULL; /* output device */ FILE *devin, *devout; /* communications channels */ -int notified = 0; /* notified parent of input? */ - char *progname; /* driver name */ int r_clear(), r_paintr(), r_getcur(), r_comout(), r_comin(), r_flush(); @@ -61,9 +57,7 @@ char *argv[]; if ((dev = dinit(argv[0], argv[3])) == NULL) quit(1); putw(COM_RECVM, devout); /* verify initialization */ - fwrite((char *)&dev->pixaspect, sizeof(dev->pixaspect), 1, devout); - putw(dev->xsiz, devout); - putw(dev->ysiz, devout); + sendstate(); fflush(devout); /* loop on requests */ while ((com = getc(devin)) != EOF) { @@ -105,11 +99,6 @@ r_paintr() /* paint a rectangle */ xmin = getw(devin); ymin = getw(devin); xmax = getw(devin); ymax = getw(devin); (*dev->paintr)(col, xmin, ymin, xmax, ymax); - /* check for input */ - if (!notified && dev->inpready > 0) { - notified = 1; - kill(getppid(), SIGIO); - } } @@ -117,6 +106,9 @@ r_flush() /* flush output */ { if (dev->flush != NULL) (*dev->flush)(); + putc(COM_FLUSH, devout); + sendstate(); + fflush(devout); } @@ -162,9 +154,8 @@ r_comin() /* read string from command line */ /* reply */ putc(COM_COMIN, devout); myputs(buf, devout); + sendstate(); fflush(devout); - /* reset notify */ - notified = 0; } @@ -194,15 +185,26 @@ register FILE *fp; stderr_v(s) /* put string to stderr */ register char *s; { - static int inline = 0; + static int midline = 0; - if (!inline++) { + if (!*s) + return; + if (!midline++) { fputs(progname, stderr); fputs(": ", stderr); } fputs(s, stderr); - if (*s && s[strlen(s)-1] == '\n') { + if (s[strlen(s)-1] == '\n') { fflush(stderr); - inline = 0; + midline = 0; } +} + + +sendstate() /* send driver state variables */ +{ + fwrite((char *)&dev->pixaspect, sizeof(dev->pixaspect), 1, devout); + putw(dev->xsiz, devout); + putw(dev->ysiz, devout); + putw(dev->inpready, devout); }