--- ray/src/hd/rhdisp.c	1998/05/22 08:30:40	3.25
+++ ray/src/hd/rhdisp.c	1998/07/31 16:53:47	3.28
@@ -273,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) {
@@ -303,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) {
@@ -407,7 +406,7 @@ serv_result()			/* get next server result and process 
 		break;
 	case DS_OUTSECT:
 		do_outside = 1;
-		break;
+		goto noargs;
 	case DS_EYESEP:
 		if (msg.nbytes <= 1 || (eyesepdist = atof(buf)) <= FTINY)
 			error(INTERNAL, "bad eye separation from server");
@@ -423,20 +422,21 @@ serv_result()			/* get next server result and process 
 		}
 #endif
 		imm_mode = msg.type==DS_STARTIMM;
-		/* fall through */
+		goto noargs;
 	case DS_ACKNOW:
 	case DS_SHUTDOWN:
-		if (msg.nbytes) {
-			sprintf(errmsg,
-				"unexpected body with server message %d",
-					msg.type);
-			error(INTERNAL, errmsg);
-		}
-		break;
+		goto noargs;
 	default:
 		error(INTERNAL, "unrecognized result from server process");
 	}
 	return(msg.type);		/* return message type */
+noargs:
+	if (msg.nbytes) {
+		sprintf(errmsg, "unexpected body with server message %d",
+				msg.type);
+		error(INTERNAL, errmsg);
+	}
+	return(msg.type);
 readerr:
 	if (feof(stdin))
 		error(SYSTEM, "server process died");