ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/devcomm.c
(Generate patch)

Comparing ray/src/rt/devcomm.c (file contents):
Revision 1.8 by greg, Mon Jan 8 13:37:54 1990 UTC vs.
Revision 1.11 by greg, Tue Jan 30 11:37:36 1990 UTC

# Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10   *      10/5/88
11   */
12  
13 < #include <stdio.h>
13 > #include "standard.h"
14  
15   #include <signal.h>
16  
# Line 80 | Line 80 | char   *dname, *id;
80                  goto syserr;
81          if ((devin = fdopen(p2[0], "r")) == NULL)
82                  goto syserr;
83 <        bcopy(&comm_default, &comm_driver, sizeof(comm_driver));
83 >        copystruct(&comm_driver, &comm_default);
84                                                  /* verify & get resolution */
85          putw(COM_SENDM, devout);
86          fflush(devout);
87          if (getw(devin) != COM_RECVM)
88                  return(NULL);
89 +        fread((char *)&comm_driver.pixaspect,
90 +                        sizeof(comm_driver.pixaspect), 1, devin);
91          comm_driver.xsiz = getw(devin);
92          comm_driver.ysiz = getw(devin);
91 –        fread(comm_driver.pixaspect, sizeof(comm_driver.pixaspect), 1, devin);
93                                                  /* input handling */
94          signal(SIGIO, onsigio);
95                                                  /* set error vectors */
# Line 138 | Line 139 | int    xmin, ymin, xmax, ymax;
139          static long     lastflush = 0;  /* ray count at last flush */
140  
141          putc(COM_PAINTR, devout);
142 <        fwrite(col, sizeof(COLOR), 1, devout);
142 >        fwrite((char *)col, sizeof(COLOR), 1, devout);
143          putw(xmin, devout);
144          putw(ymin, devout);
145          putw(xmax, devout);
# Line 178 | Line 179 | char   *str;
179  
180  
181   static
182 < comm_comin(buf)                         /* read string from command line */
182 > comm_comin(buf, prompt)                 /* read string from command line */
183   char    *buf;
184 + char    *prompt;
185   {
186          putc(COM_COMIN, devout);
187 +        if (prompt == NULL)
188 +                putc(0, devout);
189 +        else {
190 +                putc(1, devout);
191 +                myputs(prompt, devout);
192 +        }
193          fflush(devout);
194          if (getc(devin) != COM_COMIN)
195                  reply_error("comin");

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)