Newsgroups: comp.parallel.pvm
From: Jan Nijtmans <nijtmans@nici.kun.nl>
Subject: Compiling XPVM with Tcl7.5/Tk4.1
Organization: University of Nijmegen, The Netherlands
Date: Mon, 30 Oct 1995 17:22:19 +0100
Mime-Version: 1.0
Content-Type: multipart/mixed; oundary="---------------------------168362527521382"
Message-ID: <3094FBBB.173@nici.kun.nl>

This is a multi-part message in MIME format.

-----------------------------168362527521382
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

XPVM1.1.1 doesn't compile right away for Tcl7.5/Tk4.1.
However, I managed to do it. Basically I had to change
3 things:

- Many "else" and "elseif"'s have an empty line in front of them.
  That is not accepted by the Tcl syntax. That it worked before
  was luck, but in fact due to a bug in the Tcl_CommandComplete()
  function. all these empty lines should be removed.

- In xpvm.h the include file "../src/tdpro.h" cannot be found.
  For me "xpvm" is a subdirectory of "pvm3", so I made it
  "../../src/tdpro.h". But it depends where the pvm3 source is.

- The c-variable tcl_RcFileName doesn't exist any more. Now a
  Tcl-variable "tcl_rcFileName" is used for the same purpose.

Further on everything is the same as for Tcl7.4/Tk4.0.

A patch-file to make all these changes is appended to this posting.
Copy it to the "xpvm/src/" directory and do:

	patch <xpvm1.1.1.patch		(the name of this file)

Then "make" it again.

I hope this is usefull.

	Jan Nijtmans
	NICI (Nijmegen Insititute of Cognition and Information)
	email: nijtmans@nici.kun.nl
	url:   http://www.nici.kun.nl/~nijtmans/

-----------------------------168362527521382
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="xpvm1.1.1.patch"

*** Makefile.aimk.orig	Mon Oct 30 13:07:06 1995
--- Makefile.aimk	Mon Oct 30 13:07:06 1995
***************
*** 15,21 ****
  #COMPILEROPTIONS = -O
  COMPILEROPTIONS = -g
  
! CC = cc
  
  CFLAGS = $(COMPILEROPTIONS) $(PVMVERSION) $(TCLTKVERSION)
  
--- 15,21 ----
  #COMPILEROPTIONS = -O
  COMPILEROPTIONS = -g
  
! CC = gcc
  
  CFLAGS = $(COMPILEROPTIONS) $(PVMVERSION) $(TCLTKVERSION)
  
***************
*** 29,37 ****
  # Libraries
  #
  
! TCLLIBDIR = -L$(HOME)/projects/TCL/tcl/$(PVM_ARCH)
  
! TKLIBDIR = -L$(HOME)/projects/TCL/tk/$(PVM_ARCH)
  
  PVMLIBDIR = -L$(PVM_ROOT)/lib/$(PVM_ARCH)
  
--- 29,37 ----
  # Libraries
  #
  
! TCLLIBDIR = -L/usr/local/lib
  
! TKLIBDIR = -L/usr/local/lib
  
  PVMLIBDIR = -L$(PVM_ROOT)/lib/$(PVM_ARCH)
  
***************
*** 56,64 ****
  
  PVMINCL = -I$(PVM_ROOT)/include
  
! TCLINCL = -I$(HOME)/projects/TCL/tcl
  
! TKINCL = -I$(HOME)/projects/TCL/tk
  
  XINCL = $(ARCHXINCL)
  
--- 56,64 ----
  
  PVMINCL = -I$(PVM_ROOT)/include
  
! TCLINCL = -I/usr/local/include
  
! TKINCL = -I/usr/local/include
  
  XINCL = $(ARCHXINCL)
  
*** procs.tcl.orig	Mon Oct 30 13:26:21 1995
--- procs.tcl	Mon Oct 30 13:48:46 1995
***************
*** 73,79 ****
  		set prim_help_enter $st_help_enter
  		set prim_help_zoom $st_help_zoom
  	} \
- 
  	elseif { $view == "UT" } \
  	{
  		global ut_xview
--- 73,78 ----
***************
*** 135,141 ****
  
  		setTmpMsg "Help" $st_help_query
  	} \
- 
  	elseif { $action == "query_motion" } \
  	{
  		if { $x >= 0 && $x < $st_cwidth \
--- 134,139 ----
***************
*** 151,163 ****
  
  			st_query_info $id $tindex1 $tindex2 0
  		} \
- 
  		else \
  		{
  			st_query_info -1 -1 -1 0
  		}
  	} \
- 
  	elseif { $action == "query_release" } \
  	{
  		st_query_info -1 -1 -1 0
--- 149,159 ----
***************
*** 182,188 ****
  			set st_timeid $prim_timeid
  			set ut_timeid $alt_timeid
  		} \
- 
  		elseif { $view == "UT" } \
  		{
  			set ut_timeid $prim_timeid
--- 178,183 ----
***************
*** 194,200 ****
  
  		setTmpMsg "Help" $prim_help_enter
  	} \
- 
  	elseif { $action == "enter" } \
  	{
  		if { $prim_timeid != -1 } \
--- 189,194 ----
***************
*** 214,220 ****
  			set st_timeid $prim_timeid
  			set ut_timeid $alt_timeid
  		} \
- 
  		elseif { $view == "UT" } \
  		{
  			set ut_timeid $prim_timeid
--- 208,213 ----
***************
*** 226,232 ****
  
  		setTmpMsg "Help" $prim_help_enter
  	} \
