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

Comparing ray/src/hd/rhdisp.c (file contents):
Revision 3.40 by gwlarson, Thu Mar 4 10:14:52 1999 UTC vs.
Revision 3.47 by schorsch, Mon Jun 30 14:59:11 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1998 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Holodeck display process.
6   */
7  
8 + #include <string.h>
9 + #include <ctype.h>
10 +
11   #include "rholo.h"
12   #include "rhdisp.h"
13   #include "rhdriver.h"
14   #include "selcall.h"
15 #include <ctype.h>
15  
16   #ifndef VIEWHISTLEN
17   #define VIEWHISTLEN     4       /* number of remembered views */
# Line 22 | Line 21 | static char SCCSid[] = "$SunId$ SGI";
21   #define FSIZDEF         0.125   /* default focus frame size */
22   #endif
23  
24 + #if defined(freebsd)
25 + #define fbufcnt(f)      ((f)->_r)
26 + #elif defined(__GNUC__)
27 + #define fbufcnt(f)      ((f)->_IO_read_end - (f)->_IO_read_ptr)
28 + #else
29 + #define fbufcnt(f)      ((f)->_cnt)
30 + #endif
31 +
32   HOLO    *hdlist[HDMAX+1];       /* global holodeck list */
33  
34   char    *hdgfn[HDMAX];          /* holodeck section geometry list */
# Line 40 | Line 47 | char   *progname;              /* global argv[0] */
47   FILE    *sstdin, *sstdout;      /* server's standard input and output */
48  
49   #ifdef DEBUG
43 #include <sys/types.h>
50   extern time_t   time();
51   static time_t   tmodesw;
52   static time_t   timm, tadd;
# Line 56 | Line 62 | main(argc, argv)
62   int     argc;
63   char    *argv[];
64   {
59        extern int      eputs();
65          int     rdy, inp, res = 0, pause = 0;
66  
67          progname = argv[0];
# Line 158 | Line 163 | disp_wait()                    /* wait for more input */
163          if (hdlist[0] == NULL)
164                  return(RDY_SRV);        /* initialize first */
165          flgs = 0;               /* flag what's ready already */
166 <        if (imm_mode || stdin->_cnt > 0)
166 >        if (imm_mode || fbufcnt(stdin) > 0)
167                  flgs |= RDY_SRV;
168 <        if (sstdin != NULL && sstdin->_cnt > 0)
168 >        if (sstdin != NULL && fbufcnt(sstdin) > 0)
169                  flgs |= RDY_SIN;
170          if (odev.inpready)
171                  flgs |= RDY_DEV;
# Line 213 | Line 218 | char   *gfn, *pfn;
218          hdlist[hd] = (HOLO *)malloc(sizeof(HOLO));
219          if (hdlist[hd] == NULL)
220                  error(SYSTEM, "out of memory in add_holo");
221 <        bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID));
221 >        memcpy((void *)hdlist[hd], (void *)hdg, sizeof(HDGRID));
222          hdcompgrid(hdlist[hd]);
223          hdgfn[hd] = savestr(gfn);
224          hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL;
# Line 272 | Line 277 | register VIEW  *v;
277          static unsigned nhist;
278          VIEW    *dv;
279          int     i, res[2];
280 <        int2    *slist;
280 >        int16   *slist;
281          char    *err;
282                                  /* restore previous view? */
283          if (v == NULL) {
# Line 476 | Line 481 | serv_result()                  /* get next server result and process
481                          if (buf == NULL)
482                                  buf = (char *)malloc(bufsiz=msg.nbytes);
483                          else
484 <                                buf = (char *)realloc(buf, bufsiz=msg.nbytes);
484 >                                buf = (char *)realloc((void *)buf,
485 >                                                bufsiz=msg.nbytes);
486                          if (buf == NULL)
487                                  error(SYSTEM, "out of memory in serv_result");
488                  }
# Line 563 | Line 569 | char   *p;
569   }
570  
571  
572 + void
573   eputs(s)                        /* put error message to stderr */
574   register char  *s;
575   {
# Line 582 | Line 589 | register char  *s;
589   }
590  
591  
592 + void
593   quit(code)                      /* clean up and exit */
594   int     code;
595   {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines