--- ray/src/rt/devmain.c	1989/11/01 16:12:22	1.3
+++ ray/src/rt/devmain.c	1990/02/22 11:46:24	1.8
@@ -22,8 +22,6 @@ 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 */
@@ -32,18 +30,15 @@ int	notified = 0;				/* notified parent of input? */
 
 char	*progname;				/* driver name */
 
-int	r_clear(), r_paintr(), r_getcur(), r_comout(), r_comin(), r_mycomin();
+int	r_clear(), r_paintr(), r_getcur(), r_comout(), r_comin(), r_flush();
 
 int	(*dev_func[NREQUESTS])() = {		/* request handlers */
 		r_clear, r_paintr,
-		r_getcur, r_comout, r_comin
+		r_getcur, r_comout,
+		r_comin, r_flush
 	};
 
-char	mybuf[512] = "";
 
-char	*mybufp();
-
-
 main(argc, argv)		/* set up communications and main loop */
 int	argc;
 char	*argv[];
@@ -66,6 +61,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);
 	fflush(devout);
@@ -105,8 +101,7 @@ r_paintr()				/* paint a rectangle */
 	COLOR	col;
 	int	xmin, ymin, xmax, ymax;
 
-	nrays += 5;			/* pretend */
-	fread(col, sizeof(COLOR), 1, devin);
+	fread((char *)col, sizeof(COLOR), 1, devin);
 	xmin = getw(devin); ymin = getw(devin);
 	xmax = getw(devin); ymax = getw(devin);
 	(*dev->paintr)(col, xmin, ymin, xmax, ymax);
@@ -118,6 +113,13 @@ r_paintr()				/* paint a rectangle */
 }
 
 
+r_flush()				/* flush output */
+{
+	if (dev->flush != NULL)
+		(*dev->flush)();
+}
+
+
 r_getcur()				/* get and return cursor position */
 {
 	int	c;
@@ -148,9 +150,15 @@ r_comout()				/* print string to command line */
 
 r_comin()				/* read string from command line */
 {
-	char	buf[256];
+	char	buf[256], *prompt;
+					/* get prompt */
+	if (getc(devin)) {
+		mygets(buf, devin);
+		prompt = buf;
+	} else
+		prompt = NULL;
 					/* get string */
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, prompt);
 					/* reply */
 	putc(COM_COMIN, devout);
 	myputs(buf, devout);
@@ -183,28 +191,6 @@ register FILE	*fp;
 }
 
 
-r_mycomin()				/* get command from my buffer */
-{
-	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 */
-}
-
-
 stderr_v(s)				/* put string to stderr */
 register char  *s;
 {
@@ -219,23 +205,4 @@ 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);
 }