- 
  	elseif { $action == "time" } \
  	{
  		if { $prim_timeid != -1 } \
--- 219,224 ----
***************
*** 234,240 ****
  			$PRIM_C coords $prim_timeid $canvx 0 $canvx $prim_height
  			$PRIM_C raise $prim_timeid
  		} \
- 
  		else \
  		{
  			set prim_timeid [ $PRIM_C create line \
--- 226,231 ----
***************
*** 252,258 ****
  			$ALT_C coords $alt_timeid $canvx 0 $canvx $alt_height
  			$ALT_C raise $alt_timeid
  		} \
- 
  		else \
  		{
  			set alt_timeid [ $ALT_C create line \
--- 243,248 ----
***************
*** 260,266 ****
  
  			if { $view == "ST" } \
  				{ set ut_timeid $alt_timeid } \
- 
  			elseif { $view == "UT" } \
  				{ set st_timeid $alt_timeid }
  		}
--- 250,255 ----
***************
*** 271,277 ****
  		if { $prim_help_enter != [ topMsg ] } \
  			{ setTmpMsg "Help" $prim_help_enter }
  	} \
- 
  	elseif { $action == "leave" } \
  	{
  		if { $prim_timeid != -1 } \
--- 260,265 ----
***************
*** 296,302 ****
  
  		popMsgs
  	} \
- 
  	elseif { $action == "zoom_press" } \
  	{
  		set zoom_x1 $canvx
--- 284,289 ----
***************
*** 310,316 ****
  
  			$PRIM_C lower $zoomid
  		} \
- 
  		else \
  		{
  			set zoomid [ $PRIM_C create rectangle \
--- 297,302 ----
***************
*** 321,327 ****
  
  		setTmpMsg "Help" $prim_help_zoom
  	} \
- 
  	elseif { $action == "zoom_motion" } \
  	{
  		set zoom_x2 $canvx
--- 307,312 ----
***************
*** 331,337 ****
  			set x1 $zoom_x1
  			set x2 $zoom_x2
  		} \
- 
  		else \
  		{
  			set x1 $zoom_x2
--- 316,321 ----
***************
*** 340,346 ****
  
  		$PRIM_C coords $zoomid $x1 0 $x2 $prim_height
  	} \
- 
  	elseif { $action == "zoom_release" } \
  	{
  		$PRIM_C delete $zoomid
--- 324,329 ----
***************
*** 356,362 ****
  				set x1 $zoom_x1
  				set x2 $zoom_x2
  			} \
- 
  			else \
  			{
  				set x1 $zoom_x2
--- 339,344 ----
***************
*** 376,382 ****
  
  					return
  				} \
- 
  				else \
  				{
  					set new_scale 1
--- 358,363 ----
***************
*** 393,399 ****
  
  			if { $view == "ST" } \
  				{ set newx [ expr $x + $st_xview ] } \
- 
  			elseif { $view == "UT" } \
  				{ set newx [ expr $x + $ut_xview ] }
  
--- 374,379 ----
***************
*** 407,413 ****
  
  			setMsg "Zooming Done."
  		} \
- 
  		else \
  		{
  			setMsg "Error - Infinite Zoom"
--- 387,392 ----
***************
*** 415,421 ****
  
  		popMsgs
  	} \
- 
  	elseif { $action == "unzoom" } \
  	{
  		setMsg "Unzooming..."
--- 394,399 ----
***************
*** 426,432 ****
  		{
  			set scale_stack [ lreplace $scale_stack 0 0 ]
  		} \
- 
  		else \
  		{
  			set new_scale [ expr 2 * $scale ]
--- 404,409 ----
***************
*** 453,459 ****
  
  		if { $view == "ST" } \
  			{ set newx [ expr $x + $st_xview ] } \
- 
  		elseif { $view == "UT" } \
  			{ set newx [ expr $x + $ut_xview ] }
  
--- 430,435 ----
***************
*** 469,481 ****
  
  		setMsg "Unzooming Done."
  	} \
- 
  	elseif { $action == "label_enter" } \
  	{
  		if { $st_help_label_query != [ topMsg ] } \
  			{ setTmpMsg "Help" $st_help_label }
  	} \
- 
  	elseif { $action == "label_press" } \
  	{
  		set tindex [ expr ( $lcanvy - $border_space ) / $st_label_ht ]
--- 445,455 ----
***************
*** 505,511 ****
  			place .xpvm.st_label_query -x $lx -y $ly -anchor w
  		}
  	} \
- 
  	elseif { $action == "label_motion" } \
  	{
  		if { $y >= 0 && $y < $st_cheight \
--- 479,484 ----
***************
*** 522,528 ****
  
  				if { $upck == 1 } \
  					{ .xpvm.st_label_query configure -text $str } \
- 
  				else \
  				{
  					label .xpvm.st_label_query -text $str \
--- 495,500 ----
***************
*** 541,547 ****
  
  				place .xpvm.st_label_query -x $lx -y $ly -anchor w
  			} \
- 
  			else \
  			{
  				set upck [ winfo exists .xpvm.st_label_query ]
--- 513,518 ----
***************
*** 550,556 ****
  					{ destroy .xpvm.st_label_query }
  			}
  		} \
- 
  		else \
  		{
  			set upck [ winfo exists .xpvm.st_label_query ]
--- 521,526 ----
***************
*** 561,567 ****
  
  		setTmpMsg Help $st_help_label_query
  	} \
- 
  	elseif { $action == "label_release" } \
  	{
  		set upck [ winfo exists .xpvm.st_label_query ]
--- 531,536 ----
***************
*** 571,584 ****
  
  		setTmpMsg "Help" $st_help_label
  	} \
- 
  	elseif { $action == "label_leave" } \
  	{
  		set upck [ winfo exists .xpvm.st_label_query ]
  
  		if { $upck == 0 } \
  			{ popMsgs } \
- 		
  		else \
  			{ setTmpMsg "Help" $st_help_label_query }
  	}
--- 540,551 ----
***************
*** 624,634 ****
  
  		if { $id == $st_highlight_id && $dblclk == "1" } \
  			{ set st_query_keep TRUE } \
- 
  		else \
  			{ set st_query_keep FALSE }
  	} \
- 
  	else \
  	{
  		if { $id != $st_highlight_id } \
--- 591,599 ----
***************
*** 685,691 ****
  	{
  		$ST.canvas itemconfigure $st_highlight_id -width 1
  	} \
- 
  	elseif { $st_highlight_type == "comm" } \
  	{
  		$ST.canvas itemconfigure $st_highlight_id -arrow none -width 1
--- 650,655 ----
***************
*** 714,720 ****
  
  	if { $event == "enter" } \
  		{ set st_query_text_index $x } \
- 
  	elseif { $event == "motion" } \
  	{
  		if { $st_query_text_index == -1 } \
--- 678,683 ----
***************
*** 741,747 ****
  
  			$ST.query_frame.query configure -text "View Info:   $str"
  		} \
- 
  		elseif { $delta > 0 } \
  		{
  			#
--- 704,709 ----
***************
*** 778,787 ****
  			}
  		}
  	} \
- 
  	elseif { $event == "leave" } \
  		{ set st_query_text_index -1 } \
- 
  	else \
  		{ puts "Error in st_info_scroll{}:  unknown event \"$event\"" }
  
--- 740,747 ----
***************
*** 850,860 ****
  		{
  			if { $x1 > $maxvalue } \
  				{ set x1 $maxvalue } \
- 
  			elseif { $x1 < 0 } \
  				{ set x1 0 }
  		} \
- 
  		else \
  			{ set x1 0 }
  
--- 810,818 ----
***************
*** 874,880 ****
  				- ( $x1 * ( $ut_cwidth - $st_cwidth ) \
  					/ ( $timex - $st_cwidth ) ) ]
  		} \
