ifmapper 0.9 → 0.9.5

data/lib/IFMapper/FXMapperWindow.rb

@@ -6,10 +6,7 @@ begin
 rescue LoadError
 end
 
-begin
-  require 'fox12'
-  require 'fox12/colors'
-rescue LoadError => e
+def no_fox
   $stderr.puts "Please install the FXRuby (FOX) library v1.2 or later."
   if $rubygems
     $stderr.puts "You can usually do so if you do 'gem install fxruby'."
@@ -17,6 +14,28 @@ rescue LoadError => e
   exit(1)
 end
 
+def get_fox
+  ##### ARRRGH!!!! Why does Lyle keep changing the fxruby name on each
+  ##### release!
+  foxes = [ 'fox14', 'fox12', 'fox' ]
+  foxes.each { |fox|
+    begin
+      require "#{fox}"
+      require "#{fox}/colors"
+      break
+    rescue LoadError
+      no_fox if fox == foxes[-1]
+    end
+  }
+  
+  # verify fxruby version
+  ver, rev, = Fox::fxrubyversion().split('.')
+  no_fox if ver.to_i < 1 or rev.to_i < 2
+end
+
+get_fox
+include Fox
+
 begin
   require 'yaml'
 rescue LoadError => e
@@ -25,7 +44,6 @@ rescue LoadError => e
 end
 
 
-include Fox
 
 require 'IFMapper/FXMap'
 require 'IFMapper/FXMapperSettings'
@@ -34,13 +52,14 @@ require 'IFMapper/FXAboutDialogBox'
 require 'IFMapper/FXSearchDialogBox'
 require 'IFMapper/FXMapFileDialog'
 require 'IFMapper/FXMapColorBox'
+require 'IFMapper/FXRoomList'
 
 
 
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '0.9'
+  VERSION      = '0.9.5'
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -62,28 +81,52 @@ class FXMapperWindow < FXMainWindow
 
   def open_ifm(file, map)
     require 'IFMapper/IFMReader'
-    IFMReader.new(file, map)
+    begin
+      IFMReader.new(file, map)
+    rescue => e
+      return e
+    end
     return map
   end
 
   def open_tads(file, map)
     require 'IFMapper/TADSReader'
-    TADSReader.new(file, map)
+    begin
+      TADSReader.new(file, map)
+    rescue => e
+      return e
+    end
     return map
   end
 
   def open_inform(file, map)
     require 'IFMapper/InformReader'
-    InformReader.new(file, map)
+    begin
+      InformReader.new(file, map)
+    rescue => e
+      return e
+    end
     return map
   end
 
+  #
+  # Start automapping from a transcript
+  #
   def start_automap_cb(sender, sel, ptr)
     map = current_map
     return if not map
     map.start_automap
   end
 
+  def automap_properties_cb(sender, sel, ptr)
+    map = current_map
+    return if not map or not map.automap
+    map.automap.properties(true)
+  end
+
+  #
+  # Stop automapping from a transcript
+  #
   def stop_automap_cb(sender, sel, ptr)
     map = current_map
     return if not map
@@ -136,10 +179,12 @@ class FXMapperWindow < FXMainWindow
     end
 
     if not tmp.kind_of?(Map) and not tmp.kind_of?(FXMap)
-      status "Could not load '#{file}'. Error: #{tmp}."
-      if map.close_cb
-	@maps.delete(map) if make_new_map
-	GC.start
+      status "Could not load '#{file}'. Error: #{tmp}." 
+      if make_new_map
+	if map.close_cb
+	  @maps.delete(map)
+	  GC.start
+	end
       end
       sleep 2
       return
@@ -151,7 +196,7 @@ class FXMapperWindow < FXMainWindow
     map.fit
     map.window.create
     map.modified = false
-    update_section
+    update_map
     status "Loaded '#{file}'."
   end
 
@@ -186,25 +231,32 @@ class FXMapperWindow < FXMainWindow
     m.window.create
   end
 
+  #
+  # Create a new map
+  #
   def new_map
     mapname  = "Empty Map \##{@maps.size+1}"
     @maps.push( FXMap.new(mapname, @mdiclient, @@default_options.dup,
 			  @mdiicon, @mdimenu, MDI_NORMAL, 0, 0, 790, 500) )
