ifmapper 0.5 → 0.6

data/lib/IFMapper/FXMapColorBox.rb

@@ -0,0 +1,92 @@
+
+require 'fox12/colors'
+
+class FXMapColorBox < FXDialogBox
+
+  def copy_from(map)
+    @backwell.rgba     = map.options['BG Color']
+    @boxwell.rgba      = map.options['Box BG Color']
+    @boxdarknesswell.rgba  = map.options['Box Darkness Color']
+    @boxnumberwell.rgba    = map.options['Box Number Color']
+    @boxborderwell.rgba    = map.options['Box Border Color']
+    @arrowwell.rgba       = map.options['Arrow Color']
+    @map = map
+  end
+
+  def copy_to(sender, id, event)
+    @map.options['BG Color'] = @backwell.rgba
+    @map.options['Box BG Color'] = @boxwell.rgba
+    @map.options['Box Darkness Color'] = @boxdarknesswell.rgba
+    @map.options['Box Number Color'] = @boxnumberwell.rgba
+    @map.options['Box Border Color'] = @boxborderwell.rgba
+    @map.options['Arrow Color'] = @arrowwell.rgba
+    @map.draw
+  end
+
+  def initialize(parent)
+    decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
+    super(parent, "Color Preferences", decor)
+
+    # pane for the buttons
+    contents = FXVerticalFrame.new(self, (FRAME_SUNKEN|LAYOUT_FILL_Y|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+
+    FXLabel.new(frame, "&Background Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @backwell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @backwell.connect(SEL_COMMAND, method(:copy_to))
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    FXLabel.new(frame, "&Arrows Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @arrowwell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @arrowwell.connect(SEL_COMMAND, method(:copy_to))
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    FXLabel.new(frame, "&Box Background Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @boxwell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @boxwell.connect(SEL_COMMAND, method(:copy_to))
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    FXLabel.new(frame, "&Box Darkness Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @boxdarknesswell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @boxdarknesswell.connect(SEL_COMMAND, method(:copy_to))
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    FXLabel.new(frame, "&Box Border Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @boxborderwell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @boxborderwell.connect(SEL_COMMAND, method(:copy_to))
+
+    frame = FXHorizontalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_X|
+      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    FXLabel.new(frame, "&Box Number Color", nil,
+		JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    @boxnumberwell = FXColorWell.new(frame, FXColor::White,
+      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+    @boxnumberwell.connect(SEL_COMMAND, method(:copy_to))
+
+    create
+    show
+  end
+end

data/lib/IFMapper/FXMapDialogBox.rb

@@ -6,13 +6,71 @@ class FXMapDialogBox < FXDialogBox
     @map.name       = @name.text
     @map.creator    = @creator.text
     @map.navigation = (@read.checkState == 1)
+
+    if @map.navigation
+      @name.disable
+      @creator.disable
+      @width.disable
+      @height.disable
+    else
+      @name.enable
+      @creator.enable
+      @width.enable
+      @height.enable
+    end
+
+    w = @width.text.to_i
+    h = @height.text.to_i
+
     @map.update_title
+
+    if w != @map.width or h != @map.height
+      if w < @map.width or h < @map.height
+	rooms = []
+	@map.sections.each { |s|
+	  s.rooms.each { |r|
+	    if r.x <= w or r.y <= h
+	      rooms << [s, r]
+	    end
+	  }
+	}
+	if not rooms.empty?
+	  d = FXWarningBox.new(@map.window, "When changing map size,\nsome rooms will be left outside of map.\nThese rooms will be deleted.\nAre you sure you want to do this?")
+	  if d.execute == 0
+	    copy_from(@map)
+	    return
+	  end
+	  rooms.each { |p| 
+	    p[0].delete_room(p[1])
+	  }
+	end
+      end
+      @map.width      = w
+      @map.height     = h
+      @map.zoom       = @map.zoom
+      @map.create_pathmap
+      @map.draw
+    end
+
   end
 
   def copy_from(map)
     @name.text       = map.name
     @creator.text    = map.creator
     @read.checkState = map.navigation
+    @width.text      = map.width.to_s
+    @height.text     = map.height.to_s
+    if map.navigation
+      @name.disable
+      @creator.disable
+      @width.disable
+      @height.disable
+    else
+      @name.enable
+      @creator.enable
+      @width.enable
+      @height.enable
+    end
     @map = map
   end
 
@@ -24,24 +82,42 @@ class FXMapDialogBox < FXDialogBox
 				    FRAME_SUNKEN|FRAME_THICK|
 				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
+    @read = FXCheckButton.new(mainFrame, "Read Only Map", nil, 0,
+			      ICON_BEFORE_TEXT|LAYOUT_LEFT|LAYOUT_SIDE_TOP|
+			      LAYOUT_SIDE_RIGHT)
+
     frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
     FXLabel.new(frame, "Name: ", nil, 0, LAYOUT_FILL_X)
-    @name = FXTextField.new(frame, 40, nil, 0, LAYOUT_FILL_ROW)
+    @name = FXTextField.new(frame, 42, nil, 0, LAYOUT_FILL_ROW)
 
-    frame = FXVerticalFrame.new(mainFrame, 
-				LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    frame = FXHorizontalFrame.new(mainFrame, 
+				  LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
     FXLabel.new(frame, "Creator: ", nil, 0, LAYOUT_FILL_X)
     @creator = FXTextField.new(frame, 40, nil, 0, LAYOUT_FILL_ROW)
-    
-    @read = FXCheckButton.new(frame, "Read Only Map", nil, 0,
-			      ICON_BEFORE_TEXT|LAYOUT_LEFT|
-			      LAYOUT_SIDE_RIGHT)
+
+    frame = FXHorizontalFrame.new(mainFrame, 
+				  LAYOUT_SIDE_TOP|FRAME_SUNKEN|
+				  LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+    frame2 = FXVerticalFrame.new(frame,
+				 LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y )
+    FXLabel.new(frame2, "Map Width", nil, 0, LAYOUT_FILL_X)
+    @width = FXTextField.new( frame2, 6, nil, 0,
+			     TEXTFIELD_INTEGER|LAYOUT_FILL_ROW)
+
+    frame2 = FXVerticalFrame.new(frame,
+				 LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y )
+    FXLabel.new(frame2, "Map Height", nil, 0, LAYOUT_FILL_X)
+    @height = FXTextField.new( frame2, 6, nil, 0, 
+			      TEXTFIELD_INTEGER|LAYOUT_FILL_ROW)
 
     @name.connect(SEL_CHANGED) { copy_to() }
     @creator.connect(SEL_CHANGED) { copy_to() }
     @read.connect(SEL_COMMAND) { copy_to() }
+    @width.connect(SEL_COMMAND) { copy_to() }
+    @height.connect(SEL_COMMAND) { copy_to() }
     
     @parent = parent
 

data/lib/IFMapper/FXMapperSettings.rb

@@ -34,6 +34,7 @@ class FXMapperSettings < Hash
 		     'Automatic Connection' => true,
 		     
 		     # Display options
+		     'Use Room Cursor'      => false,
 		     'Paths as Curves'      => true,
 		     'Location Numbers'     => true,
 		     'Grid Boxes' => true,

data/lib/IFMapper/FXMapperWindow.rb

@@ -26,13 +26,14 @@ require 'IFMapper/FXWarningBox'
 require 'IFMapper/FXAboutDialogBox'
 require 'IFMapper/FXSearchDialogBox'
 require 'IFMapper/FXMapFileDialog'
+require 'IFMapper/FXMapColorBox'
 require 'IFMapper/IFMReader'
 
 
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = 0.5
+  VERSION      = 0.6
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -74,7 +75,7 @@ class FXMapperWindow < FXMainWindow
     # If not, we need to create a new map
     make_new_map = false
     if @maps.size == 1
-      @maps[0].pages.each { |p|
+      @maps[0].sections.each { |p|
 	if p.rooms.size != 0
 	  make_new_map = true
 	  break
@@ -111,7 +112,7 @@ class FXMapperWindow < FXMainWindow
     map.create_pathmap
     map.update_title
     map.window.create
-    update_page
+    update_section
     status "Loaded '#{file}'."
   end
 
@@ -323,7 +324,7 @@ class FXMapperWindow < FXMainWindow
   end
 
   def self.copy_selected(map)
-    selection = map.pages[map.page].rooms.find_all { |r| r.selected }
+    selection = map.sections[map.section].rooms.find_all { |r| r.selected }
     return if selection.size > 1
     @@copy_buffer = selection[0]
   end
@@ -334,7 +335,7 @@ class FXMapperWindow < FXMainWindow
   end
 
   def self.paste_selected(map)
-    selection = map.pages[map.page].rooms.find_all { |r| r.selected }
+    selection = map.sections[map.section].rooms.find_all { |r| r.selected }
     selection.each { |r| r.copy(@@copy_buffer) }
   end
 
@@ -362,18 +363,18 @@ class FXMapperWindow < FXMainWindow
       return
     end
 
-    # sort matches by page
+    # sort matches by section
     matches.sort_by { |a| a[0] }
 
-    # Jump to first page of match
-    map.page = matches[idx][0]
-    map.pages[map.page].rooms.each { |r| r.selected = false }
+    # Jump to first section of match
+    map.section = matches[idx][0]
+    map.sections[map.section].rooms.each { |r| r.selected = false }
 
     matches.each { |p, r| r.selected = true }
 
     num = matches.find_all { |p, r| p == matches[idx][0] }
 
-    status "#{matches.size} in map, #{num.size} in page."
+    status "#{matches.size} in map, #{num.size} in section."
     map.draw
   end
 
@@ -383,8 +384,8 @@ class FXMapperWindow < FXMainWindow
 
     re = /#{s.text}/
     matches = []
-    (0...map.pages.size).each { |p|
-      map.pages[p].rooms.each { |r|
+    (0...map.sections.size).each { |p|
+      map.sections[p].rooms.each { |r|
 	next unless r.name =~ re
 	matches.push( [p, r] )
       }
@@ -408,20 +409,20 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
-  def find_in_page(s, m, e)
+  def find_in_section(s, m, e)
     map = current_map
     return unless map
 
     re = /#{s.text}/
     matches = []
-    map.pages[map.page].rooms.each { |r|
+    map.sections[map.section].rooms.each { |r|
       next unless r.name =~ re
-      matches.push( [ map.page, r] )
+      matches.push( [ map.section, r] )
     }
     hilite_matches(map, matches, re)
   end
 
-  def find_in_page_cb(s, m, e)
+  def find_in_section_cb(s, m, e)
     map = current_map
     return unless map
 
@@ -429,7 +430,7 @@ class FXMapperWindow < FXMainWindow
     if not @search
       @search = FXSearchDialogBox.new(self)
     end
-    @search.proc  = method(:find_in_page)
+    @search.proc  = method(:find_in_section)
     @search.title = title
     @search.text  = ''
     @search.show
@@ -441,8 +442,8 @@ class FXMapperWindow < FXMainWindow
 
     re = /#{s.text}/
     matches = []
-    (0...map.pages.size).each { |p|
-      map.pages[p].rooms.each { |r|
+    (0...map.sections.size).each { |p|
+      map.sections[p].rooms.each { |r|
 	next unless r.objects =~ re
 	matches.push( [p, r] )
       }
@@ -466,6 +467,18 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  def colors_cb(sender, id, msg)
+    map = current_map
+    return if not map
+
+    if not @colors
+      @colors = FXMapColorBox.new(self)
+    else
+      @colors.show
+    end
+    @colors.copy_from(map)
+  end
+
   def about_cb(sender, id, msg)
     FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
 #{TITLE} - #{VERSION}
@@ -541,8 +554,8 @@ EOF
     FXMenuSeparator.new(editmenu)
     cmd = FXMenuCommand.new(editmenu, "&Search Location in Map\tCtl-F\tFind a Location Name in Map")
     cmd.connect(SEL_COMMAND, method(:find_in_map_cb))
-    cmd = FXMenuCommand.new(editmenu, "&Search Location in Section\tAlt-F\tFind a Location Name in Current Page")
-    cmd.connect(SEL_COMMAND, method(:find_in_page_cb))
+    cmd = FXMenuCommand.new(editmenu, "&Search Location in Section\tAlt-F\tFind a Location Name in Current Section")
+    cmd.connect(SEL_COMMAND, method(:find_in_section_cb))
     cmd = FXMenuCommand.new(editmenu, "&Search Object in Map\tAlt-O\tFind Location with an Object in the Map")
     cmd.connect(SEL_COMMAND, method(:find_object_in_map_cb))
 
@@ -564,27 +577,27 @@ EOF
     submenu = FXMenuPane.new(self)
     cmd = FXMenuCommand.new(submenu, "Next Section\t\tGo to Next Map Section.")
     cmd.connect(SEL_COMMAND) { 
-      next_page
+      next_section
     }
     cmd = FXMenuCommand.new(submenu, "Previous Section\t\tGo to Previous Map Section.")
     cmd.connect(SEL_COMMAND) { 
-      previous_page
+      previous_section
     }
     FXMenuSeparator.new(submenu)
     cmd = FXMenuCommand.new(submenu, "Add Section\t\tAdd a New Section to Map.")
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
-	map.new_page
+	map.new_section
 	map.modified = true
-	update_page
+	update_section
       end
     }
     cmd = FXMenuCommand.new(submenu, "Rename Section\t\tRename Current Section.")
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
-	map.rename_page
+	map.rename_section
 	map.modified = true
       end
     }
@@ -593,7 +606,7 @@ EOF
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
-	map.delete_page
+	map.delete_section
 	map.modified = true
       end
     }
@@ -658,6 +671,20 @@ EOF
     # Display submenu
     #########################
     submenu = FXMenuPane.new(self)
+    cmd = FXMenuCheck.new(submenu, "Use Room Cursor\t\tMake your mouse cursor a room showing the direction of exit.")
+    cmd.check = @@default_options['Use Room Cursor']
+    cmd.connect(SEL_COMMAND) { |s, m, e|
+      map = current_map
+      if map
+	map.options['Use Room Cursor'] = (s.check == true)
+	map.draw
+      end
+    }
+    cmd.connect(SEL_UPDATE) { |s, m, e|
+      map = current_map
+      s.check = map.options['Use Room Cursor'] if map
+    }
+
     cmd = FXMenuCheck.new(submenu, "Paths as Curves\t\tDraw complex paths as curves.")
     cmd.check = @@default_options['Paths as Curves']
     cmd.connect(SEL_COMMAND) { |s, m, e|
@@ -731,6 +758,8 @@ EOF
 
     submenu = FXMenuPane.new(self)
     cmd = FXMenuCommand.new(submenu, "Colors\t\tChange map colors.")
+    cmd.connect(SEL_COMMAND, method(:colors_cb))
+
     FXMenuSeparator.new(submenu)
     cmd = FXMenuCommand.new(submenu, "Save Preferences\t\tSave Preferences for Startup")
     cmd.connect(SEL_COMMAND) { 
@@ -912,62 +941,62 @@ EOF
     cmd.connect(SEL_COMMAND) { zoom_out }
 
 
-    # Page travel
+    # Section travel
     frame = FXHorizontalFrame.new(toolbar,
 				  LAYOUT_RIGHT|FRAME_THICK|FRAME_RAISED)
     cmd = FXButton.new(frame, "\tPrevious Section", load_icon("prevpage"), 
 		       @mdiclient,
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
-    cmd.connect(SEL_COMMAND) { previous_page }
+    cmd.connect(SEL_COMMAND) { previous_section }
 
-    @page = FXTextField.new(frame, 5, nil, 0, 
+    @section = FXTextField.new(frame, 5, nil, 0, 
 			    TEXTFIELD_INTEGER|LAYOUT_FILL_ROW)
-    @page.text = '1'
-    @page.connect(SEL_COMMAND) { |s,m,e| 
+    @section.text = '1'
+    @section.connect(SEL_COMMAND) { |s,m,e| 
       v = s.text.to_i
       map = current_map
       if map
-	map.page = v - 1
+	map.section = v - 1
 	map.draw
-	update_page
+	update_section
       end
     }
-    @page.connect(SEL_UPDATE) {  |s,m,e| 
+    @section.connect(SEL_UPDATE) {  |s,m,e| 
       v = s.text.to_i
       map = current_map
-      update_page if map
+      update_section if map
     }
 
     cmd = FXButton.new(frame, "\tNext Section", load_icon("nextpage"), 
 		       @mdiclient,
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
-    cmd.connect(SEL_COMMAND) { next_page }    
+    cmd.connect(SEL_COMMAND) { next_section }    
   end
 
   #
-  # Update page # in toolbar widget
+  # Update section # in toolbar widget
   #
-  def update_page
+  def update_section
     map = current_map
-    @page.text = (map.page + 1).to_s if map
+    @section.text = (map.section + 1).to_s if map
   end
 
   #
-  # Go to next page in current map
+  # Go to next section in current map
   #
-  def next_page
+  def next_section
     map = current_map
-    map.next_page if map
-    update_page
+    map.next_section if map
+    update_section
   end
 
   #
-  # Go to previous page in current map
+  # Go to previous section in current map
   #
-  def previous_page 
+  def previous_section 
     map = current_map
-    map.previous_page if map
-    update_page
+    map.previous_section if map
+    update_section
   end
 
   #
@@ -1047,5 +1076,10 @@ EOF
     }
 
     show
+
+    # Trap CTRL-C signals and exit nicely
+    trap('SIGINT') { 
+      exit(0)
+    }
   end
 end