avoid black flashing on scenario description

[micropolis] / res / micropolis.tcl

diff --git a/res/micropolis.tcl b/res/micropolis.tcl
index dac3517d84f444af64c499f9cbbc7eeba4d91f0e..142fa24a6721471af11bc6f60fd0bd2458c425d6 100644 (file)
--- a/res/micropolis.tcl
+++ b/res/micropolis.tcl
@@ -97,6 +97,7 @@ set DemandCom 0
 set DemandInd 0
 set Priority 2
 set Time 3
 set DemandInd 0
 set Priority 2
 set Time 3

+set Pause 0

 set AutoGoto 1
 set AutoBudget 1
 set Disasters 1
 set AutoGoto 1
 set AutoBudget 1
 set Disasters 1


@@ -412,8 +413,8 @@ sim ResetDynamic
 # the font in res (because it's already in the system fonts).  These lines
 # are for other systems that lack the font.
 set FontPath "[pwd]/res/dejavu-lgc"
 # the font in res (because it's already in the system fonts).  These lines
 # are for other systems that lack the font.
 set FontPath "[pwd]/res/dejavu-lgc"

-system "xset -fp $FontPath >&/dev/null"
-system "xset +fp $FontPath >&/dev/null"
+system "xset -fp \"$FontPath\" >/dev/null 2>&1"
+system "xset +fp \"$FontPath\" >/dev/null 2>&1"

 
 
 ########################################################################
 
 
 ########################################################################


@@ -484,7 +485,7 @@ Either clean up your act or open a gas mask concession at city hall.} \
 {{view {PanView $v [sim PolMaxX] [sim PolMaxY]}}}
 
 Message 11 #ff4f4f {CRIME ALERT!} \
 {{view {PanView $v [sim PolMaxX] [sim PolMaxY]}}}
 
 Message 11 #ff4f4f {CRIME ALERT!} \

-{Crime in your city is our of hand.  Angry mobs are looting and vandalizing the central city.  The president will send in the national guard soon if you cannot control the problem.} \
+{Crime in your city is out of hand.  Angry mobs are looting and vandalizing the central city.  The president will send in the national guard soon if you cannot control the problem.} \

 {{view {PanView $v [sim CrimeMaxX] [sim CrimeMaxY]}}}
 
 Message 12 #ff4f4f {TRAFFIC WARNING!} \
 {{view {PanView $v [sim CrimeMaxX] [sim CrimeMaxY]}}}
 
 Message 12 #ff4f4f {TRAFFIC WARNING!} \


@@ -2043,13 +2044,13 @@ proc DoFileDialog {win Message Path Pattern FileName ActionOk ActionCancel} {
       wm withdraw $win"
   bind $win.files.files "<Double-Button-1>" "\
     FileSelectDouble $win %W %y $Pattern \"
       wm withdraw $win"
   bind $win.files.files "<Double-Button-1>" "\
     FileSelectDouble $win %W %y $Pattern \"

-       $ActionOk \[$win.file.file get\] \[$win.path.path get\]\""
+       $ActionOk {\[$win.file.file get\]} {\[$win.path.path get\]}\""

   bind $win.path.path <Return> "
     ShowFileDialog $win \[$win.path.path get\] $Pattern
     $win.file.file cursor 0
     focus $win.file.file"
   bind $win.file.file <Return> "\
   bind $win.path.path <Return> "
     ShowFileDialog $win \[$win.path.path get\] $Pattern
     $win.file.file cursor 0
     focus $win.file.file"
   bind $win.file.file <Return> "\

-    $ActionOk \[$win.file.file get\] \[$win.path.path get]
+    $ActionOk \[$win.file.file get\] \[$win.path.path get\]

     wm withdraw $win"
 }
 
     wm withdraw $win"
 }
 


