src/tclx/ucbsrc/tclexpr.sed: Micropolis build fixes for recent macOS

[micropolis] / res / micropolis.tcl

diff --git a/res/micropolis.tcl b/res/micropolis.tcl
index 50116fdedf77e58d6aae41b76c24e05e912a72f4..8c4c36a8420b021a6bf45746432eddcbb0b3794f 100644 (file)
--- a/res/micropolis.tcl
+++ b/res/micropolis.tcl
@@ -246,12 +246,15 @@ set ScenarioButtons600x450 {
   { button     scenario6       DoPickScenario  "8"     ""      259 319 105  94         ""      @images/scenario6hilite-small.xpm "" }
   { button     scenario7       DoPickScenario  "7"     ""      363 319 105  94         ""      @images/scenario7hilite-small.xpm "" }
   { button     scenario8       DoPickScenario  "6"     ""      468 319 105  94         ""      @images/scenario8hilite-small.xpm "" }
   { button     scenario6       DoPickScenario  "8"     ""      259 319 105  94         ""      @images/scenario6hilite-small.xpm "" }
   { button     scenario7       DoPickScenario  "7"     ""      363 319 105  94         ""      @images/scenario7hilite-small.xpm "" }
   { button     scenario8       DoPickScenario  "6"     ""      468 319 105  94         ""      @images/scenario8hilite-small.xpm "" }

+  { button     map             DoMap           ""      ""      267 24  180 150         ""      "" "" }

 }
 
 set ScenarioButtons $ScenarioButtons1200x900
 set ScenarioBackground "@images/background-micropolis.xpm"
 set ScenarioMapX 534
 set ScenarioMapY 48
 }
 
 set ScenarioButtons $ScenarioButtons1200x900
 set ScenarioBackground "@images/background-micropolis.xpm"
 set ScenarioMapX 534
 set ScenarioMapY 48

+set ScenarioMapFloatX -1
+set ScenarioMapFloatY -1

 set ScenarioCityNameX 530
 set ScenarioCityNameY 0
 set ScenarioDescX 232
 set ScenarioCityNameX 530
 set ScenarioCityNameY 0
 set ScenarioDescX 232


@@ -259,6 +262,7 @@ set ScenarioDescY 170
 set ScenarioDescWidth 280
 set ScenarioDescHeight 285
 set ScenarioDescFont Large
 set ScenarioDescWidth 280
 set ScenarioDescHeight 285
 set ScenarioDescFont Large

+set EventLines 5

 
 set screenwidth [winfo screenwidth .]
 set screenheight [winfo screenheight .]
 
 set screenwidth [winfo screenwidth .]
 set screenheight [winfo screenheight .]


@@ -271,6 +275,8 @@ if {($screenwidth < $ScenarioPanelWidth) ||
        set ScenarioPanelHeight 450
        set ScenarioMapX -1
        set ScenarioMapY -1
        set ScenarioPanelHeight 450
        set ScenarioMapX -1
        set ScenarioMapY -1

+       set ScenarioMapFloatX 140
+       set ScenarioMapFloatY 2

        set ScenarioCityNameX 162
        set ScenarioCityNameY 422
        set ScenarioDescX 250
        set ScenarioCityNameX 162
        set ScenarioCityNameY 422
        set ScenarioDescX 250


@@ -279,6 +285,7 @@ if {($screenwidth < $ScenarioPanelWidth) ||
        set ScenarioDescHeight 210
        set ScenarioDescFont Tiny
        set ScenarioButtons $ScenarioButtons600x450
        set ScenarioDescHeight 210
        set ScenarioDescFont Tiny
        set ScenarioButtons $ScenarioButtons600x450

+       set EventLines 2

 }
 
 # Disabled until we handle mouse events on the map itself.
 }
 
 # Disabled until we handle mouse events on the map itself.


@@ -3372,8 +3379,18 @@ proc UpdateScenarioButton {win data} {
       
       place $win.desc -x $ScenarioDescX -y $ScenarioDescY -width $ScenarioDescWidth -height $ScenarioDescHeight
     }
       
       place $win.desc -x $ScenarioDescX -y $ScenarioDescY -width $ScenarioDescWidth -height $ScenarioDescHeight
     }

+    if {[lindex ${data} 2] == "DoMap"} {
+      global ScenarioMapFloatX ScenarioMapFloatY
+      if { $ScenarioMapFloatX != "-1" } {
+        place $win.canvas.view -x $ScenarioMapFloatX -y $ScenarioMapFloatY
+      }
+    }

   } else {
     catch {destroy $win.desc}
   } else {
     catch {destroy $win.desc}

+    global ScenarioMapFloatX
+    if { $ScenarioMapFloatX != "-1" } {
+      catch {place forget $win.canvas.view}
+    }

   }
   if {$enabled} {
     if {$checked} {
   }
   if {$enabled} {
     if {$checked} {