--- ray/src/hd/rhdisp.c 1998/05/14 13:06:32 3.24 +++ ray/src/hd/rhdisp.c 1998/07/13 17:55:51 3.27 @@ -26,6 +26,8 @@ int imm_mode = 0; /* bundles are being delivered imme int do_outside = 0; /* render from outside sections */ +double eyesepdist = 1; /* eye separation distance */ + char *progname; /* global argv[0] */ FILE *sstdin, *sstdout; /* server's standard input and output */ @@ -271,7 +273,7 @@ again: if (!dev_view(v)) /* notify display driver */ goto again; dev_flush(); /* update screen */ - beam_init(); /* compute new beam set */ + beam_init(0); /* compute new beam set */ for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) if (!beam_view(dv, res[0], res[1])) { if (!nhist) { @@ -301,22 +303,21 @@ usr_input() /* get user input and process it */ if (fgets(cmd, sizeof(cmd), sstdin) == NULL) { fclose(sstdin); sstdin = NULL; - return(0); + return(-1); } + if (!*cmd) + return(DC_RESUME); for (args = cmd; *args && !isspace(*args); args++) ; while (isspace(*args)) *args++ = '\0'; - if (!*cmd) - return(DC_RESUME); if (*args && args[i=strlen(args)-1] == '\n') args[i] = '\0'; for (i = 0; i < DC_NCMDS; i++) if (!strcmp(cmd, cmdlist[i])) break; if (i >= DC_NCMDS) { - sprintf(errmsg, "unknown command: %s", cmd); - error(COMMAND, errmsg); + dev_auxcom(cmd, args); return(-1); } switch (i) { @@ -405,6 +406,10 @@ serv_result() /* get next server result and process break; case DS_OUTSECT: do_outside = 1; + break; + case DS_EYESEP: + if (msg.nbytes <= 1 || (eyesepdist = atof(buf)) <= FTINY) + error(INTERNAL, "bad eye separation from server"); break; case DS_STARTIMM: case DS_ENDIMM: