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

Comparing ray/src/rt/aed.c (file contents):
Revision 1.6 by greg, Mon Jan 8 15:15:15 1990 UTC vs.
Revision 2.5 by schorsch, Wed Aug 20 10:00:09 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1987 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  aed.c - driver for AED 512 terminal.
9 *
10 *     2/2/87
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  <stdio.h>
11  
12 + #include  "rterror.h"
13 + #include  "color.h"
14   #include  "driver.h"
15  
17 #include  "color.h"
16  
19
17          /* AED command characters */
18  
19   #define AEDFMT  "1888N" /* Format string to send to AED */
# Line 56 | Line 53 | static char SCCSid[] = "$SunId$ LBL";
53   #define  COMHT          16              /* height of command line */
54   #define  COMCW          63              /* maximum chars on command line */
55  
56 < int  aed_close(), aed_clear(), aed_paintr(),
57 <                aed_getcur(), aed_comout(), aed_errout();
56 > static void  aed_close(void);
57 > static void aed_errout(char*);
58 > static void longwait(int t);
59 > static void aedgetcap(int  *xp, int *yp);
60 > static void aedsetcap(int  x, int y);
61 > static void anewcolr(int  index, int  r,int g,int b);
62 > static void aed_paintr(COLOR  col, int  xmin, int ymin, int xmax, int ymax);
63 > static void aedcoord(int  x, int y);
64 > static void aed_comout(char  *out);
65 > static int aed_getcur(int  *xp, int *yp);
66 > static aed_clear(int  x, int y);
67  
68   static struct driver  aed_driver = {
69          aed_close, aed_clear, aed_paintr, aed_getcur,
70 <        aed_comout, NULL,
70 >        aed_comout, NULL, NULL,
71          1.0, NCOLS, NROWS
72   };
73  
# Line 71 | Line 77 | aed_init(name, id)                     /* open AED */
77   char  *name, *id;
78   {
79          if (ttyset(&aed_driver, fileno(stdin)) < 0) {   /* set tty driver */
80 <                stderr_v("cannot access terminal\n");
80 >                eputs("cannot access terminal\n");
81                  return(NULL);
82          }
83          command(RST);                                   /* reset AED */
# Line 87 | Line 93 | char  *name, *id;
93          command(SCP);
94          byte('+'); byte(0); byte(1);
95          make_gmap(GAMMA);                               /* make color map */
96 <        errvec = aed_errout;                            /* set error vector */
97 <        cmdvec = aed_errout;
98 <        if (wrnvec != NULL)
99 <                wrnvec = aed_errout;
96 >        erract[USER].pf =                               /* set error vector */
97 >        erract[SYSTEM].pf =
98 >        erract[INTERNAL].pf =
99 >        erract[CONSISTENCY].pf = aed_errout;
100 >        erract[COMMAND].pf = aed_errout;
101 >        if (erract[WARNING].pf != NULL)
102 >                erract[WARNING].pf = aed_errout;
103          return(&aed_driver);
104   }
105  
106  
107 < static
108 < aed_close()                                     /* close AED */
107 > static void
108 > aed_close(void)                                 /* close AED */
109   {
110 <        errvec = stderr_v;                      /* reset error vector */
111 <        cmdvec = NULL;
112 <        if (wrnvec != NULL)
113 <                wrnvec = stderr_v;
110 >        erract[USER].pf =                       /* reset error vector */
111 >        erract[SYSTEM].pf =
112 >        erract[INTERNAL].pf =
113 >        erract[CONSISTENCY].pf = eputs;
114 >        erract[COMMAND].pf = NULL;
115 >        if (erract[WARNING].pf != NULL)
116 >                erract[WARNING].pf = wputs;
117          aedsetcap(0, 0);                        /* go to bottom */
118          command(SEC);
119          byte(WHT);                              /* white text */
# Line 122 | Line 134 | int  x, y;
134   }
135  
136  
137 < static
137 > static void
138   aed_paintr(col, xmin, ymin, xmax, ymax)         /* paint a rectangle */
139   COLOR  col;
140   int  xmin, ymin, xmax, ymax;
141   {
130        extern int  anewcolr();
142          int  ndx;
143  
144          ndx = get_pixel(col, anewcolr);         /* calls anewcolr() */
# Line 155 | Line 166 | int  *xp, *yp;
166   }
167  
168  
169 < static
169 > static void
170   aed_comout(out)                         /* output to command line */
171   register char  *out;
172   {
# Line 198 | Line 209 | register char  *out;
209   }
210  
211  
212 < static
212 > static void
213   aed_errout(msg)                         /* print an error message */
214   char  *msg;
215   {
# Line 212 | Line 223 | char  *msg;
223   * aedsetcap - sets AED's current access pointer to (x, y).
224   */
225  
226 < static
226 > static void
227   aedsetcap(x, y)
228   register int  x, y;
229   {
# Line 224 | Line 235 | register int  x, y;
235   * aedcoord - puts out an (x, y) coordinate in AED 8 bit format.
236   */
237  
238 < static
238 > static void
239   aedcoord(x, y)
240   register int  x, y;
241   {
# Line 234 | Line 245 | register int  x, y;
245   }
246  
247  
248 < static
248 > static void
249   aedgetcap(xp, yp)               /* get cursor postion */
250   int  *xp, *yp;
251   {
# Line 250 | Line 261 | int  *xp, *yp;
261   }
262  
263  
264 < static
264 > static void
265   anewcolr(index, r, g, b)                /* enter a color into our table */
266   int  index;
267   int  r, g, b;
# Line 265 | Line 276 | int  r, g, b;
276   }
277  
278  
279 < static
279 > static void
280   longwait(t)             /* longer wait */
281   int  t;
282   {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines