ifmapper 0.9 → 0.9.5

data/lib/IFMapper/FXConnectionDialogBox.rb

@@ -20,8 +20,7 @@ class FXConnectionDialogBox < FXDialogBox
 
   DIR_TEXT = [
     'Both',
-    'A to B',
-    'B to A',
+    'One Way',
   ]
 
   EXIT_TEXT = [ 
@@ -65,6 +64,11 @@ class FXConnectionDialogBox < FXDialogBox
       @exitA.enable
       @exitB.enable
     end
+    if conn.loop? or conn.stub?
+      @type.disable
+      @dir.disable
+      @exitB.disable
+    end
   end
 
   def initialize(map, conn, event = nil)
@@ -122,8 +126,12 @@ class FXConnectionDialogBox < FXDialogBox
 			      JUSTIFY_HZ_APART|ICON_AFTER_TEXT|
 			      LAYOUT_CENTER_X|LAYOUT_CENTER_Y)
 
-    @dir.connect(SEL_COMMAND) { copy_to() }
-    @type.connect(SEL_COMMAND) { copy_to()}
+    @dir.connect(SEL_COMMAND) { 
+      copy_to() 
+      title = @conn.to_s
+      self.title = title
+    }
+    @type.connect(SEL_COMMAND) { copy_to() }
     @exitA.connect(SEL_COMMAND) { copy_to() }
     @exitB.connect(SEL_COMMAND) { copy_to() }
     @map = map

data/lib/IFMapper/FXMap.rb

@@ -6,6 +6,7 @@ require 'IFMapper/FXSection'
 require 'IFMapper/FXMapDialogBox'
 require 'IFMapper/FXSectionDialogBox'
 require 'IFMapper/AStar'
+require 'thread'
 
 
 class FXMap < Map
@@ -21,6 +22,9 @@ class FXMap < Map
   attr_accessor :options     # Map options
   attr_reader   :window      # Fox Window for this map
   attr          :version     # file format version
+  attr_reader   :mutex       # Mutex to avoid racing conditions while
+                             # automapping
+  attr_reader   :automap     # automapping transcript
 
   # pmap is a path map (a matrix or grid used for path finding).  
   # Rooms and paths are recorded there.  Path finding is needed 
@@ -28,7 +32,8 @@ class FXMap < Map
   # We now also use this for selecting of stuff, particularly complex paths.
   attr          :pmap
 
-  @@win = nil
+  @@win      = nil  # Map Info  window
+  @@roomlist = nil  # Room List Window
 
   @@tooltip = nil
   @@cursor_arrow = nil
@@ -58,6 +63,7 @@ class FXMap < Map
   # Jump to a certain section #
   #
   def section=(x)
+    clear_selection
     super
     @complexConnection = false
     _changed
@@ -127,9 +133,9 @@ class FXMap < Map
       (0...@height).each { |y|
 	m[y * (@width+2)] = (y % 10).to_s
 	loc = y * (@width+2) + x + 1
-	if @pmap[x][y].kind_of?(Connection)
+	if @pmap.at(x).at(y).kind_of?(Connection)
 	  m[loc] = '-'
-	elsif @pmap[x][y].kind_of?(Room)
+	elsif @pmap.at(x).at(y).kind_of?(Room)
 	  m[loc] = 'R'
 	end
       }
@@ -145,7 +151,7 @@ class FXMap < Map
   def _free_area?(x, y, w, h)
     x.upto(x+w) { |xx|
       y.upto(x+h) { |yy|
-	return false if @pmap[xx][yy].kind_of?(Room)
+	return false if @pmap.at(xx).at(yy).kind_of?(Room)
       }
     }
     return true
@@ -230,13 +236,9 @@ class FXMap < Map
     end
 
     # Complex path... Generate points.
-    a = c.roomA
-    b = c.roomB
-
-    dirA = a.exits.index(c)
+    a, b = c.room
+    dirA, dirB = c.dirs
     raise "A connection not found #{c} at #{a}" unless dirA
-
-    dirB = b.exits.rindex(c)
     raise "B connection not found #{c} at #{b}" unless dirB
 
     vA = FXRoom::DIR_TO_VECTOR[dirA]
@@ -271,8 +273,8 @@ class FXMap < Map
 	pB[0] < 0 or pB[0] >= @width or
 	pA[1] < 0 or pA[1] >= @height or
 	pB[1] < 0 or pB[1] >= @height or
-	@pmap[pA[0]][pA[1]].kind_of?(Room) or 
-	@pmap[pB[0]][pB[1]].kind_of?(Room)
+	@pmap.at(pA[0]).at(pA[1]).kind_of?(Room) or 
+	@pmap.at(pB[0]).at(pB[1]).kind_of?(Room)
       remove_connection(c)
       return false
     end