- 
  		else \
  		{
  			set utx1 [ expr $x1 \
--- 832,837 ----
***************
*** 887,893 ****
  
  		scrollSet $UT_SBH $timex $ut_cwidth 1 $utx1
  	} \
- 
  	elseif { $view == "UT" } \
  	{
  		set maxvalue [ expr $timex - $ut_cwidth + (2 * $frame_border) \
--- 844,849 ----
***************
*** 897,907 ****
  		{
  			if { $x1 > $maxvalue } \
  				{ set x1 $maxvalue } \
- 
  			elseif { $x1 < 0 } \
  				{ set x1 0 }
  		} \
- 
  		else \
  			{ set x1 0 }
  
--- 853,861 ----
***************
*** 921,927 ****
  				+ ( $x1 * ( $ut_cwidth - $st_cwidth) \
  					/ ( $timex - $ut_cwidth ) ) ]
  		} \
- 
  		else \
  		{
  			set stx1 [ expr $x1 \
--- 875,880 ----
***************
*** 971,977 ****
  				{ setTmpMsg "Network View Info" $str }
  		}
  	} \
- 
  	elseif { $action == "query_motion" } \
  	{
  		if { $y >= 0 && $y < $net_cheight \
--- 924,929 ----
***************
*** 986,1000 ****
  				if { $str != [ topMsg ] } \
  					{ setTmpMsg "Network View Info" $str }
  			} \
- 
  			else \
  				{ setTmpMsg "Help" $net_help_enter }
  		} \
- 
  		else \
  			{ setTmpMsg "Help" $net_help_enter }
  	} \
- 
  	elseif { $action == "query_release" } \
  	{
  		if { $y >= 0 && $y < $net_cheight \
--- 938,949 ----
***************
*** 1002,1015 ****
  		{
  			setTmpMsg "Help" $net_help_enter
  		} \
- 
  		else \
  			{ popMsgs }
  	} \
- 
  	elseif { $action == "enter" } \
  		{ setTmpMsg "Help" $net_help_enter } \
- 
  	elseif { $action == "leave" } \
  		{ popMsgs }
  
--- 951,961 ----
***************
*** 1052,1058 ****
  
  		if { $id == $mq_query_index && $dblclk == "1" } \
  			{ set mq_query_keep TRUE } \
- 
  		else \
  			{ set mq_query_keep FALSE }
  
--- 998,1003 ----
***************
*** 1065,1071 ****
  
  		setTmpMsg "Help" $mq_help_query
  	} \
- 
  	elseif { $action == "query_motion" } \
  	{
  		set ret [ mqQuery query $canvx $y ]
--- 1010,1015 ----
***************
*** 1080,1093 ****
  
  		mq_highlight
  	} \
- 
  	elseif { $action == "query_release" } \
  	{
  		if { $mq_query_keep == "TRUE" } \
  		{
  			if { $mq_query_index != 0 } \
  				{ return } \
- 
  			else \
  				{ set mq_query_keep FALSE }
  		}
--- 1024,1035 ----
***************
*** 1104,1114 ****
  		{
  			setTmpMsg "Help" $mq_help_enter
  		} \
- 
  		else \
  			{ popMsgs }
  	} \
- 
  	elseif { $action == "enter" } \
  	{
  		if { $mq_query_keep == "TRUE" } \
--- 1046,1054 ----
***************
*** 1121,1127 ****
  
  		setTmpMsg "Help" $mq_help_enter
  	} \