@@ -2285,18 +2286,18 @@ proc NameComplete {win Type} {
 
 proc ShowFileDialog {win Path Pattern} {
   busy $win {
 
 proc ShowFileDialog {win Path Pattern} {
   busy $win {

-    set Path [lindex [split $Path] 0]
+    #set Path [lindex [split $Path] 0]

     if {[$win.files.files size] > 0} {
       $win.files.files delete 0 end
     }
     # read directory
     if {[$win.files.files size] > 0} {
       $win.files.files delete 0 end
     }
     # read directory

-    if {[catch "exec ls -F $Path" Result]} {
+    if {[catch "exec ls -F \"$Path\"" Result]} {

       set ElementList {}
     }
     if {[string match $Result "* not found"]} {
       set ElementList {}
     }
       set ElementList {}
     }
     if {[string match $Result "* not found"]} {
       set ElementList {}
     }

-    set ElementList [lsort $Result]
+    set ElementList [lsort [split $Result "\n"]]

 
     # insert ..
     if {[string compare $Path "/"]} {
 
     # insert ..
     if {[string compare $Path "/"]} {


@@ -3101,8 +3102,10 @@ proc ShowSplashOf {head} {
 
 
 proc WithdrawSplashOf {head} {
 
 
 proc WithdrawSplashOf {head} {

-  set win WindowLink $head.splash]
-  wm withdraw $win
+  set win [WindowLink $head.splash]
+  if {$win != {}} {
+    wm withdraw $win
+  }

 }
 
 
 }
 
 


@@ -3152,8 +3155,10 @@ proc ShowScenarioOf {head} {
 
 
 proc WithdrawScenarioOf {head} {
 
 
 proc WithdrawScenarioOf {head} {

-  set win WindowLink $head.scenario]
-  wm withdraw $win
+  set win [WindowLink $head.scenario]
+  if {$win != {}} {
+    wm withdraw $win
+  }

 }
 
 
 }
 
 


@@ -3305,12 +3310,33 @@ proc UpdateScenarioButtonID {win id} {
 
 
 proc UpdateScenarioButton {win data} {
 
 
 proc UpdateScenarioButton {win data} {

+  global Messages
+

   set type [lindex $data 0]
   set id [lindex $data 1]
   set over [WindowLink $win.$id.over]
   set enabled [WindowLink $win.$id.enabled]
   set checked [WindowLink $win.$id.checked]
   #echo "WIN $win TYPE $type ID $id OVER $over ENABLED $enabled CHECKED $checked"
   set type [lindex $data 0]
   set id [lindex $data 1]
   set over [WindowLink $win.$id.over]
   set enabled [WindowLink $win.$id.enabled]
   set checked [WindowLink $win.$id.checked]
   #echo "WIN $win TYPE $type ID $id OVER $over ENABLED $enabled CHECKED $checked"

+  if {$over} {
+    if {[lindex ${data} 2] == "DoPickScenario"} {
+      catch {text $win.desc \
+       -borderwidth 2 \
+       -relief flat \
+       -wrap word \
+       -state normal \
+       -font [Font $win Large]}
+      
+      $win.desc configure -state normal
+      $win.desc delete 0.0 end
+      $win.desc insert end "[lindex $Messages([lindex ${data} 3]) 1]\n\n[lindex $Messages([lindex ${data} 3]) 2]"
+      $win.desc configure -state disabled
+      
+      place $win.desc -x 232 -y 170 -width 280 -height 285
+    }
+  } else {
+    catch {destroy $win.desc}
+  }

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


@@ -3544,6 +3570,10 @@ proc DoPickScenario {win param} {
   UILoadScenario $param
 }
 
   UILoadScenario $param
 }
 

+proc DeleteScenarioWindow {win} {
+  UIQuit $win
+}
+

 
 ########################################################################
 # Undo/Redo Facility
 
 ########################################################################
 # Undo/Redo Facility


@@ -4909,12 +4939,14 @@ proc oops {} {
 
 
 proc TogglePause {} {
 
 
 proc TogglePause {} {

-  global State
+  global State Pause

 
   if {"$State" != "play" || [sim Speed]} {
     sim Speed 0
 
   if {"$State" != "play" || [sim Speed]} {
     sim Speed 0

+    set Pause 1

   } else {
     sim Speed 3
   } else {
     sim Speed 3

+    set Pause 0

   }
   MakeRunningSound
 }
   }
   MakeRunningSound
 }


@@ -5121,7 +5153,7 @@ proc UIDoLoadCity {name path} {
   if {![string match *.cty $name]} {
     set name $name.cty
   }
   if {![string match *.cty $name]} {
     set name $name.cty
   }

-  MakeHistory "DoLoadCity $path/$name"
+  MakeHistory "DoLoadCity {$path/$name}"

 }
 
 
 }
 
 


@@ -5216,8 +5248,14 @@ proc DoLeaveGame {head} {
 
 
 proc UILoseGame {} {
 
 
 proc UILoseGame {} {

-  UIPickScenarioMode
+  global Messages

   UIShowPicture 200
   UIShowPicture 200

+  sim Pause
+  AskQuestion [Color . #ff0000 #ffffff] [lindex $Messages(200) 1] \
+    [lindex $Messages(200) 2] \
+    ""\
+    ""\
+    "{Ok} SelectCity.Yes {UIPickScenarioMode}"

 }
 
 
 }