--- ray/src/hd/rhdisp.c 1998/12/20 20:39:31 3.38 +++ ray/src/hd/rhdisp.c 2004/03/28 20:33:13 3.51 @@ -1,18 +1,18 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdisp.c,v 3.51 2004/03/28 20:33:13 schorsch Exp $"; #endif - /* * Holodeck display process. */ +#include +#include + +#include "rterror.h" #include "rholo.h" #include "rhdisp.h" #include "rhdriver.h" #include "selcall.h" -#include #ifndef VIEWHISTLEN #define VIEWHISTLEN 4 /* number of remembered views */ @@ -22,6 +22,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 +48,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; @@ -51,12 +58,21 @@ static long nimmrays, naddrays; #define RDY_DEV 02 #define RDY_SIN 04 +static int disp_wait(void); +static void add_holo(HDGRID *hdg, char *gfn, char *pfn); +static void disp_bundle(PACKHEAD *p); +static void new_view(register VIEW *v); +static void set_focus(char *args); +static int usr_input(void); +static void printview(void); -main(argc, argv) -int argc; -char *argv[]; + +int +main( + int argc, + char *argv[] +) { - extern int eputs(); int rdy, inp, res = 0, pause = 0; progname = argv[0]; @@ -144,21 +160,23 @@ char *argv[]; #endif /* all done */ quit(0); + return 0; /* pro forma return */ } -int -disp_wait() /* wait for more input */ +static int +disp_wait(void) /* wait for more input */ { fd_set readset, errset; int flgs; int n; - register int i; /* see if we can avoid select call */ + 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; @@ -196,9 +214,12 @@ disp_wait() /* wait for more input */ } -add_holo(hdg, gfn, pfn) /* register a new holodeck section */ -HDGRID *hdg; -char *gfn, *pfn; +static void +add_holo( /* register a new holodeck section */ + HDGRID *hdg, + char *gfn, + char *pfn +) { VIEW nv; double d; @@ -211,14 +232,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); @@ -234,15 +255,17 @@ char *gfn, *pfn; } -disp_bundle(p) /* display a ray bundle */ -register PACKHEAD *p; +static void +disp_bundle( /* display a ray bundle */ + register PACKHEAD *p +) { GCOORD gc[2]; FVECT ro, rd, wp; 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"); @@ -263,13 +286,16 @@ register PACKHEAD *p; } -new_view(v) /* change view parameters */ -register VIEW *v; +static void +new_view( /* change view parameters */ + register VIEW *v +) { static VIEW viewhist[VIEWHISTLEN]; static unsigned nhist; VIEW *dv; - int i, res[2], *slist; + int i, res[2]; + int16 *slist; char *err; /* restore previous view? */ if (v == NULL) { @@ -298,8 +324,8 @@ again: error(COMMAND, "invalid starting view"); return; } - copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN)); - goto again; /* poss. overloading dev_section()? */ + *v = *(viewhist + ((nhist-1)%VIEWHISTLEN)); + goto again; /* XXX overloading dev_section()? */ } DCHECK(*slist < 0, WARNING, "no visible sections in new_view"); for ( ; *slist >= 0; slist++) @@ -311,14 +337,16 @@ 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++; } } -set_focus(args) /* set focus frame */ -char *args; +static void +set_focus( /* set focus frame */ + char *args +) { double hcent, vcent, hsiz, vsiz; VIEW *dv, vwfocus; @@ -341,7 +369,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( @@ -377,8 +405,8 @@ char *args; } -int -usr_input() /* get user input and process it */ +static int +usr_input(void) /* get user input and process it */ { VIEW vparams; char cmd[256]; @@ -407,7 +435,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 @@ -449,7 +477,8 @@ usr_input() /* get user input and process it */ } -printview() /* print our current view to server stdout */ +static void +printview(void) /* print our current view to server stdout */ { fputs(VIEWSTR, sstdout); fprintview(&odev.v, sstdout); @@ -458,13 +487,12 @@ printview() /* print our current view to server stdo } -int -serv_result() /* get next server result and process it */ +extern int +serv_result(void) /* get next server result and process it */ { static char *buf = NULL; static int bufsiz = 0; MSGHEAD msg; - int n; /* read message header */ if (fread((char *)&msg, sizeof(MSGHEAD), 1, stdin) != 1) goto readerr; @@ -473,7 +501,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"); } @@ -502,6 +531,8 @@ serv_result() /* get next server result and process break; case DS_STARTIMM: case DS_ENDIMM: + if (!(imm_mode = msg.type==DS_STARTIMM)) + dev_flush(); #ifdef DEBUG { time_t tnow = time(NULL); @@ -510,8 +541,6 @@ serv_result() /* get next server result and process tmodesw = tnow; } #endif - if (!(imm_mode = msg.type==DS_STARTIMM)) - dev_flush(); goto noargs; case DS_ACKNOW: case DS_SHUTDOWN: @@ -531,12 +560,16 @@ readerr: if (feof(stdin)) error(SYSTEM, "server process died"); error(SYSTEM, "error reading from server process"); + return -1; } -serv_request(type, nbytes, p) /* send a request to the server process */ -int type, nbytes; -char *p; +extern void +serv_request( /* send a request to the server process */ + int type, + int nbytes, + char *p +) { MSGHEAD msg; int m; @@ -560,8 +593,10 @@ char *p; } -eputs(s) /* put error message to stderr */ -register char *s; +void +eputs( /* put error message to stderr */ + register char *s +) { static int midline = 0; @@ -579,8 +614,10 @@ register char *s; } -quit(code) /* clean up and exit */ -int code; +void +quit( /* clean up and exit */ + int code +) { if (code) exit(code);