--- ray/src/rt/rview.c	1990/01/08 13:38:12	1.9
+++ ray/src/rt/rview.c	1991/05/03 15:43:32	1.13
@@ -18,6 +18,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <signal.h>
 
+#include  <setjmp.h>
+
 #include  <ctype.h>
 
 VIEW  ourview = STDVIEW;		/* viewing parameters */
@@ -45,7 +47,7 @@ char  *amblist[128];			/* ambient include/exclude list
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
 int  greyscale = 0;			/* map colors to brightness? */
-char  *devname = "X";			/* output device name */
+char  *devname = dev_default;		/* output device name */
 
 struct driver  *dev = NULL;		/* driver functions */
 
@@ -55,6 +57,11 @@ PNODE  ptrunk;				/* the base of our image */
 RECT  pframe;				/* current frame boundaries */
 int  pdepth;				/* image depth in current frame */
 
+static jmp_buf  mainloop;		/* longjmp back to main loop */
+static char  *reserve_mem = NULL;	/* pre-allocated reserve memory */
+
+#define RESERVE_AMT	8192		/* amount of memory to reserve */
+
 #define  CTRL(c)	('c'-'@')
 
 
@@ -113,7 +120,7 @@ rview()				/* do a view */
 
 	devopen(devname);		/* open device */
 	newimage();			/* set up image */
-
+	setjmp(mainloop);
 	for ( ; ; ) {			/* quit in command() */
 		while (hresolu <= 1<<pdepth &&
 				vresolu <= 1<<pdepth)
@@ -137,6 +144,30 @@ rview()				/* do a view */
 }
 
 
+memreserve()			/* fill memory reserves */
+{
+	if (reserve_mem != NULL)
+		return;			/* got some already */
+	reserve_mem = malloc(RESERVE_AMT);
+}
+
+
+memerror(detail)		/* try and rescue a memory error */
+char	*detail;
+{
+	if (reserve_mem == NULL) {
+		sprintf(errmsg, "out of memory %s", detail);
+		error(SYSTEM, errmsg);
+	}
+	free(reserve_mem);
+	reserve_mem = NULL;
+	do
+		command("out of memory: ");
+	while (reserve_mem == NULL);
+	longjmp(mainloop, 1);
+}
+
+
 command(prompt)			/* get/execute command */
 char  *prompt;
 {
@@ -145,8 +176,7 @@ char  *prompt;
 	char  inpbuf[256];
 	char  *args;
 again:
-	(*dev->comout)(prompt);			/* get command + arguments */
-	(*dev->comin)(inpbuf);
+	(*dev->comin)(inpbuf, prompt);		/* get command + arguments */
 	for (args = inpbuf; *args && *args != ' '; args++)
 		;
 	if (*args) *args++ = '\0';
@@ -269,9 +299,11 @@ rsample()			/* sample the image */
 	xsiz = (((pframe.r-pframe.l)<<pdepth)+hresolu-1) / hresolu;
 	ysiz = (((pframe.u-pframe.d)<<pdepth)+vresolu-1) / vresolu;
 	rl = (RECT *)malloc(xsiz*sizeof(RECT));
+	if (rl == NULL)
+		memerror("in rsample");
 	pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
-	if (rl == NULL || pl == NULL)
-		error(SYSTEM, "out of memory in rsample");
+	if (pl == NULL)
+		memerror("in rsample");
 	/*
 	 * Initialize the bottom row.
 	 */
@@ -358,7 +390,7 @@ int  pd;
 	if (p->kid == NULL) {			/* subdivide */
 
 		if ((p->kid = newptree()) == NULL)
-			error(SYSTEM, "out of memory in refine");
+			memerror("in refine");
 		/*
 		 *  The following paint order can leave a black pixel
 		 *  when redraw() is called in (*dev->paintr)().