- 
  	elseif { $action == "move" } \
  	{
  		if { $mq_query_keep == "TRUE" } \
--- 1061,1066 ----
***************
*** 1132,1138 ****
  		set id	[ lindex $ret 0 ]
  		set str	[ lindex $ret 1 ]
  	} \
- 
  	elseif { $action == "leave" } \
  	{
  		if { $mq_query_keep == "TRUE" } \
--- 1071,1076 ----
***************
*** 1200,1206 ****
  
  	if { $event == "enter" } \
  		{ set mq_query_text_index $x } \
- 
  	elseif { $event == "motion" } \
  	{
  		if { $mq_query_text_index == -1 } \
--- 1138,1143 ----
***************
*** 1227,1233 ****
  
  			$MQ.query_frame.query configure -text "View Info:   $str"
  		} \
- 
  		elseif { $delta > 0 } \
  		{
  			#
--- 1164,1169 ----
***************
*** 1264,1273 ****
  			}
  		}
  	} \
- 
  	elseif { $event == "leave" } \
  		{ set mq_query_text_index -1 } \
- 
  	else \
  		{ puts "Error in mq_info_scroll{}:  unknown event \"$event\"" }
  
--- 1200,1207 ----
***************
*** 1312,1318 ****
  			set ct_query_index $tindex
  		}
  	} \
- 
  	elseif { $action == "query_motion" } \
  	{
  		set tindex [ expr ( $canvy - $border_space ) / $st_label_ht ]
--- 1246,1251 ----
***************
*** 1328,1334 ****
  
  				set ct_query_index $tindex
  			} \
- 
  			else \
  			{
  				$CT.query configure -text ""
--- 1261,1266 ----
***************
*** 1336,1342 ****
  				set ct_query_index -1
  			}
  		} \
- 
  		else \
  		{
  			$CT.query configure -text ""
--- 1268,1273 ----
***************
*** 1344,1363 ****
  			set ct_query_index -1
  		}
  	} \
- 
  	elseif { $action == "query_release" } \
  	{
  		$CT.query configure -text ""
  
  		set ct_query_index -1
  	} \
- 
  	elseif { $action == "enter" } \
  		{ setTmpMsg "Help" $ct_help_enter } \
- 
  	elseif { $action == "leave" } \
  		{ popMsgs } \
- 
  	elseif { $action == "label_press" } \
  	{
  		set tindex [ expr ( $canvy - $border_space ) / $st_label_ht ]
--- 1275,1290 ----
***************
*** 1389,1395 ****
  
  		setTmpMsg "Help" $ct_help_label_query
  	} \
- 
  	elseif { $action == "label_motion" } \
  	{
  		if { $y >= 0 && $y < $ct_cheight \
--- 1316,1321 ----
***************
*** 1406,1412 ****
  
  				if { $upck == 1 } \
  					{ .call_trace.label_query configure -text $str } \
- 
  				else \
  				{
  					label .call_trace.label_query -text $str \
--- 1332,1337 ----
***************
*** 1425,1431 ****
  
  				place .call_trace.label_query -x $lx -y $ly -anchor w
  			} \
- 
  			else \
  			{
  				set upck [ winfo exists .call_trace.label_query ]
--- 1350,1355 ----
***************
*** 1434,1440 ****
  					{ destroy .call_trace.label_query }
  			}
  		} \
- 
  		else \
  		{
  			set upck [ winfo exists .call_trace.label_query ]
--- 1358,1363 ----
***************
*** 1443,1449 ****
  				{ destroy .call_trace.label_query }
  		}
  	} \
- 
  	elseif { $action == "label_release" } \
  	{
  		set upck [ winfo exists .call_trace.label_query ]
--- 1366,1371 ----
***************
*** 1453,1465 ****
  
  		setTmpMsg "Help" $ct_help_label
  	} \
- 
  	elseif { $action == "label_enter" } \
  	{
  		if { $ct_help_label_query != [ topMsg ] } \
  			{ setTmpMsg "Help" $ct_help_label }
  	} \
- 
  	elseif { $action == "label_leave" } \
  	{
  		set upck [ winfo exists .call_trace.label_query ]
--- 1375,1385 ----
***************
*** 1532,1538 ****
  				$to_lasty $to_cheight $row_height $to_yview
  		}
  	} \
- 
  	else \
  		{ lappend to_saveout $str }
  
--- 1452,1457 ----
***************
*** 1678,1691 ****
  	{
  		if { $spawn_where == "Host" } \
  			{ set where "host $loc" } \
- 
  		elseif { $spawn_where == "Arch" } \
  			{ set where "arch $loc" } \
- 
  		else \
  			{ set where "" }
  	} \
- 
  	else \
  		{ set where "" }
  
--- 1597,1607 ----
***************
*** 1705,1711 ****
  
  	if { $init == "again" } \
  		{ set init $spawn_init_save } \
- 
  	else \
  		{ set spawn_init_save $init }
  
--- 1621,1626 ----
***************
*** 1732,1738 ****
  
  	if { $last_spawn_where == "Host" } \
  		{ set spawn_host_string $str } \
- 
  	elseif { $last_spawn_where == "Arch" } \
  		{ set spawn_arch_string $str }
  
--- 1647,1652 ----
***************
*** 1740,1746 ****
  
  	if { $spawn_where == "Host" } \
  		{ $SP.loc_entry insert 0 $spawn_host_string } \
- 
  	elseif { $spawn_where == "Arch" } \
  		{ $SP.loc_entry insert 0 $spawn_arch_string }
  
