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.5 by greg, Wed Oct 25 15:37:14 1989 UTC vs.
Revision 2.4 by greg, Tue Feb 25 02:47:22 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  "driver.h"
# Line 52 | Line 49 | static char SCCSid[] = "$SunId$ LBL";
49   #define  MINPIX         8               /* minimum hardware color */
50  
51   #define  NCOLS          512             /* maximum # columns for output */
52 < #define  NROWS          512-COMHT       /* maximum # rows for output */
52 > #define  NROWS          483-COMHT       /* maximum # rows for output */
53   #define  COMHT          16              /* height of command line */
54   #define  COMCW          63              /* maximum chars on command line */
55  
# Line 61 | Line 58 | int  aed_close(), aed_clear(), aed_paintr(),
58  
59   static struct driver  aed_driver = {
60          aed_close, aed_clear, aed_paintr, aed_getcur,
61 <        aed_comout, NULL,
62 <        NCOLS, NROWS
61 >        aed_comout, NULL, NULL,
62 >        1.0, NCOLS, NROWS
63   };
64  
65  
# Line 71 | Line 68 | aed_init(name, id)                     /* open AED */
68   char  *name, *id;
69   {
70          if (ttyset(&aed_driver, fileno(stdin)) < 0) {   /* set tty driver */
71 <                stderr_v("cannot access terminal\n");
71 >                eputs("cannot access terminal\n");
72                  return(NULL);
73          }
74          command(RST);                                   /* reset AED */
# Line 87 | Line 84 | char  *name, *id;
84          command(SCP);
85          byte('+'); byte(0); byte(1);
86          make_gmap(GAMMA);                               /* make color map */
87 <        errvec = aed_errout;                            /* set error vector */
88 <        cmdvec = aed_errout;
89 <        if (wrnvec != NULL)
90 <                wrnvec = aed_errout;
87 >        erract[USER].pf =                               /* set error vector */
88 >        erract[SYSTEM].pf =
89 >        erract[INTERNAL].pf =
90 >        erract[CONSISTENCY].pf = aed_errout;
91 >        erract[COMMAND].pf = aed_errout;
92 >        if (erract[WARNING].pf != NULL)
93 >                erract[WARNING].pf = aed_errout;
94          return(&aed_driver);
95   }
96  
# Line 98 | Line 98 | char  *name, *id;
98   static
99   aed_close()                                     /* close AED */
100   {
101 <        errvec = stderr_v;                      /* reset error vector */
102 <        cmdvec = NULL;
103 <        if (wrnvec != NULL)
104 <                wrnvec = stderr_v;
101 >        erract[USER].pf =                       /* reset error vector */
102 >        erract[SYSTEM].pf =
103 >        erract[INTERNAL].pf =
104 >        erract[CONSISTENCY].pf = eputs;
105 >        erract[COMMAND].pf = NULL;
106 >        if (erract[WARNING].pf != NULL)
107 >                erract[WARNING].pf = wputs;
108          aedsetcap(0, 0);                        /* go to bottom */
109          command(SEC);
110          byte(WHT);                              /* white text */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines