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.9 by schorsch, Mon Jun 30 14:59:13 2003 UTC vs.
Revision 2.11 by greg, Thu May 23 22:49:20 2024 UTC

# Line 29 | Line 29 | static const char      RCSid[] = "$Id$";
29   #define Height(f)               ((f)->ascent + (f)->descent)
30   #define YStart(f)               ((f)->ascent)
31  
32 < static void  togglecurs();
32 > static void  togglecurs(TEXTWIND  *t);
33  
34  
35   TEXTWIND *
36 < xt_open(dpy, parent, x, y, width, height, bw, fore, back, fontname)
37 < Display  *dpy;
38 < Window  parent;
39 < int  x, y;
40 < int  width, height;
41 < int  bw;
42 < unsigned long  fore, back;
43 < char  *fontname;
36 > xt_open(
37 > Display  *dpy,
38 > Window  parent,
39 > int  x, int y,
40 > int  width, int height,
41 > int  bw,
42 > unsigned long  fore, unsigned long  back,
43 > char  *fontname
44 > )
45   {
46 <        register int  i;
47 <        register TEXTWIND  *t;
46 >        int  i;
47 >        TEXTWIND  *t;
48  
49          if ((t = (TEXTWIND *)malloc(sizeof(TEXTWIND))) == NULL)
50                  return(NULL);
# Line 84 | Line 85 | char  *fontname;
85  
86  
87   void
88 < xt_putc(c, t)                           /* output a character */
89 < int  c;
90 < register TEXTWIND  *t;
88 > xt_putc(                                /* output a character */
89 > int  c,
90 > TEXTWIND  *t
91 > )
92   {
93          char    ch[2];
94  
# Line 121 | Line 123 | register TEXTWIND  *t;
123  
124  
125   void
126 < xt_puts(s, t)                           /* output a string */
125 < register char  *s;
126 < TEXTWIND  *t;
126 > xt_puts(const char *s, TEXTWIND *t)                             /* output a string */
127   {
128          int     oldcurs;
129  
# Line 135 | Line 135 | TEXTWIND  *t;
135  
136  
137   void
138 < xt_delete(t, r)                         /* delete a line */
139 < register TEXTWIND  *t;
140 < int  r;
138 > xt_delete(                              /* delete a line */
139 > TEXTWIND  *t,
140 > int  r
141 > )
142   {
143          char  *cp;
144 <        register int  i;
144 >        int  i;
145  
146          if (r < 0 || r >= t->nr)
147                  return;
# Line 163 | Line 164 | int  r;
164  
165  
166   void
167 < xt_insert(t, r)                         /* insert a line */
168 < register TEXTWIND  *t;
169 < int  r;
167 > xt_insert(                      /* insert a line */
168 > TEXTWIND  *t,
169 > int  r
170 > )
171   {
172          char  *cp;
173 <        register int  i;
173 >        int  i;
174  
175          if (r < 0 || r >= t->nr)
176                  return;
# Line 190 | Line 192 | int  r;
192  
193  
194   void
195 < xt_redraw(t)                            /* redraw text window */
194 < register TEXTWIND  *t;
195 > xt_redraw(TEXTWIND  *t)                         /* redraw text window */
196   {
197 <        register int  i;
197 >        int  i;
198  
199          XClearWindow(t->dpy, t->w);
200          for (i = 0; i < t->nr; i++)
# Line 206 | Line 207 | register TEXTWIND  *t;
207  
208  
209   void
210 < xt_clear(t)                             /* clear text window */
210 < register TEXTWIND  *t;
210 > xt_clear(TEXTWIND  *t)                          /* clear text window */
211   {
212 <        register int  i;
212 >        int  i;
213  
214          XClearWindow(t->dpy, t->w);
215          for (i = 0; i < t->nr; i++)
# Line 220 | Line 220 | register TEXTWIND  *t;
220  
221  
222   void
223 < xt_move(t, r, c)                        /* move to new position */
224 < register TEXTWIND  *t;
225 < int  r, c;
223 > xt_move(                        /* move to new position */
224 > TEXTWIND  *t,
225 > int  r, int c
226 > )
227   {
228          if (r < 0 || c < 0 || r >= t->nr || c >= t->nc)
229                  return;
# Line 234 | Line 235 | int  r, c;
235  
236  
237   int
238 < xt_cursor(t, curs)                      /* change cursor */
239 < register TEXTWIND  *t;
240 < register int  curs;
238 > xt_cursor(                      /* change cursor */
239 > TEXTWIND  *t,
240 > int  curs
241 > )
242   {
243 <        register int    oldcurs;
243 >        int     oldcurs;
244  
245          if (curs != TNOCURS && curs != TBLKCURS)
246                  return(-1);
# Line 251 | Line 253 | register int  curs;
253  
254  
255   void
256 < xt_close(t)                             /* close text window */
255 < register TEXTWIND  *t;
256 > xt_close(TEXTWIND  *t)                          /* close text window */
257   {
258 <        register int  i;
258 >        int  i;
259  
260          XFreeFont(t->dpy, t->f);
261          XFreeGC(t->dpy,t->gc);
# Line 267 | Line 268 | register TEXTWIND  *t;
268  
269  
270   static void
271 < togglecurs(t)
271 < register TEXTWIND  *t;
271 > togglecurs(TEXTWIND  *t)
272   {
273          XSetFunction(t->dpy, t->gc, GXinvert);
274          XSetPlaneMask(t->dpy, t->gc, 1L);

Diff Legend

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