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

Comparing ray/src/rt/x11twind.c (file contents):
Revision 2.2 by greg, Fri May 29 15:25:13 1992 UTC vs.
Revision 2.7 by greg, Fri Apr 11 16:01:26 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
4 –
5 – /* Copyright (c) 1989 Regents of the University of California */
6 –
4   /*
5   *  x11twind.c - routines for X11 text windows.
6   *
# Line 14 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   *      9/26/88
12   */
13  
14 + #include "copyright.h"
15 +
16   #include  <stdio.h>
17  
18 + #include  <stdlib.h>
19 +
20   #include  <X11/Xlib.h>
21  
22   #include  "x11twind.h"
23  
24   #ifndef  BSD
25   #define  bzero(d,n)             (void)memset(d,0,n)
25 – extern char  *memset();
26   #endif
27  
28   #define checkcurs(t)            if ((t)->cursor) togglecurs(t)
# Line 34 | Line 34 | extern char  *memset();
34   #define Height(f)               ((f)->ascent + (f)->descent)
35   #define YStart(f)               ((f)->ascent)
36  
37 < extern  char  *calloc(), *malloc();
37 > static void  togglecurs();
38  
39  
40   TEXTWIND *
# Line 88 | Line 88 | char  *fontname;
88   }
89  
90  
91 < xt_puts(s, t)                           /* output a string */
92 < register char  *s;
93 < TEXTWIND  *t;
94 < {
95 <        int     oldcurs;
96 <
97 <        oldcurs = xt_cursor(t, TNOCURS);        /* for efficiency */
98 <        while (*s)
99 <                xt_putc(*s++, t);
100 <        xt_cursor(t, oldcurs);
101 < }
102 <
103 <
91 > void
92   xt_putc(c, t)                           /* output a character */
93 < char  c;
93 > int  c;
94   register TEXTWIND  *t;
95   {
96          checkcurs(t);
# Line 134 | Line 122 | register TEXTWIND  *t;
122   }
123  
124  
125 + void
126 + xt_puts(s, t)                           /* output a string */
127 + register char  *s;
128 + TEXTWIND  *t;
129 + {
130 +        int     oldcurs;
131 +
132 +        oldcurs = xt_cursor(t, TNOCURS);        /* for efficiency */
133 +        while (*s)
134 +                xt_putc(*s++, t);
135 +        xt_cursor(t, oldcurs);
136 + }
137 +
138 +
139 + void
140   xt_delete(t, r)                         /* delete a line */
141   register TEXTWIND  *t;
142   int  r;
# Line 161 | Line 164 | int  r;
164   }
165  
166  
167 + void
168   xt_insert(t, r)                         /* insert a line */
169   register TEXTWIND  *t;
170   int  r;
# Line 187 | Line 191 | int  r;
191   }
192  
193  
194 + void
195   xt_redraw(t)                            /* redraw text window */
196   register TEXTWIND  *t;
197   {
# Line 202 | Line 207 | register TEXTWIND  *t;
207   }
208  
209  
210 + void
211   xt_clear(t)                             /* clear text window */
212   register TEXTWIND  *t;
213   {
# Line 215 | Line 221 | register TEXTWIND  *t;
221   }
222  
223  
224 + void
225   xt_move(t, r, c)                        /* move to new position */
226   register TEXTWIND  *t;
227   int  r, c;
# Line 245 | Line 252 | register int  curs;
252   }
253  
254  
255 + void
256   xt_close(t)                             /* close text window */
257   register TEXTWIND  *t;
258   {
# Line 255 | Line 263 | register TEXTWIND  *t;
263          XDestroyWindow(t->dpy, t->w);
264          for (i = 0; i < t->nr; i++)
265                  free(t->lp[i]);
266 <        free((char *)t->lp);
267 <        free((char *)t);
266 >        free((void *)t->lp);
267 >        free((void *)t);
268   }
269  
270  
271 < static
271 > static void
272   togglecurs(t)
273   register TEXTWIND  *t;
274   {

Diff Legend

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