--- 1654,1659 ----
***************
*** 1797,1803 ****
  
  		$OTF.trace_mask configure -command $cmd
  	} \
- 
  	elseif { $tfmt == "3.4" } \
  	{
  		set menu .xpvm.trace_mask_menu
--- 1710,1715 ----
***************
*** 1812,1818 ****
  
  		$OTF.trace_mask configure -command $cmd
  	} \
- 
  	else \
  		{ puts "Error: Unknown Tracing Format" }
  
--- 1724,1729 ----
***************
*** 1842,1851 ****
  
  	if { $trace_format == "3.3" } \
  		{ set prefix "trace33_mask" } \
- 
  	elseif { $trace_format == "3.4" } \
  		{ set prefix "trace_mask" } \
- 
  	else \
  	{
  		puts "Error: Unknown Tracing Format"
--- 1753,1760 ----
***************
*** 1880,1893 ****
  
  	if { $index == "refresh" } \
  		{ refresh_tasks otf } \
- 
  	elseif { $index == "all" } \
  	{
  		pvm_tasks otf 0 $tracing_status
  
  		refresh_tasks otf
  	} \
- 
  	else \
  	{
  		if { $index > 0 && $index < $otf_lasty } \
--- 1789,1800 ----
***************
*** 1921,1934 ****
  
  	if { $index == "refresh" } \
  		{ refresh_tasks kill } \
- 
  	elseif { $index == "all" } \
  	{
  		pvm_tasks kill 0 all
  
  		refresh_tasks kill
  	} \
- 
  	else \
  	{
  		if { $index > 0 && $index < $kill_lasty } \
--- 1828,1839 ----
***************
*** 1963,1976 ****
  
  	if { $index == "refresh" } \
  		{ refresh_tasks signal } \
- 
  	elseif { $index == "all" } \
  	{
  		pvm_tasks signal 0 $signal_selected
  
  		refresh_tasks signal
  	} \
- 
  	else \
  	{
  		if { $index > 0 && $index < $signal_lasty } \
--- 1868,1879 ----
***************
*** 2011,2023 ****
  
  	if { $index == "pvm" } \
  		{ reset_pvm } \
- 
  	elseif { $index == "views" } \
  		{ reset_views } \
- 
  	elseif { $index == "trace_file" } \
  		{ reset_trace_file } \
- 
  	elseif { $index == "all" } \
  	{
  		#
--- 1914,1923 ----
***************
*** 2096,2102 ****
  
  	if { $lwt > $fwt } \
  		{ set wt $lwt } \
- 
  	else \
  		{ set wt $fwt }
  
--- 1996,2001 ----
***************
*** 2294,2300 ****
  
  			pvm_hosts $index
  		} \
- 
  		elseif { $label == "Other Hosts..." } \
  		{
  			#
--- 2193,2198 ----
***************
*** 2319,2330 ****
  
  				focus .xpvm.otherhost.host_entry
  			} \
- 
  			else \
  				{ place forget .xpvm.otherhost }
  		}
  	} \
- 
  	else \
  	{
  		#
--- 2217,2226 ----
***************
*** 2343,2349 ****
  
  				set state OFF
  			} \
- 
  			else \
  			{
  				set $menuvar ON
--- 2239,2244 ----
***************
*** 2493,2499 ****
  
  	if { $net_hheight < $net_cheight } \
  		{ set yview 0 } \
- 	
  	else \
  	{
  		set yview [ expr $net_yview \
--- 2388,2393 ----
***************
*** 2505,2511 ****
  
  	if { $net_hwidth < $net_cwidth } \
  		{ set xview 0 } \
- 	
  	else \
  	{
  		set xview [ expr $net_xview \
--- 2399,2404 ----
***************
*** 2566,2572 ****
  
  			set state OFF
  		} \
- 
  		else \
  		{
  			set $menuvar ON
--- 2459,2464 ----
***************
*** 2603,2613 ****
  					set st_height $min_st_height
  				}
  			} \
- 
  			else \
  				{ set net_height $height_left }
  		} \
- 
  		else \
  		{
  			set net_active FALSE
--- 2495,2503 ----
***************
*** 2625,2631 ****
  
  		wm minsize .xpvm $min_main_width $min_main_height
  	} \
- 
  	elseif { $view == "space_time" } \
  	{
  		if { $state == "ON" } \
--- 2515,2520 ----
***************
*** 2654,2664 ****
  					set st_height $min_st_height
  				}
  			} \
- 
  			else \
  				{ set st_height $height_left }
  		} \
- 
  		else \
  		{
  			set st_active FALSE
--- 2543,2551 ----
***************
*** 2676,2682 ****
  
  		wm minsize .xpvm $min_main_width $min_main_height
  	} \
- 
  	elseif { $view == "utilization" } \
  	{
  		if { $state == "ON" } \
--- 2563,2568 ----
***************
*** 2687,2693 ****
  
  			utToggle 1
  		} \
- 
  		else \
  		{
  			wm withdraw .utilization
--- 2573,2578 ----
***************
*** 2697,2703 ****
  			utToggle 0
  		}
  	} \
- 
  	elseif { $view == "msgq" } \
  	{
  		if { $state == "ON" } \
--- 2582,2587 ----
***************
*** 2708,2714 ****
  
  			mqUpdate
  		} \
- 
  		else \
  		{
  			wm withdraw .msgq
--- 2592,2597 ----
***************
*** 2716,2722 ****
  			set mq_active FALSE
  		}
  	} \