@@ -387,6 +389,7 @@ class FXMap < Map
 	 return nil
        end
     end
+    update_roomlist
     return r
   end
 
@@ -413,7 +416,7 @@ class FXMap < Map
   def to_room(x,y)
     xx = x / WW
     yy = y / HH
-    return @pmap[xx][yy]
+    return @pmap.at(xx).at(yy)
   end
 
   # Given a mouse click x/y position, return object(s) if any or nil
@@ -426,7 +429,7 @@ class FXMap < Map
       xx = x / WW
       yy = y / HH
       return nil if xx >= @width or yy >= @height
-      return @pmap[xx][yy]
+      return @pmap.at(xx).at(yy)
     else
       # Possible arrow
       @sections[@section].connections.each { |c|
@@ -536,8 +539,10 @@ class FXMap < Map
 
       # Then, create an off-screen image with that same size for double
       # buffering
+      @image.release
       @image.destroy
       GC.start
+
       @image = FXBMPImage.new(@window.getApp, nil, IMAGE_SHMI|IMAGE_SHMP, 
 			      width, height)
       @image.create
@@ -794,7 +799,7 @@ class FXMap < Map
   # Based on mouse position on canvas, create a tooltip
   #
   def tooltip_cb(sender, id, ptr)
-    if @tooltip_msg != ''
+    if @zoom < 0.6 and @tooltip_msg != ''
       sender.text = @tooltip_msg.to_s
       sender.show
     else
@@ -821,7 +826,7 @@ class FXMap < Map
       @canvas.defaultCursor = @@cursor_arrow
       if sel.kind_of?(Room)
 	@tooltip_msg = sel.name
-	status "Click to select and move.  Double click to edit room."
+	status "\"#{sel.name}\": Click to select and move.  Double click to edit."
       elsif sel.kind_of?(Connection)
 	status "Click to change direction of connection."
       end
@@ -1043,19 +1048,26 @@ class FXMap < Map
       a = c.roomA
       b = c.roomB
       menu = FXMenuPane.new(@window)
+      if c.dir == Connection::AtoB
+	cmd = FXMenuCommand.new(menu, "Flip Direction")
+	cmd.connect(SEL_COMMAND) { c.flip; draw }
+	FXMenuSeparator.new(menu)
+      end
+
       submenu = FXMenuPane.new(@window)
       old_idx = a.exits.index(c)
       0.upto(7) { |idx|
 	rmb_link_menu( submenu, c, a, idx, old_idx )
       }
       FXMenuCascade.new(menu, a.name, nil, submenu)
-      next if not b
-      submenu = FXMenuPane.new(@window)
-      old_idx = b.exits.rindex(c)
-      0.upto(7) { |idx|
-	rmb_link_menu( submenu, c, b, idx, old_idx )
-      }
-      FXMenuCascade.new(menu, b.name, nil, submenu)
+      if b
+	submenu = FXMenuPane.new(@window)
+	old_idx = b.exits.rindex(c)
+	0.upto(7) { |idx|
+	  rmb_link_menu( submenu, c, b, idx, old_idx )
+	}
+	FXMenuCascade.new(menu, b.name, nil, submenu)
+      end
     end
     if menu
       menu.create
@@ -1227,7 +1239,6 @@ class FXMap < Map
     @automap.destroy if @automap
     @automap = nil
     @window.close
-    GC.start
     return true
   end
 
@@ -1285,9 +1296,6 @@ class FXMap < Map
     			   0, 0, width, height)
     @dirty = true
     # @canvas.connect(SEL_UPDATE, method(:update_cb))
-    if fxversion =~ /^1.4/
-      @canvas.connect(SEL_QUERY_TIP, method(:tooltip_cb))
-    end
 
     @canvas.connect(SEL_PAINT, method(:draw))
     @canvas.backColor = @options['BG Color']
@@ -1301,8 +1309,10 @@ class FXMap < Map
     @canvas.connect(SEL_RIGHTBUTTONPRESS, method(:rmb_click_cb))
     @canvas.connect(SEL_KEYPRESS, method(:keypress_cb))
 
-    if not @@tooltip
+    if fxversion !~ /^1.2/
       @@tooltip = FXToolTip.new(@canvas.app, FXToolTip::TOOLTIP_PERMANENT)
+      # Tooltip is too buggy and annoying.  Turning it off for now.
+      # @canvas.connect(SEL_QUERY_TIP, method(:tooltip_cb))
     end
   end
 
@@ -1314,6 +1324,7 @@ class FXMap < Map
 		 icon = nil, menu = nil, mode = nil, 
 		 x = 0, y = 0, w = 0, h = 0)
     super(name)
