--- ray/src/hd/rhdisp.c 1999/03/04 10:14:52 3.40 +++ ray/src/hd/rhdisp.c 2003/07/27 22:12:02 3.49 @@ -1,18 +1,17 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdisp.c,v 3.49 2003/07/27 22:12:02 schorsch Exp $"; #endif - /* * Holodeck display process. */ +#include +#include + #include "rholo.h" #include "rhdisp.h" #include "rhdriver.h" #include "selcall.h" -#include #ifndef VIEWHISTLEN #define VIEWHISTLEN 4 /* number of remembered views */ @@ -22,6 +21,14 @@ static char SCCSid[] = "$SunId$ SGI"; #define FSIZDEF 0.125 /* default focus frame size */ #endif +#if defined(freebsd) +#define fbufcnt(f) ((f)->_r) +#elif defined(__GNUC__) +#define fbufcnt(f) ((f)->_IO_read_end - (f)->_IO_read_ptr) +#else +#define fbufcnt(f) ((f)->_cnt) +#endif + HOLO *hdlist[HDMAX+1]; /* global holodeck list */ char *hdgfn[HDMAX]; /* holodeck section geometry list */ @@ -40,7 +47,6 @@ char *progname; /* global argv[0] */ FILE *sstdin, *sstdout; /* server's standard input and output */ #ifdef DEBUG -#include extern time_t time(); static time_t tmodesw; static time_t timm, tadd; @@ -56,7 +62,6 @@ main(argc, argv) int argc; char *argv[]; { - extern int eputs(); int rdy, inp, res = 0, pause = 0; progname = argv[0]; @@ -158,9 +163,9 @@ disp_wait() /* wait for more input */ if (hdlist[0] == NULL) return(RDY_SRV); /* initialize first */ flgs = 0; /* flag what's ready already */ - if (imm_mode || stdin->_cnt > 0) + if (imm_mode || fbufcnt(stdin) > 0) flgs |= RDY_SRV; - if (sstdin != NULL && sstdin->_cnt > 0) + if (sstdin != NULL && fbufcnt(sstdin) > 0) flgs |= RDY_SIN; if (odev.inpready) flgs |= RDY_DEV; @@ -213,14 +218,14 @@ char *gfn, *pfn; hdlist[hd] = (HOLO *)malloc(sizeof(HOLO)); if (hdlist[hd] == NULL) error(SYSTEM, "out of memory in add_holo"); - bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID)); + memcpy((void *)hdlist[hd], (void *)hdg, sizeof(HDGRID)); hdcompgrid(hdlist[hd]); hdgfn[hd] = savestr(gfn); hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL; if (hd) return; /* set initial viewpoint */ - copystruct(&nv, &odev.v); + nv = odev.v; VSUM(nv.vp, hdlist[0]->orig, hdlist[0]->xv[0], 0.5); VSUM(nv.vp, nv.vp, hdlist[0]->xv[1], 0.5); VSUM(nv.vp, nv.vp, hdlist[0]->xv[2], 0.5); @@ -244,7 +249,7 @@ register PACKHEAD *p; double d; register int i; /* get beam coordinates */ - if (p->hd < 0 | p->hd >= HDMAX || hdlist[p->hd] == NULL) + if ((p->hd < 0) | (p->hd >= HDMAX) || hdlist[p->hd] == NULL) error(INTERNAL, "bad holodeck number in disp_bundle"); if (!hdbcoord(gc, hdlist[p->hd], p->bi)) error(INTERNAL, "bad beam index in disp_bundle"); @@ -272,7 +277,7 @@ register VIEW *v; static unsigned nhist; VIEW *dv; int i, res[2]; - int2 *slist; + int16 *slist; char *err; /* restore previous view? */ if (v == NULL) { @@ -301,7 +306,7 @@ again: error(COMMAND, "invalid starting view"); return; } - copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN)); + *v = *(viewhist + ((nhist-1)%VIEWHISTLEN)); goto again; /* poss. overloading dev_section()? */ } DCHECK(*slist < 0, WARNING, "no visible sections in new_view"); @@ -314,7 +319,7 @@ again: imm_mode = beam_sync(odev.firstuse) > 0; /* record new view */ if (v < viewhist || v >= viewhist+VIEWHISTLEN) { - copystruct(viewhist + (nhist%VIEWHISTLEN), v); + *(viewhist + (nhist%VIEWHISTLEN)) = *v; nhist++; } } @@ -344,7 +349,7 @@ char *args; beam_init(0); /* add basic views */ for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) beam_view(dv, res[0]>>4, res[1]>>4); - copystruct(&vwfocus, &odev.v); /* add focus view */ + vwfocus = odev.v; /* add focus view */ switch (odev.v.type) { case VT_PER: vwfocus.horiz = 2.*180./PI*atan( @@ -410,7 +415,7 @@ usr_input() /* get user input and process it */ } switch (i) { case DC_SETVIEW: /* set the view */ - copystruct(&vparams, &odev.v); + vparams = odev.v; if (!sscanview(&vparams, args)) error(COMMAND, "missing view options"); else @@ -476,7 +481,8 @@ serv_result() /* get next server result and process if (buf == NULL) buf = (char *)malloc(bufsiz=msg.nbytes); else - buf = (char *)realloc(buf, bufsiz=msg.nbytes); + buf = (char *)realloc((void *)buf, + bufsiz=msg.nbytes); if (buf == NULL) error(SYSTEM, "out of memory in serv_result"); } @@ -563,6 +569,7 @@ char *p; } +void eputs(s) /* put error message to stderr */ register char *s; { @@ -582,6 +589,7 @@ register char *s; } +void quit(code) /* clean up and exit */ int code; {