- 
  	elseif { $view == "call_trace" } \
  	{
  		if { $state == "ON" } \
--- 2599,2604 ----
***************
*** 2727,2733 ****
  
  			taskCTUpdate
  		} \
- 
  		else \
  		{
  			wm withdraw .call_trace
--- 2609,2614 ----
***************
*** 2735,2741 ****
  			set ct_active FALSE
  		}
  	} \
- 
  	elseif { $view == "task_output" } \
  	{
  		if { $state == "ON" } \
--- 2616,2621 ----
***************
*** 2746,2752 ****
  
  			updateTaskOutput
  		} \
- 
  		else \
  		{
  			wm withdraw .task_output
--- 2626,2631 ----
***************
*** 2816,2827 ****
  
  		set adjust_y $y
  	} \
- 
  	elseif { $action == "release" } \
  	{
  		$ADJ configure -state normal -relief raised
  	} \
- 
  	elseif { $action == "motion" } \
  	{
  		if { $hold_motion == 0 } \
--- 2695,2704 ----
***************
*** 2834,2840 ****
  			{
  				if { $first == 1 } \
  					{ set first 0 } \
- 
  				else \
  				{
  					set ry $nest_y
--- 2711,2716 ----
***************
*** 2887,2893 ****
  
  			set hold_motion 0
  		} \
- 
  		else \
  		{
  			set rooty [ winfo rooty $ADJ ]
--- 2763,2768 ----
***************
*** 2919,2925 ****
  
  			set st_rect_ht [ expr ( 8 * $st_label_ht ) / 20 ]
  		} \
- 
  		else \
  		{
  			setMsg "Growing Task Height..."
--- 2794,2799 ----
***************
*** 3028,3034 ****
  			if { $net_height < $min_net_height } \
  				{ set net_height $min_net_height }
  		} \
- 
  		else \
  			{ set net_height 2 }
  
--- 2902,2907 ----
***************
*** 3044,3050 ****
  				set st_height $min_st_height
  			}
  		} \
- 
  		else \
  			{ set st_height 0 }
  
--- 2917,2922 ----
***************
*** 3149,3155 ****
  
  		setSpaceTimeView
  	} \
- 
  	else \
  		{ place forget .xpvm.space_time }
  
--- 3021,3026 ----
***************
*** 3246,3252 ****
  
  	if { $net_hheight < $net_cheight } \
  		{ set yview 0 } \
- 	
  	else \
  	{
  		set yview [ expr $net_yview \
--- 3117,3122 ----
***************
*** 3270,3276 ****
  
  	if { $net_hheight < $net_cheight } \
  		{ set xview 0 } \
- 	
  	else \
  	{
  		set xview [ expr $net_xview \
--- 3140,3145 ----
***************
*** 3490,3496 ****
  
  			place $SP.trace_mask -anchor nw -x $tx -y $try
  		} \
- 
  		elseif { $trace_format == "3.4" } \
  		{
  			set tx [ expr [ right $SP.flags_trace ] \
--- 3359,3364 ----
***************
*** 3512,3518 ****
  				-y [ below $SP.buf_entry ]
  		}
  	} \
- 
  	else \
  	{
  		place forget $SP.buf
--- 3380,3385 ----
***************
*** 3556,3562 ****
  
  		set ny [ below $SP.loc_entry ]
  	} \
- 
  	else \
  	{
  		place forget $SP.loc
--- 3423,3428 ----
***************
*** 3657,3663 ****
  		place $OTF.trace_mask -anchor ne \
  			-x $tx -y [ expr [ below $OTF.trace_off ] + $border_space ]
  	} \
- 
  	else \
  		{ place forget $OTF.trace_mask }
  
--- 3523,3528 ----
***************
*** 3693,3699 ****
  
  	if { $x1 < $x2 } \
  		{ set lx $x1 } \
- 	
  	else \
  		{ set lx $x2 }
  
--- 3558,3563 ----
*** util.tcl.orig	Mon Oct 30 13:26:35 1995
--- util.tcl	Mon Oct 30 13:43:57 1995
***************
*** 22,49 ****
  
  		set scroll_view 0
  	} \
- 
  	elseif { $loc == "center" } \
  	{
  		set view [ scrollCenterValue $max_size $win_size $incr ]
  
  		if { $canvas_size < $win_size } \
  			{ set scroll_view 0 } \
- 
  		else \
  		{
  			set scroll_view [ expr $view \
  				- [ scrollCenterValue $max_size $canvas_size $incr ] ]
  		}
  	} \
- 
  	elseif { $loc == "high" } \
  	{
  		set view [ expr ( $max_size - $win_size ) / $incr ]
  
  		if { $canvas_size < $win_size } \
  			{ set scroll_view 0 } \
- 
  		else \
  			{ set scroll_view $view }
  	}
--- 22,45 ----
***************
*** 56,62 ****
  
  		set $vvar $view
  	} \
- 
  	else \
  	{
  		do_yview $canvas $view
--- 52,57 ----
***************
*** 128,134 ****
  				HORIZ low $incr $utxv
  		}
  	} \
- 
  	elseif { $view == "UT" } \
  	{
  		scrollCanvas $UT_C $UT_SBH -1 tmp_csize ut_cwidth ut_xview \
--- 123,128 ----
***************
*** 171,177 ****
  
  		if { $value >= $maxvalue1 } \
  			{ set value2 [ expr ( $maxvalue1 * $incr1 ) / $incr2 ] } \
- 
  		else \
  			{ set value2 [ expr ( $value * $incr1 ) / $incr2 ] }
  
--- 165,170 ----
***************
*** 189,195 ****
  			set fix_csize 1
  		}
  	} \
