src/tclx/ucbsrc/makefile: Micropolis build fixes for recent macOS

[micropolis] / res / wscen.tcl

diff --git a/res/wscen.tcl b/res/wscen.tcl
index 4ccc862452102e367da2de6405fd968f8cac4387..f27ec5f6dbf75fa444d1f94fde344ab76fdeae97 100644 (file)
--- a/res/wscen.tcl
+++ b/res/wscen.tcl
@@ -75,9 +75,12 @@ if {[catch "toplevel $win -screen $display"]} {
   return ""
 }
 
+global ScenarioPanelWidth
+global ScenarioPanelHeight
+
 wm title $win "Micropolis Scenarios"
 wm iconname $win {Micropolis Scenarios}
-wm geometry $win 1200x900+0+0
+wm geometry $win ${ScenarioPanelWidth}x${ScenarioPanelHeight}+0+0
 wm withdraw $win
 wm protocol $win delete "DeleteScenarioWindow $win ;"
 wm fullscreen $win on
@@ -90,13 +93,15 @@ canvas $win.canvas \
   -scrollincrement 0 \
   -borderwidth 0 \
   -background #BFBFBF \
-  -width 1200 -height 900
+  -width $ScenarioPanelWidth -height $ScenarioPanelHeight
 LinkWindow $win.canvas $win.canvas
 LinkWindow $win.canvas.w $win
 
+global ScenarioBackground
+
 $win.canvas create bitmap 0 0 \
   -tags background  \
-  -bitmap "@images/background-micropolis.xpm" \
+  -bitmap $ScenarioBackground \
   -anchor nw
 
 $win.canvas bind background <ButtonPress> {HandleScenarioDown %W %x %y}
@@ -168,8 +173,16 @@ pack append $win.canvas.name \
   $win.canvas.name.cityname    {left frame e}
 
 place $win.canvas -x 0 -y 0
-place $win.canvas.view -x 534 -y 48
-place $win.canvas.name -x 530 -y 0
+
+global ScenarioMapX
+global ScenarioMapY
+if {$ScenarioMapX != -1} {
+       place $win.canvas.view -x $ScenarioMapX -y $ScenarioMapY
+}
+
+global ScenarioCityNameX
+global ScenarioCityNameY
+place $win.canvas.name -x $ScenarioCityNameX -y $ScenarioCityNameY
 
 InitScenario $win