+    @mutex      = Mutex.new
     @automap    = nil
     @navigation = false
     if parent
@@ -1381,6 +1392,7 @@ class FXMap < Map
     }
 
     modified = true
+    create_pathmap
     draw
   end
 
@@ -1423,6 +1435,29 @@ class FXMap < Map
     }
   end
 
+  def show_roomlist
+    if @@roomlist
+      @@roomlist.copy_from(self)
+    else
+      @@roomlist = FXRoomList.new(self)
+    end
+    @@roomlist.show
+  end
+
+  def self.no_maps
+    @@roomlist.hide if @@roomlist
+    @@win.hide      if @@win
+    FXRoom::no_maps
+    FXConnection::no_maps
+  end
+
+  #
+  # If roomlist window is present, update it
+  #
+  def update_roomlist
+    @@roomlist.copy_from(self) if @@roomlist
+    @@win.copy_from(self)      if @@win
+  end
 
   #
   # Find and update all paths in path map for a room
@@ -1443,8 +1478,10 @@ class FXMap < Map
   end
 
   def cannot_automap(why)
+    p '----CANNOT AUTOMAP'
     w = FXWarningBox.new(@window, "Cannot automap.\n#{why}")
     w.execute
+    p '----CANNOT AUTOMAP AFTER EXECUTE'
   end
 
 
@@ -1474,7 +1511,7 @@ class FXMap < Map
       x = r.x + dx
       y = r.y + dy
       if x < 0 or y < 0 or x >= @width or y >= @height or
-	  @pmap[x][y].kind_of?(Room)
+	  @pmap.at(x).at(y).kind_of?(Room)
 	store_room_selection(selection)
 	dir = Room::DIRECTIONS[idx]
 	status "Cannot move selection #{dir}."
@@ -1516,7 +1553,7 @@ class FXMap < Map
       y = 0 if y < 0
       x = @width-1  if x > @width-1
       y = @height-1 if y > @height-1
-      if not @pmap[x][y].kind_of?(Room)
+      if not @pmap.at(x).at(y).kind_of?(Room)
 	room.selected = false
 	roomB = new_xy_room(x * WW, y * HH)
 	exitB = roomB.next_to?(room)