- 
  	else \
  		{ set value2 $value }
  
--- 182,187 ----
***************
*** 236,257 ****
  			set value [ expr $value \
  				+ [ scrollCenterValue $max_size $csize $incr ] ]
  		} \
- 
  		elseif { $loc == "high" } \
  		{
  			set value [ expr ( ( $max_size - $wsize ) / $incr ) \
  				- $value ]
  		}
  	} \
- 
  	else \
  	{
  		if { $loc == "low" } \
  			{ set value 0 } \
- 	
  		elseif { $loc == "center" } \
  			{ set value [ scrollCenterValue $max_size $wsize $incr ] } \
- 	
  		elseif { $loc == "high" } \
  			{ set value [ expr ( $max_size - $wsize ) / $incr ] }
  	
--- 228,245 ----
***************
*** 275,281 ****
  
  		set $vvar $value
  	} \
- 
  	else \
  	{
  		do_yview $canvas $value
--- 263,268 ----
***************
*** 356,362 ****
  
  			if { $state == "ON" } \
  				{ set $menuvar ON } \
- 
  			else \
  				{ set $menuvar OFF }
  
--- 343,348 ----
***************
*** 377,383 ****
  
  			restrict_bindings $NAME ""
  		} \
- 
  		elseif { $type == "command" } \
  		{
  			set help	[ lindex $i 3 ]
--- 363,368 ----
***************
*** 393,399 ****
  
  			restrict_bindings $NAME ""
  		} \
- 
  		elseif { $type == "submenu" } \
  		{
  			set focus_entry [ lindex $i 3 ]
--- 378,383 ----
***************
*** 412,418 ****
  
  			restrict_bindings $NAME ""
  		} \
- 
  		elseif { $type == "exchange" } \
  		{
  			set button	[ lindex $i 3 ]
--- 396,401 ----
***************
*** 432,438 ****
  
  			restrict_bindings $NAME ""
  		} \
- 
  		elseif { $type == "exchangeIndirect" } \
  		{
  			set bname	[ lindex $i 3 ]
--- 415,420 ----
***************
*** 452,458 ****
  
  			restrict_bindings $NAME ""
  		} \
- 
  		else \
  		{
  			set NAME "$name.label_$fix_label"
--- 434,439 ----
***************
*** 469,475 ****
  
  		if { $LAST != "none" } \
  			{ set mby [ below $LAST ] } \
- 
  		else \
  			{ set mby $frame_border }
  
--- 450,455 ----
***************
*** 503,509 ****
  
  	if { "$close" == "lower" } \
  		{ set cmd "lowerMenu $name" } \
- 
  	else \
  		{ set cmd "$close" }
  
--- 483,488 ----
***************
*** 516,522 ****
  
  	if { $LAST != "none" } \
  		{ set dy [ below $LAST ] } \
- 
  	else \
  		{ set dy $frame_border }
  
--- 495,500 ----
***************
*** 636,642 ****
  
  		if { $LAST != "none" } \
  			{ set mby [ below $LAST ] } \
- 
  		else \
  			{ set mby $frame_border }
  
--- 614,619 ----
***************
*** 703,709 ****
  
  		set cnt 0
  	} \
- 
  	else \
  	{
  		set scrolling "FALSE"
--- 680,685 ----
***************
*** 743,749 ****
  
  		if { $state == "ON" } \
  			{ set $menuvar ON } \
- 
  		else \
  			{ set $menuvar OFF }
  
--- 719,724 ----
***************
*** 774,780 ****
  
  		if { $LAST != "none" } \
  			{ set mby [ below $LAST ] } \
- 
  		else \
  			{ set mby $frame_border }
  
--- 749,754 ----
***************
*** 825,831 ****
  
  	if { "$close" == "lower" } \
  		{ set cmd "lowerMenu $name" } \
- 
  	else \
  		{ set cmd "$close" }
  
--- 799,804 ----
***************
*** 844,855 ****
  		set dy [ expr $$root\_scroll_cheight + $ycutoff \
  			+ (5 * $frame_border) - $fo ]
  	} \
- 	
  	else \
  	{
  		if { $LAST != "none" } \
  			{ set dy [ below $LAST ] } \
- 	
  		else \
  			{ set dy $frame_border }
  	}
--- 817,826 ----
***************
*** 880,886 ****
  		set swidth [ expr $hwidth + $scroll_width \
  			+ (4 * $frame_border) + (2 * $fo) ]
  	} \
- 
  	else \
  		{ set swidth $hwidth }
  
--- 851,856 ----
***************
*** 897,907 ****
  			set hwidth [ expr $width - $scroll_width \
  				- (4 * $frame_border) - (2 * $fo) ]
  		} \
- 
  		else \
  			{ set hwidth $cwidth }
  	} \
- 
  	else \
  		{ set width $swidth }
  
--- 867,875 ----
***************
*** 1010,1016 ****
  
  	if { $ckm == 1 } \
  		{ place forget $name } \
- 
  	else \
  		{ placeMenu $name $button $parent }
  
--- 978,983 ----
***************
*** 1030,1036 ****
  
  	if { $ckm == 1 } \
  		{ place forget $name } \
- 
  	else \
  	{
  		set $bname $button
--- 997,1002 ----
***************
*** 1089,1095 ****
  
  	if { $ckup == 1 } \
  		{ place forget $submenu } \
- 
  	else \
  		{ placeSubMenu $submenu $menu $button $focus_entry }
  
--- 1055,1060 ----
***************
*** 1146,1152 ****
  
  		raiseMenu $menu $button $parent $subs
  	} \