-    @maps[-1].window.connect(SEL_PAINT) { |sender, sel, event|
-      map = current_map
+    map = @maps[-1]
+    map.window.connect(SEL_PAINT) {
       map.draw
     }
-    @maps[-1].window.connect(SEL_CLOSE) { |sender, sel, event|
-      map = current_map
+    map.window.connect(SEL_CLOSE) {
       if map.close_cb
 	@maps.delete(map)
-	GC.start
+      end
+      if @maps[-1]
+	@maps[-1].update_roomlist
+      else
+	FXMap::no_maps
       end
     }
 
     # Make it active
-    @mdiclient.setActiveChild(@maps[-1].window)
-    return @maps[-1]
+    @mdiclient.setActiveChild(map.window)
+    map.update_roomlist
+    return map
   end
 
   # Load the named PNG icon from a file
@@ -221,12 +273,18 @@ class FXMapperWindow < FXMainWindow
     end
   end
 
+  #
+  # Start a complex connection
+  #
   def complex_connection_cb(sender, sel, msg)
     map = current_map
     return unless map
     map.complex_connection
   end
 
+  #
+  # Delete selected elements in map
+  #
   def delete_selected_cb(sender, sel, msg)
     map = current_map
     return unless map
@@ -244,11 +302,15 @@ class FXMapperWindow < FXMainWindow
     return false
   end
 
+  #
+  # Print out all the locations in map
+  #
   def print_locations_cb(sender, sel, msg)
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, "Sorry, but printing is not yet implemented\n" + 
+    w = FXWarningBox.new( self, 
+			 "Sorry, but printing is not yet implemented\n" + 
 			 "in this version.")
     w.execute
     return
@@ -257,41 +319,38 @@ class FXMapperWindow < FXMainWindow
     map.print_locations( printer ) if printer
   end
 
+  #
+  # Export current map as an IFM file
+  #
   def ifm_export_cb(sender, sel, msg)
     map = current_map
     return unless map
 
-    require 'IFMapper/IFMWriter'
-
     d = FXMapFileDialog.new(self, "Save Map as IFM File", 
 			    [
 			      "IFM Map (*.ifm)"
 			    ])
-    if d.filename != ''
-      file  = d.filename
-      file += '.ifm' if file !~ /\.ifm$/
-      IFMWriter.new(map, file)
-    end
+    map.export_ifm(d.filename) if d.filename != ''
   end
 
+  #
+  # Export current map as an Inform source file
+  #
   def inform_export_cb(sender, sel, msg)
     map = current_map
     return unless map
 
-    require 'IFMapper/InformWriter'
-
     d = FXMapFileDialog.new(self, "Save Map as Inform Files", 
 			    [
 			      "Inform Source Code (*.inf)"
 			    ])
-    if d.filename != ''
-      file  = d.filename
-      file.sub!(/(-\d+)?\.inf/, '')
-      InformWriter.new(map, file)
-    end
+    map.export_inform( d.filename ) if d.filename != ''
   end
 
 
+  #
+  # Export current map as a TADs source file
+  #
   def tads_export_cb(sender, sel, msg)
     map = current_map
     return unless map
@@ -302,14 +361,13 @@ class FXMapperWindow < FXMainWindow
 			    [
 			      "TADS Source Code (*.t)"
 			    ])
-    if d.filename != ''
-      file  = d.filename
-      file.sub!(/(-\d+)?\.t/, '')
-      TADSWriter.new(map, file)
-    end
+    map.export_tads( d.filename ) if d.filename != ''
   end
 
 
+  #
+  # Export current map as Acrobat PDF
+  #
   def pdf_export_cb(sender, sel, msg)
     map = current_map
     return unless map
@@ -322,8 +380,6 @@ class FXMapperWindow < FXMainWindow
       return
     end
 
-
-
     d = FXMapFileDialog.new(self, "Save Acrobat PDF File", 
 			    [
 			      "Acrobat PDF (*.pdf)"
@@ -333,11 +389,15 @@ class FXMapperWindow < FXMainWindow
     end
   end
 
+  #
+  # Print current map graphically
+  #
   def print_cb(sender, sel, msg)
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, "Sorry, but printing is not yet implemented\n" + 
+    w = FXWarningBox.new( self, 
+			 "Sorry, but printing is not yet implemented\n" + 
 			 "in this version.")
     w.execute
     return
@@ -347,11 +407,24 @@ class FXMapperWindow < FXMainWindow
     map.print( printer ) if printer
   end
 
+  def update_map
+    map = current_map
+    return unless map
+    map.update_roomlist
+    update_section
+  end
+
+  #
+  # Creates the MDI (multi-document) client
+  #
   def create_mdiclient
     # MDI Client
     @maps = []
 
     @mdiclient = FXMDIClient.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @mdiclient.connect(SEL_CHANGED) { 
+      update_map
+    }
 
     # MDI buttons in menu:- note the message ID's!!!!!
     # Normally, MDI commands are simply sensitized or desensitized;
@@ -373,10 +446,16 @@ class FXMapperWindow < FXMainWindow
     @mdimenu = FXMDIMenu.new(self, @mdiclient)
   end
 
+  #
+  # Return the copied elements 
+  #
   def self.copy_buffer
     return @@copy_buffer
   end
 
+  #
+  # Copy selected elements
+  #
   def self.copy_selected(map)
     sect = map.sections[map.section]
 
@@ -391,7 +470,10 @@ class FXMapperWindow < FXMainWindow
     # those rooms we selected
     delete = []
     links.each { |c|
-      delete << c if not rooms.include?(c.roomA) or not rooms.include?(c.roomB)
+      if not rooms.include?(c.roomA) or 
+	  (c.roomB and not rooms.include?(c.roomB))
+	delete << c
+      end
     }
     links -= delete
 
@@ -400,11 +482,17 @@ class FXMapperWindow < FXMainWindow
     @@copy_buffer = selection
   end
 
+  #
+  # Cut selected elements
+  #
   def self.cut_selected(map)
     FXMapperWindow::copy_selected(map)
     map.cut_selected
   end
 
+  #
+  # Paste selected elements
+  #
   def self.paste_selected(map)
     return if not @@copy_buffer
     return map.navigation_warning if map.navigation
@@ -431,33 +519,38 @@ class FXMapperWindow < FXMainWindow
       if rooms.empty?
 	# Add connections only (no rooms copied)
 	sel[1].each { |c|
-	  exitA = c.roomA.exits.index(c)
-	  exitB = c.roomB.exits.rindex(c)
+	  exitA, exitB = c.dirs
 	  roomA = c.roomA
 	  roomB = c.roomB
 	  sect  = map.sections[map.section]
-	  next unless sect.rooms.include?(roomA) and sect.rooms.include?(roomB)
+	  if not sect.rooms.include?(roomA) or 
+	      (roomB and not sect.rooms.include?(roomB))
+	    next
+	  end
 	  begin
-	    c = map.new_connection(roomA, exitA, roomB, exitB)
-	    c.selected = true
+	    nc = map.new_connection(roomA, exitA, roomB, exitB)
+	    nc.selected = true
+	    nc.dir = c.dir
+	    nc.type = c.type
 	  rescue
 	  end
 	}
       else
 	# Add connections
 	sel[1].each { |c|
-	  exitA = c.roomA.exits.index(c)
-	  exitB = c.roomB.exits.rindex(c)
+	  exitA, exitB = c.dirs
 	  roomA = r_to_nr[c.roomA]
-	  roomB = r_to_nr[c.roomB]
-	  next if not roomA or not roomB
-	  if not exitA
-	    puts "WHOA!  #{c}  #{roomA} #{exitA} is empty"
-	    next
+	  if c.roomB
+	    roomB = r_to_nr[c.roomB]
+	  else
+	    roomB = nil
 	  end
+	  next if not roomA
 	  begin
-	    c = map.new_connection(roomA, exitA, roomB, exitB)
-	    c.selected = true
+	    nc = map.new_connection(roomA, exitA, roomB, exitB)
+	    nc.selected = true
+	    nc.dir  = c.dir
+	    nc.type = c.type
 	  rescue Section::ConnectionError => e
 	    puts c
 	    puts e
@@ -489,6 +582,9 @@ class FXMapperWindow < FXMainWindow
   end
 
 
+  #
+  # Hilite matches after a search
+  #
   def hilite_matches(map, matches, re, idx = 0 )
     if matches.size == 0
       status "No matches for regex '#{re}'."
@@ -518,6 +614,9 @@ class FXMapperWindow < FXMainWindow
     map.draw
   end
 
+  #
+  # Find location in map
+  #
   def find_in_map(s, m, e)
     map = current_map
     return unless map
@@ -549,6 +648,9 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  #
+  # Find location in section
+  #
   def find_in_section(s, m, e)
     map = current_map
     return unless map
@@ -562,6 +664,9 @@ class FXMapperWindow < FXMainWindow
     hilite_matches(map, matches, re)
   end
 
+  #
+  # Callback
+  #
   def find_in_section_cb(s, m, e)
     map = current_map
     return unless map
@@ -576,6 +681,9 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  #
+  # Find object in map
+  #
   def find_object_in_map(s, m, e)
     map = current_map
     return unless map
@@ -593,6 +701,9 @@ class FXMapperWindow < FXMainWindow
     hilite_matches(map, matches, re, @search.index)
   end
 
+  #
+  # Find task in map
+  #
   def find_task_in_map(s, m, e)
     map = current_map
     return unless map
@@ -610,6 +721,9 @@ class FXMapperWindow < FXMainWindow
     hilite_matches(map, matches, re, @search.index)
   end
 
+  #
+  # Find object in map
+  #
   def find_object_in_map_cb(s, m, e)
     map = current_map
     return unless map
@@ -624,6 +738,9 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  #
+  # Find task in map
+  #
   def find_task_in_map_cb(s, m, e)
     map = current_map
     return unless map
@@ -638,6 +755,9 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  #
+  # Pop-up color preferences
+  #
   def colors_cb(sender, id, msg)
     map = current_map
     return if not map
@@ -650,20 +770,18 @@ class FXMapperWindow < FXMainWindow
     @colors.copy_from(map)
   end
 
-
+  #
+  # Unselect all
+  #
   def select_none_cb( sender, id, event )
     map = current_map
     return if not map
-    sect = map.sections[map.section]
-    sect.rooms.each { |r|
-      r.selected = false
-    }
-    sect.connections.each { |c|
-      c.selected = false
-    }
+    map.clear_selection
   end
 
-
+  #
+  # Select all
+  #
   def select_all_cb( sender, id, event )
     map = current_map
     return if not map
@@ -676,11 +794,19 @@ class FXMapperWindow < FXMainWindow
     }
   end
 
+  def roomlist(sender, sel, event)
+    map = current_map
+    return unless map
+    map.show_roomlist
+  end
+
 
   def about_cb(sender, id, event )
     FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
 #{TITLE} - #{VERSION}
 
+FXRuby Version: #{Fox::fxrubyversion}
+
 A WYSIWYG mapping tool for interactive fiction.
 Written by Gonzalo Garramuno.
 
@@ -689,6 +815,7 @@ EOF
   end
 
 
+
   def create_menus
     # Construct these icons
     newdoc    = load_icon("filenew")
@@ -786,9 +913,12 @@ EOF
     # Map menu
     mapmenu = FXMenuPane.new(self)
 
-    cmd = FXMenuCommand.new(mapmenu, "Map Information\t\tChange Map Information.")
+    cmd = FXMenuCommand.new(mapmenu, "Map Information\t\tChange map information.")
     cmd.connect(SEL_COMMAND) {  map_properties }
 
+    cmd = FXMenuCommand.new(mapmenu, "Room List\t\tList all rooms in map.")
+    cmd.connect(SEL_COMMAND, method(:roomlist) )
+
     # Automap submenu
     #
     submenu = FXMenuPane.new(self)
@@ -796,6 +926,9 @@ EOF
     cmd.connect(SEL_COMMAND, method(:start_automap_cb))
     cmd = FXMenuCommand.new(submenu, "S&top...\tCtl-P\tStop autocreating map.")
     cmd.connect(SEL_COMMAND, method(:stop_automap_cb))
+    FXMenuSeparator.new(submenu)
+    cmd = FXMenuCommand.new(submenu, "&Properties...\tCtl-H\tTranscript properties.")
+    cmd.connect(SEL_COMMAND, method(:automap_properties_cb))
     FXMenuCascade.new(mapmenu, "Automap", nil, submenu)
 
     # Sections submenu
@@ -833,6 +966,7 @@ EOF
       if map
 	map.delete_section
 	map.modified = true
+	update_section
       end
     }
     FXMenuCascade.new(mapmenu, "Sections", nil, submenu)
@@ -1233,7 +1367,8 @@ EOF
   #
   def update_section
     map = current_map
-    @section.text = (map.section + 1).to_s if map
+    return unless map
+    @section.text = (map.section + 1).to_s
   end
 
   #