--- ray/src/util/do_file.tcl	1995/02/15 14:12:05	2.6
+++ ray/src/util/do_file.tcl	2017/08/26 16:07:22	2.22
@@ -1,14 +1,12 @@
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: do_file.tcl,v 2.22 2017/08/26 16:07:22 greg Exp $
 #
 # Choose the Rad Input File to work on.
 #
 
-set rif_glob *.rif
-
 proc preen {} {			# clean up radvar
 	global radvar rifname
-	foreach n {objects scene materials illum mkillum render oconv pfilt
-			AMBFILE OPTFILE EXPOSURE ZONE REPORT} {
+	foreach n {objects scene materials illum mkillum mkpmap render oconv rvu rpict pfilt
+			RAWFILE ZFILE AMBFILE PGMAP PCMAP OPTFILE EXPOSURE ZONE REPORT} {
 		if {! [info exists radvar($n)]} {
 			set radvar($n) {}
 		}
@@ -19,7 +17,7 @@ proc preen {} {			# clean up radvar
 		set n 1
 		foreach v $oldval {
 			if {"[string index $v 0]" == "-"} {
-				lappend radvar(view) "$n $v"
+				lappend radvar(view) "u$n $v"
 			} elseif {[lsearch -glob $radvar(view) \
 					"[lindex $v 0] *"] >= 0} {
 				continue
@@ -45,6 +43,9 @@ proc preen {} {			# clean up radvar
 	if {! [info exists radvar(RESOLUTION)]} {
 		set radvar(RESOLUTION) 512
 	}
+	if {! [info exists radvar(EYESEP)]} {
+		set radvar(EYESEP) 1
+	}
 	if [info exists radvar(QUALITY)] {
 		cardval radvar(QUALITY) {High Medium Low}
 	} else {
@@ -75,15 +76,18 @@ proc preen {} {			# clean up radvar
 
 proc setradvar stmt {		# assign a rad variable
 	global radvar
-	regexp {^([a-zA-Z][a-zA-Z0-9]*) *= *(.*)$} $stmt dummy vnam vval
+	regexp {^([a-zA-Z][a-zA-Z0-9]*) *=[ 	]*(.*)$} $stmt dummy vnam vval
 	switch -glob $vnam {
 		obj* { eval lappend radvar(objects) $vval }
 		sce* { eval lappend radvar(scene) $vval }
 		mat* { eval lappend radvar(materials) $vval }
 		ill* { eval lappend radvar(illum) $vval }
 		mki* { eval lappend radvar(mkillum) $vval }
+		mkp* { eval lappend radvar(mkpmap) $vval }
 		ren* { eval lappend radvar(render) $vval }
 		oco* { eval lappend radvar(oconv) $vval }
+		rvu { eval lappend radvar(rvu) $vval }
+		rpi* { eval lappend radvar(rpict) $vval }
 		pf* { eval lappend radvar(pfilt) $vval }
 		vi* { lappend radvar(view) $vval }
 		ZO* { set radvar(ZONE) $vval }
@@ -93,6 +97,7 @@ proc setradvar stmt {		# assign a rad variable
 		AMB* { set radvar(AMBFILE) $vval }
 		OPT* { set radvar(OPTFILE) $vval }
 		EXP* { set radvar(EXPOSURE) $vval }
+		EYE* { set radvar(EYESEP) $vval }
 		RES* { set radvar(RESOLUTION) $vval }
 		UP { set radvar(UP) $vval }
 		IND* { set radvar(INDIRECT) $vval }
@@ -100,6 +105,10 @@ proc setradvar stmt {		# assign a rad variable
 		PEN* { set radvar(PENUMBRAS) $vval }
 		VAR* { set radvar(VARIABILITY) $vval }
 		REP* { set radvar(REPORT) $vval }
+		RAW* { set radvar(RAWFILE) $vval }
+		ZF* {set radvar(ZFILE) $vval }
+		PGM* {set radvar(PGMAP) $vval }
+		PCM* {set radvar(PCMAP) $vval }
 	}
 		
 }
@@ -117,12 +126,6 @@ proc putradvar {fi vn} {	# print out a rad variable
 		}
 		return
 	}
-	if {[lsearch -exact {ZONE QUALITY OCTREE PICTURE AMBFILE OPTFILE
-			EXPOSURE RESOLUTION UP INDIRECT DETAIL PENUMBRAS
-			VARIABILITY REPORT} $vn] >= 0} {
-		puts $fi "$vn= $radvar($vn)"
-		return
-	}
 	puts -nonewline $fi "$vn="
 	set vnl [expr [string length $vn] + 1]
 	set pos $vnl
@@ -141,7 +144,7 @@ proc putradvar {fi vn} {	# print out a rad variable
 proc load_vars {f {vl all}} {	# load RIF variables
 	global curmess radvar alldone
 	if {"$f" == ""} {return 0}
-	if {! [file exists $f]} {
+	if {! [file isfile $f]} {
 		beep
 		set curmess "$f: no such file."
 		return 0
@@ -149,16 +152,16 @@ proc load_vars {f {vl all}} {	# load RIF variables
 	if {"$vl" == "all" && ! [chksave]} {return 0}
 	set curmess {Please wait...}
 	update
-	if [catch {exec rad -n -w -e $f >& /usr/tmp/ro[pid]}] {
-		set curmess [exec cat /usr/tmp/ro[pid]]
-		exec rm -f /usr/tmp/ro[pid]
+	if [catch {exec rad -n -w -e $f >& /tmp/ro[pid]}] {
+		set curmess [exec cat /tmp/ro[pid]]
+		exec rm -f /tmp/ro[pid]
 		return 0
 	}
-	set fi [open /usr/tmp/ro[pid] r]
+	set fi [open /tmp/ro[pid] r]
 	if {"$vl" == "all"} {
 		catch {unset radvar}
 		while {[gets $fi curli] != -1} {
-			if [regexp {^[a-zA-Z][a-zA-Z0-9]*= } $curli] {
+			if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
 				setradvar $curli
 			} else {
 				break
@@ -167,7 +170,11 @@ proc load_vars {f {vl all}} {	# load RIF variables
 		set curmess {Project loaded.}
 	} else {
 		foreach n $vl {
-			set radvar($n) {}
+			if [regexp {[a-z][a-z]*} $n] {
+				set radvar($n) {}
+			} else {
+				catch {unset radvar($n)}
+			}
 		}
 		while {[gets $fi curli] != -1} {
 			if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
@@ -183,7 +190,7 @@ proc load_vars {f {vl all}} {	# load RIF variables
 	}
 	set alldone [eof $fi]
 	close $fi
-	exec rm -f /usr/tmp/ro[pid]
+	exec rm -f /tmp/ro[pid]
 	preen
 	return 1
 }
@@ -236,13 +243,19 @@ proc newsave f {		# save a RIF
 			return 0
 		}
 	} elseif {[file exists $f]} {
+		set ftyp [file type $f]
+		if { $ftyp != "file" } {
+			beep
+			set curmess "Selected file $f is a $ftyp."
+			return 0
+		}
 		if [tk_dialog .dlg {Verification} \
 				"Overwrite existing file $f?" \
 				questhead 1 {Go Ahead} {Cancel}] {
 			return 0
 		}
 	}
-	if {[file exists $f] && ! [file writable $f] && 
+	if {[file isfile $f] && ! [file writable $f] && 
 			[catch {exec chmod u+w $f} curmess]} {
 		beep
 		return 0
@@ -259,6 +272,12 @@ proc newsave f {		# save a RIF
 proc newnew f {			# create a new RIF
 	global rifname readonly curmess radvar
 	if [file exists $f] {
+		set ftyp [file type $f]
+		if { $ftyp != "file" } {
+			beep
+			set curmess "Selected file $f is a $ftyp."
+			return 0
+		}
 		if [tk_dialog .dlg {Verification} \
 				"File $f exists -- disregard it?" \
 				questhead 1 {Yes} {Cancel}] {
@@ -276,10 +295,10 @@ proc newnew f {			# create a new RIF
 }
 
 proc do_file w {
-	global rifname readonly rif_glob curfile curpat
+	global rifname readonly myglob curfile curpat
 	if {"$w" == "done"} {
 		cd [file dirname $rifname]
-		set rif_glob $curpat
+		set myglob(rif) $curpat
 		return
 	}
 	frame $w
@@ -300,6 +319,6 @@ proc do_file w {
 	helplink $w.left.new trad file new
 	helplink $w.left.ro trad file readonly
 	getfile -view view_txt -perm \
-			-win $w.right -glob [file dirname $rifname]/$rif_glob
+			-win $w.right -glob [file dirname $rifname]/$myglob(rif)
 	set curfile [file tail $rifname]
 }