- 
  	else \
  	{
  		place forget $menu
--- 1111,1116 ----
***************
*** 1171,1177 ****
  
  		raiseMenu $menu [ expr $$bname ] $parent $subs
  	} \
- 
  	else \
  	{
  		place forget $menu
--- 1135,1140 ----
***************
*** 1416,1422 ****
  
  	if { $toptype == 0 } \
  		{ return [ lindex $top 1 ] } \
- 	
  	else \
  		{ return [ lindex $top 2 ] }
  
--- 1379,1384 ----
***************
*** 1548,1554 ****
  
  			if { $vis == "VisibilityUnobscured" } \
  				{ wm withdraw $WIN } \
- 			
  			else \
  			{
  				set $index\_visibility "VisibilityUnobscured"
--- 1510,1515 ----
***************
*** 1556,1562 ****
  				raise $WIN
  			}
  		} \
- 		
  		else \
  			{ wm deiconify $WIN }
  
--- 1517,1522 ----
***************
*** 1727,1733 ****
  
  	if { $type == "button" } \
  		{ bind $butt <ButtonPress> "$butt invoke" } \
- 	
  	elseif { $type == "close" } \
  		{ bind $butt <ButtonPress> "popMsgs ; $butt invoke" }
  
--- 1687,1692 ----
***************
*** 1751,1764 ****
  
  		if { $type == "button" } \
  			{ $butt configure -state active } \
- 
  		elseif { $type == "close" } \
  			{ $butt configure -state active }
  
  		if { $msg != [ topMsg ] } \
  			{ setTmpMsg "Help" $msg }
  	} \
- 
  	elseif { $cmd == "OUT" } \
  	{
  		popMsgs
--- 1710,1721 ----
***************
*** 1772,1778 ****
  
  		if { $type == "button" } \
  			{ $butt configure -state normal } \
- 
  		elseif { $type == "close" } \
  			{ $butt configure -state normal }
  	}
--- 1729,1734 ----
***************
*** 1901,1907 ****
  
  		set tw [ winfo containing $x2 $y2 ]
  	} \
- 
  	elseif { $x1 <= $x2 + $wt2 && $x2 + $wt2 <= $x1 + $wt1 \
  		&& $y1 <= $y2 && $y2 <= $y1 + $ht1 } \
  	{
--- 1857,1862 ----
***************
*** 1911,1917 ****
  
  		set tw [ winfo containing [ expr $x2 + $wt2 ] $y2 ]
  	} \
- 
  	elseif { $x1 <= $x2 && $x2 <= $x1 + $wt1 \
  		&& $y1 <= $y2 + $ht2 && $y2 + $ht2 <= $y1 + $ht1 } \
  	{
--- 1866,1871 ----
***************
*** 1921,1927 ****
  
  		set tw [ winfo containing $x2 [ expr $y2 + $ht2 ] ]
  	} \
- 
  	elseif { $x1 <= $x2 + $wt2 && $x2 + $wt2 <= $x1 + $wt1 \
  		&& $y1 <= $y2 + $ht2 && $y2 + $ht2 <= $y1 + $ht1 } \
  	{
--- 1875,1880 ----
***************
*** 1932,1938 ****
  		set tw [ winfo containing \
  			[ expr $x2 + $wt2 ] [ expr $y2 + $ht2 ] ]
  	} \
- 
  	else \
  		{ set tw "" }
  
--- 1885,1890 ----
*** xpvm.c.orig	Thu Jul 27 16:48:51 1995
--- xpvm.c	Mon Oct 30 13:13:46 1995
***************
*** 5,12 ****
  #define DO_GLOBALS
  
  #include "xpvm.h"
! 
! int Tcl_AppInit();
  
  Tk_IdleProc *recv_event_proc();
  
--- 5,11 ----
  #define DO_GLOBALS
  
  #include "xpvm.h"
! #include <tcl.h>
  
  Tk_IdleProc *recv_event_proc();
  
***************
*** 65,71 ****
  
  /* MAIN */
  
! #ifdef USE_TCL73_TK36
  
  extern int main();
  
--- 64,70 ----
  
  /* MAIN */
  
! #if (TCL_MAJOR_VERSION == 7) && (TCL_MINOR_VERSION < 4)
  
  extern int main();
  
***************
*** 144,151 ****
  		return( TCL_ERROR );
  
  	/* Set Up User-Specific Startup File */
! 
  	tcl_RcFileName = "~/.xpvmrc";
  
  	/* Return to tkMain to Start Tk_MainLoop() */
  
--- 143,153 ----
  		return( TCL_ERROR );
  
  	/* Set Up User-Specific Startup File */
! #if (TCL_MAJOR_VERSION == 7) && (TCL_MINOR_VERSION < 5)
  	tcl_RcFileName = "~/.xpvmrc";
+ #else
+ 	Tcl_SetVar(interp, "tcl_rcFileName", "~/.xpvmrc", TCL_GLOBAL_ONLY);
+ #endif
  
  	/* Return to tkMain to Start Tk_MainLoop() */
  
*** xpvm.h.orig	Mon Oct 30 13:18:11 1995
--- xpvm.h	Mon Oct 30 13:19:03 1995
***************
*** 22,28 ****
  
  #include <pvm3.h>
  
! #include "../src/tdpro.h"
  
  #ifdef USE_PVM_33
  #include "compat.reverse.h"
--- 22,28 ----
  
  #include <pvm3.h>
  
! #include "../../src/tdpro.h"
  
  #ifdef USE_PVM_33
  #include "compat.reverse.h"

-----------------------------168362527521382--