@@ -1621,7 +1658,7 @@ class FXMap < Map
 
     (0...@height).each { |yy|
       (0...@width).each { |xx|
-	next if @pmap[xx][yy].kind_of?(Connection)
+	next if @pmap.at(xx).at(yy).kind_of?(Connection)
 	x = xx * ww
 	y = yy * hh
 
@@ -1663,15 +1700,13 @@ class FXMap < Map
     hs_2 = HS_2 * @zoom
 
     #---- dummy check to catch an ugly bug that I cannot track...
-    if @pmap.size != @width or @pmap[0].size != @height
-      puts "**********ERROR:  pmap sizes not != #{@width}x#{@height}"
-    end
+    create_pathmap if @pmap.size < @width or @pmap[0].size < @height
 
     # First, draw horizontal lines
     (0...@height).each { |yy|
       (0..@width-2).each { |xx|
-	next if @pmap[xx][yy].kind_of?(Connection) or
-	  @pmap[xx+1][yy].kind_of?(Connection)
+	next if @pmap.at(xx).at(yy).kind_of?(Connection) or
+	  @pmap.at(xx+1).at(yy).kind_of?(Connection)
 	x1 =       xx * ww + w + ws_2
 	x2 = (xx + 1) * ww + ws_2
     	y1 = yy * hh + h / 2 + hs_2
@@ -1683,8 +1718,8 @@ class FXMap < Map
     # Then, draw vertical lines
     (0...@width).each { |xx|
       (0..@height-2).each { |yy|
-	next if @pmap[xx][yy].kind_of?(Connection) or
-	  @pmap[xx][yy+1].kind_of?(Connection)
+	next if @pmap.at(xx).at(yy).kind_of?(Connection) or
+	  @pmap.at(xx).at(yy+1).kind_of?(Connection)
 	x1 = xx * ww + w / 2 + ws_2
     	y1 =       yy * hh + h + hs_2
 	y2 = (yy + 1) * hh + hs_2
@@ -1716,7 +1751,7 @@ class FXMap < Map
 
     (0...@width).each { |xx|
       (0...@height).each { |yy|
-	next if @pmap[xx][yy]
+	next if @pmap.at(xx).at(yy)
 	x = xx * ww + ws_2
     	y = yy * hh + hs_2
 	dc.drawRectangle( x, y, w, h )
@@ -1743,7 +1778,23 @@ class FXMap < Map
   end
 
   #
-  # Draw rooms
+  # Draw a single room (callback used when editing room dialog box)
+  #
+  def draw_room(room)
+    idx = @sections[@section].rooms.index(room)
+    return unless idx
+
+    dc = FXDCWindow.new(@canvas)
+    dc.font = @font
+    data = { }
+    data['font']    = @font
+    data['objfont'] = @objfont
+    room.draw(dc, @zoom, idx, @options, data)
+    dc.end
+  end
+
+  #
+  # Draw all rooms in current section
   #
   def draw_rooms(dc)
     data = { }
@@ -1778,7 +1829,6 @@ class FXMap < Map
     self.zoom = 1.0
 
     num = pack_sections( @width, @height )
-    puts "Would pack #{@sections.size} into #{num} pages."
     begin
       dc = FXDCPostscript.new(@window.getApp)
       xmax = @width  * WW
@@ -1813,29 +1863,23 @@ class FXMap < Map
     draw
   end
 
-  #
-  # Draw a single room (callback used when editing room dialog box)
-  #
-  def draw_room(room)
-    idx = @sections[@section].rooms.index(room)
-    return unless idx
-
-    dc = FXDCWindow.new(@canvas)
-    dc.font = @font
-    data = { }
-    data['font']    = @font
-    data['objfont'] = @objfont
-    room.draw(dc, @zoom, idx, @options, data)
-    dc.end
-  end
 
   #
   # Draw map
   #
   def draw(sender = nil, sel = nil, event = nil)
+    return if @mutex.locked?
+
+    if not @image.created?
+      puts "Image was not created.  Try again"
+      self.zoom = @zoom 
+    end
+
     pos = @scrollwindow.position
     w   = @scrollwindow.getViewportWidth
     h   = @scrollwindow.getViewportHeight
+
+    # The -5 seems to be a bug in fox.  don't ask me.
     cx  = -pos[0]-5
     cx  = 0 if cx < 0
     cy  = -pos[1]-5
@@ -1864,6 +1908,7 @@ class FXMap < Map
     dc.setClipRectangle( cx, cy, w, h)
     dc.drawImage(@image,0,0)
     dc.end
+
   end
 
 
@@ -1913,14 +1958,57 @@ class FXMap < Map
     end
   end
 
+
+  #
+  # Export map as an IFM map file
+  #
+  def export_ifm(file)
+    require 'IFMapper/IFMWriter'
+    file += '.ifm' if file !~ /\.ifm$/
+    IFMWriter.new(map, file)
+  end
+
+
+  #
+  # Export map as a set of TADS3 source code files
+  #
+  def export_tads(file)
+    require 'IFMapper/TADSWriter'
+    file.sub!(/(-\d+)?\.t/, '')
+    TADSWriter.new(self, file)
+  end
+
+  #
+  # Export map as a set of Inform source code files
+  #
+  def export_inform(file)
+    require 'IFMapper/InformWriter'
+    file.sub!(/(-\d+)?\.inf/, '')
+    InformWriter.new(self, file)
+  end
+
   #
   # Save the map under a new filename, bringing up a filerequester
   #
   def save_as
     file = FXMapFileDialog.new(@window, "Save Map #{@name}").filename
     if file != ''
-      @filename = file
-      return _save
+      if File.exists?(file)
+	dlg = FXWarningBox.new(@window, "#{file}\nalready exists.  Are you sure you want to overwrite it?")
+	return if dlg.execute == 0
+      end
+
+      case file
+      when /\.inf$/
+	export_inform(file)
+      when /\.ifm$/
+	export_ifm(file)
+      when /\.t$/
+	export_tads(file)
+      else
+	@filename = file
+	return _save
+      end
     end
     return false
   end
@@ -1951,12 +2039,25 @@ class FXMap < Map
 
     file = FXMapFileDialog.new(@window, "Load Transcript", 
 			       [
-				 "Transcript File (*.log)",
+				 "Transcript File (*.log,*.scr,*.txt)",
 				 "All Files (*)"
 			       ]).filename
     return if file == ''
     require 'IFMapper/TranscriptReader'
-    @automap = TranscriptReader.new(self, file)
+
+    begin
+      @automap = TranscriptReader.new(self, file)
+      @automap.properties(true)
+    rescue Errno::EACCES, Errno::ENOENT => e
+      dlg = FXWarningBox.new(@window, "Cannot open transcript\n#{e}")
+      dlg.execute
+      return
+    rescue => e
+      puts e.backtrace
+      dlg = FXWarningBox.new(@window, "Internal error parsing transcript\nPlease report as a bug\n#{e}\n#{e.backtrace}")
+      dlg.execute
+      raise
+    end
     @automap.start
     create_pathmap
     draw