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.3 by greg, Sat Feb 22 02:07:28 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.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     2/2/87
11 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 > *
14 > * Redistribution and use in source and binary forms, with or without
15 > * modification, are permitted provided that the following conditions
16 > * are met:
17 > *
18 > * 1. Redistributions of source code must retain the above copyright
19 > *         notice, this list of conditions and the following disclaimer.
20 > *
21 > * 2. Redistributions in binary form must reproduce the above copyright
22 > *       notice, this list of conditions and the following disclaimer in
23 > *       the documentation and/or other materials provided with the
24 > *       distribution.
25 > *
26 > * 3. The end-user documentation included with the redistribution,
27 > *           if any, must include the following acknowledgment:
28 > *             "This product includes Radiance software
29 > *                 (http://radsite.lbl.gov/)
30 > *                 developed by the Lawrence Berkeley National Laboratory
31 > *               (http://www.lbl.gov/)."
32 > *       Alternately, this acknowledgment may appear in the software itself,
33 > *       if and wherever such third-party acknowledgments normally appear.
34 > *
35 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 > *       and "The Regents of the University of California" must
37 > *       not be used to endorse or promote products derived from this
38 > *       software without prior written permission. For written
39 > *       permission, please contact [email protected].
40 > *
41 > * 5. Products derived from this software may not be called "Radiance",
42 > *       nor may "Radiance" appear in their name, without prior written
43 > *       permission of Lawrence Berkeley National Laboratory.
44 > *
45 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 > * SUCH DAMAGE.
57 > * ====================================================================
58 > *
59 > * This software consists of voluntary contributions made by many
60 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 > * information on Lawrence Berkeley National Laboratory, please see
62 > * <http://www.lbl.gov/>.
63   */
64  
65   #include  <stdio.h>
# Line 52 | Line 104 | static char SCCSid[] = "$SunId$ LBL";
104   #define  MINPIX         8               /* minimum hardware color */
105  
106   #define  NCOLS          512             /* maximum # columns for output */
107 < #define  NROWS          512-COMHT       /* maximum # rows for output */
107 > #define  NROWS          483-COMHT       /* maximum # rows for output */
108   #define  COMHT          16              /* height of command line */
109   #define  COMCW          63              /* maximum chars on command line */
110  
# Line 61 | Line 113 | int  aed_close(), aed_clear(), aed_paintr(),
113  
114   static struct driver  aed_driver = {
115          aed_close, aed_clear, aed_paintr, aed_getcur,
116 <        aed_comout, NULL,
117 <        NCOLS, NROWS
116 >        aed_comout, NULL, NULL,
117 >        1.0, NCOLS, NROWS
118   };
119  
120  
# Line 71 | Line 123 | aed_init(name, id)                     /* open AED */
123   char  *name, *id;
124   {
125          if (ttyset(&aed_driver, fileno(stdin)) < 0) {   /* set tty driver */
126 <                stderr_v("cannot access terminal\n");
126 >                eputs("cannot access terminal\n");
127                  return(NULL);
128          }
129          command(RST);                                   /* reset AED */
# Line 87 | Line 139 | char  *name, *id;
139          command(SCP);
140          byte('+'); byte(0); byte(1);
141          make_gmap(GAMMA);                               /* make color map */
142 <        errvec = aed_errout;                            /* set error vector */
143 <        cmdvec = aed_errout;
144 <        if (wrnvec != NULL)
145 <                wrnvec = aed_errout;
142 >        erract[USER].pf =                               /* set error vector */
143 >        erract[SYSTEM].pf =
144 >        erract[INTERNAL].pf =
145 >        erract[CONSISTENCY].pf = aed_errout;
146 >        erract[COMMAND].pf = aed_errout;
147 >        if (erract[WARNING].pf != NULL)
148 >                erract[WARNING].pf = aed_errout;
149          return(&aed_driver);
150   }
151  
# Line 98 | Line 153 | char  *name, *id;
153   static
154   aed_close()                                     /* close AED */
155   {
156 <        errvec = stderr_v;                      /* reset error vector */
157 <        cmdvec = NULL;
158 <        if (wrnvec != NULL)
159 <                wrnvec = stderr_v;
156 >        erract[USER].pf =                       /* reset error vector */
157 >        erract[SYSTEM].pf =
158 >        erract[INTERNAL].pf =
159 >        erract[CONSISTENCY].pf = eputs;
160 >        erract[COMMAND].pf = NULL;
161 >        if (erract[WARNING].pf != NULL)
162 >                erract[WARNING].pf = wputs;
163          aedsetcap(0, 0);                        /* go to bottom */
164          command(SEC);
165          byte(WHT);                              /* white text */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines