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

Comparing ray/src/rt/editline.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:41:22 1989 UTC vs.
Revision 2.4 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   *  editline.c - routine for editing raw input for rview.
6   *
7 < *      10/5/88
7 > *  External symbols declared in driver.h
8   */
9  
10 < #include  <ctype.h>
10 > /* ====================================================================
11 > * The Radiance Software License, Version 1.0
12 > *
13 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 > *
16 > * Redistribution and use in source and binary forms, with or without
17 > * modification, are permitted provided that the following conditions
18 > * are met:
19 > *
20 > * 1. Redistributions of source code must retain the above copyright
21 > *         notice, this list of conditions and the following disclaimer.
22 > *
23 > * 2. Redistributions in binary form must reproduce the above copyright
24 > *       notice, this list of conditions and the following disclaimer in
25 > *       the documentation and/or other materials provided with the
26 > *       distribution.
27 > *
28 > * 3. The end-user documentation included with the redistribution,
29 > *           if any, must include the following acknowledgment:
30 > *             "This product includes Radiance software
31 > *                 (http://radsite.lbl.gov/)
32 > *                 developed by the Lawrence Berkeley National Laboratory
33 > *               (http://www.lbl.gov/)."
34 > *       Alternately, this acknowledgment may appear in the software itself,
35 > *       if and wherever such third-party acknowledgments normally appear.
36 > *
37 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 > *       and "The Regents of the University of California" must
39 > *       not be used to endorse or promote products derived from this
40 > *       software without prior written permission. For written
41 > *       permission, please contact [email protected].
42 > *
43 > * 5. Products derived from this software may not be called "Radiance",
44 > *       nor may "Radiance" appear in their name, without prior written
45 > *       permission of Lawrence Berkeley National Laboratory.
46 > *
47 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 > * SUCH DAMAGE.
59 > * ====================================================================
60 > *
61 > * This software consists of voluntary contributions made by many
62 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 > * information on Lawrence Berkeley National Laboratory, please see
64 > * <http://www.lbl.gov/>.
65 > */
66  
67 + #include "color.h"
68  
69 < editline(buf, c_get, s_put, c_erase, c_kill)    /* edit input line */
69 > #include "driver.h"
70 >
71 > #define iscntrl(c)      ((c) < ' ')
72 > #define isblank(c)      ((c) == ' ')
73 > #define iserase(c)      ((c) == '\b' || (c) == 127)
74 > #define iswerase(c)     ((c) == 'W'-'@')
75 > #define iskill(c)       ((c) == 'U'-'@' || (c) == 'X'-'@')
76 >
77 >
78 > void
79 > editline(buf, c_get, s_put)     /* edit input line */
80   char  *buf;
81 < int  (*c_get)(), (*s_put)();
82 < int  c_erase, c_kill;
81 > int  (*c_get)();
82 > void  (*s_put)();
83   {
84          static char  erases[] = "\b \b";
85          static char  obuf[4];
# Line 25 | Line 88 | int  c_erase, c_kill;
88          
89          i = 0;
90          while ((c = (*c_get)()&0177) != '\n' && c != '\r')
91 <                if (c == c_erase) {             /* single char erase */
91 >                if (iserase(c)) {               /* single char erase */
92                          if (i > 0) {
93                                  (*s_put)(erases);
94                                  --i;
95                          }
96 <                } else if (c == c_kill) {       /* kill line */
96 >                } else if (iswerase(c)) {       /* word erase */
97 >                        while (i > 0 && isblank(buf[i-1])) {
98 >                                (*s_put)(erases);
99 >                                --i;
100 >                        }
101 >                        while (i > 0 && !isblank(buf[i-1])) {
102 >                                (*s_put)(erases);
103 >                                --i;
104 >                        }
105 >                } else if (iskill(c)) {         /* kill line */
106                          while (i > 0) {
107                                  (*s_put)(erases);
108                                  --i;
# Line 48 | Line 120 | int  c_erase, c_kill;
120                  }
121          buf[i] = '\0';
122          (*s_put)("\n");
123 + }
124 +
125 +
126 + static char  mybuf[512];
127 +
128 +
129 + void
130 + tocombuf(b, d)                          /* add command(s) to my buffer */
131 + register char  *b;
132 + register struct driver  *d;
133 + {
134 +        register char  *cp;
135 +        char  *comstart;
136 +
137 +        for (cp = mybuf; *cp; cp++)
138 +                ;
139 +        comstart = cp;
140 +        while (*cp++ = *b)
141 +                if (cp >= mybuf+sizeof(mybuf)) {
142 +                        *comstart = '\0';
143 +                        return;         /* what should I do about this? */
144 +                } else if (*b++ == '\n') {
145 +                        d->inpready++;
146 +                        comstart = cp;
147 +                }
148 + }
149 +
150 +
151 + int
152 + fromcombuf(b, d)                        /* get command from my buffer */
153 + char  *b;
154 + struct driver  *d;
155 + {
156 +        register char   *cp;
157 +                                                /* get next command */
158 +        for (cp = mybuf; *cp != '\n'; cp++)
159 +                if (!*cp)
160 +                        return(0);
161 +        *cp++ = '\0';
162 + #ifdef DEBUG
163 +        (*d->comout)(mybuf);                    /* echo my command */
164 +        (*d->comout)("\n");
165 + #endif
166 +                                                /* send it as reply */
167 +        strcpy(b, mybuf);
168 +        d->inpready--;
169 +                                                /* advance commands */
170 +        strcpy(mybuf, cp);
171 +        return(1);
172   }

Diff Legend

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