ifmapper 0.6 → 0.7

data/lib/IFMapper/FXDCPrint.rb

@@ -0,0 +1,15 @@
+
+class FXDCPrint
+  alias :old_font= :font=
+  alias :old_font  :font
+
+  def font
+    return @f
+  end
+
+  def font=(x)
+    old_font=(x)
+    @f = x
+  end
+
+end

data/lib/IFMapper/FXMap.rb

@@ -41,13 +41,16 @@ class FXMap < Map
   @@cursor_w = nil
   @@cursor_nw = nil
 
-
+  
   def _changed
     create_pathmap
     update_title
     draw
   end
 
+  #
+  # Jump to a certain section #
+  #
   def section=(x)
     super
     @complexConnection = false
@@ -57,28 +60,43 @@ class FXMap < Map
     end
   end
 
-
+  #
+  # Go to previous section (if any)
+  #
   def previous_section
     self.section = @section - 1
     _changed
   end
 
+  #
+  # Go to next section (if any)
+  #
   def next_section
     self.section = @section + 1
     _changed
   end
 
+  #
+  # Map has been modified.  Update also pathmap.
+  #
   def modified=(x)
     @modified = true
     _changed
   end
 
+  #
+  # Popup the section properties to allow renaming it
+  #
   def rename_section
     @sections[@section].properties(self)
     modified = true
   end
 
+  #
+  # Delete current section from map
+  #
   def delete_section
+    return navigation_warning if @navigation
     w = FXWarningBox.new(@window, "Are you sure you want to delete this section?")
     return if w.execute == 0
 
@@ -86,7 +104,11 @@ class FXMap < Map
     modified = true
   end
 
-  def new_section 
+  #
+  # Add a new section to map and make it current
+  #
+  def new_section
+    return navigation_warning if @navigation
     @sections.push( FXSection.new )
     @section = @sections.size - 1
   end
@@ -113,6 +135,48 @@ class FXMap < Map
     puts m
   end
 
+  #
+  # Determine whether a pathmap area from x,y to x+w,y+h is free
+  # of rooms
+  #
+  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 true
+  end
+
+  #
+  # Given a list of rooms, find an area in the map where we could
+  # place them.  If found, return x/y offset so rooms can be moved
+  # there.  This is used for pasting rooms.
+  #
+  def find_empty_area(rooms)
+    return nil if rooms.empty?
+    minx = maxx = rooms[0].x 
+    miny = maxy = rooms[0].y
+    rooms.each { |r|
+      minx = r.x if r.x < minx
+      maxx = r.x if r.x > maxx
+      miny = r.y if r.y < miny
+      maxy = r.y if r.y > maxy
+    }
+    w = maxx - minx
+    h = maxy - miny
+
+    # Find an area in pathmap that has w x h empty rooms
+    0.upto(@width-1-w) { |x|
+      0.upto(@height-1-h) { |y|
+	if _free_area?(x, y, w, h)
+	  return [x - minx, y - miny]
+	end
+      }
+    }
+    return nil
+  end
+
   #
   # Reinitialize the pathmap to an empty matrix
   # 
@@ -166,8 +230,6 @@ class FXMap < Map
     a = c.roomA
     b = c.roomB
 
-    # First, check the neighboring starting/ending nodes in grid
-    # are empty.  If not, we need to abort and remove path from list.
     dirA = a.exits.index(c)
     raise "connection not found #{c} at #{a}" unless dirA
 
@@ -231,7 +293,7 @@ class FXMap < Map
     # We succeeded.  Get the path
     c.failed = false
     c.gpts   = aStar.path
-    # Put path in pathmap so subsequent paths will avoid crossing it.
+    # Put path in pathmap so subsequent paths will try to avoid crossing it.
     c.gpts.each { |p| @pmap[p[0]][p[1]] = c }
 
     # Okay, we have a valid path. 
@@ -289,20 +351,14 @@ class FXMap < Map
   end
 
   #
-  # Function used to add a new room. x and y are absolute pixel positions
-  # in canvas.
+  # Create a new room for the current section
   #
-  def new_xy_room(x, y)
+  def new_room(x, y)
     @modified = true
-    x = x / WW
-    y = y / HH
     r = @sections[@section].new_room(x, y)
     @pmap[x][y] = r
 
-    buf = FXMapperWindow::copy_buffer()
-    r.copy(buf) if buf
     r.selected = true
-
     
     if @options['Edit on Creation']
        if not r.modal_properties(self)
@@ -311,10 +367,19 @@ class FXMap < Map
 	 return nil
        end
     end
-
     return r
   end
 
+  #
+  # Function used to add a new room. x and y are absolute pixel positions
+  # in canvas.
+  #
+  def new_xy_room(x, y)
+    x = x / WW
+    y = y / HH
+    return new_room(x, y)
+  end
+
 
   # Given a canvas (mouse) x/y position, return:
   #
@@ -360,14 +425,19 @@ class FXMap < Map
 	next if not b  # Complex connection in progress
 
 	if c.gpts.size > 0
-	  [a, b].each { |r|
+	  2.times { |t|
+	    if t == 0
+	      r = a
+	      dir = r.exits.index(c)
+	    else
+	      r = b
+	      dir = r.exits.rindex(c)
+	    end
 	    next if not r
-	    dir = r.exits.index(c)
 	    x1, y1 = r.corner(c, 1, dir)
 	    v = FXRoom::DIR_TO_VECTOR[dir]
 	    x2 = x1 + v[0] * WS
 	    y2 = y1 + v[1] * HS
-	    
 	    if x1 == x2
 	      x1 -= W / 2
 	      x2 += W / 2
@@ -376,6 +446,9 @@ class FXMap < Map
 	      y1 -= H / 2
 	      y2 += H / 2
 	    end
+	    x1, x2 = x2, x1 if x2 < x1
+	    y1, y2 = y2, y1 if y2 < y1
+	    
 	    if x >= x1 and x <= x2 and
 		y >= y1 and y < y2
 	      return c
@@ -401,11 +474,7 @@ class FXMap < Map
 	end
       }
 
-      # Then, get "rooms" being connected to check if we get
-      # a complex connection instead.
-      roomA, roomB, a, b = quadrant_to_rooms( exitA, x, y )
-      return roomA if roomA.kind_of?(Connection)
-      return roomB if roomB.kind_of?(Connection)
+      return nil
     end
 
     return nil
@@ -547,7 +616,8 @@ class FXMap < Map
     roomB = to_room(x2, y2)
     # Oops, user tried to create rooms where we already
     # have a complex connection.  Don't create anything, then.
-    if roomA.kind_of?(Connection) or roomB.kind_of?(Connection)
+    if roomA.kind_of?(Connection) or 
+	(roomB.kind_of?(Connection) and not @complexConnection)
       return [roomA, roomB, nil, nil]
     end
 
@@ -563,8 +633,13 @@ class FXMap < Map
       raise "not a connection"
     end
     roomA, roomB, a, b = quadrant_to_rooms( exitA, x, y )
-    return unless a and roomA # User click outside map or not near room
-
+    unless a and roomA and roomA[exitA] == nil
+      return
+    end
+    _new_complex_connection(roomA, exitA)
+  end
+    
+  def _new_complex_connection(roomA, exitA)
     if @complexConnection.kind_of?(TrueClass)
       @complexConnection = [roomA, exitA]
       c = new_connection( roomA, exitA, nil )
@@ -662,6 +737,9 @@ class FXMap < Map
     s.normalText = s.text = msg
   end
 
+  #
+  # Based on x,y coordinate, switch mouse icon shape
+  #
   def cursor_switch(x, y)
     if not @options['Use Room Cursor']
       @canvas.defaultCursor = @@cursor_arrow
@@ -726,42 +804,18 @@ class FXMap < Map
   # to cursor position
   #
   def mousewheel_cb(sender, sel, event)
-    pos = @scrollwindow.position
-    pos = [ pos[0] / @zoom, pos[1] / @zoom ]
-    x = (event.last_x / @zoom).to_i
-    y = (event.last_y / @zoom).to_i
+#     x = event.last_x / @zoom
+#     y = event.last_y / @zoom
     case event.code
     when -120
       zoom_out
-      # pos[0] -= x / 2
-      # pos[1] -= y / 2
-      pos = [ pos[0] * @zoom, pos[1] * @zoom ]
-      @scrollwindow.setPosition(pos[0], pos[1])
     when 120
       zoom_in
-
-      #pos[0] = -x # * @zoom * 2
-      #pos[1] = -y # * @zoom * 2
-
-      # pos = [ pos[0], pos[1] ]
-      # pos = [ pos[0] * @zoom, pos[1] * @zoom ]
-      @scrollwindow.setPosition(pos[0], pos[1])
     end
-#     x = (x * @zoom).to_i
-#     y = (y * @zoom).to_i
-#     if x > @canvas.width
-#       x = @canvas.width
-#     end
-#     if y > @canvas.height
-#       y = @canvas.height
-#     end
-
-#     pos = [ pos[0] - x, pos[1] - y ]
-#     p "SET: #{pos.join(',')}"
-
-#     # @scrollwindow.setPosition(pos[0], pos[1])
-#     p @scrollwindow.position
-    draw
+#     x *= @zoom
+#     y *= @zoom
+#     center_view_on_xy(x.to_i, y.to_i)
+#     draw
   end
 
   #
@@ -795,10 +849,28 @@ class FXMap < Map
       if r.x >= x1 and r.x <= x2 and
 	  r.y >= y1 and r.y <= y2
 	r.selected = true
+	r.update_properties(self)
       else
 	r.selected = false
       end
     }
+
+    @sections[@section].connections.each { |c|
+      next if not c.roomB
+      a = c.roomA
+      b = c.roomB
+
+      if (a.x >= x1 and a.x <= x2 and
+	  a.y >= y1 and a.y <= y2) or
+	  (b.x >= x1 and b.x <= x2 and
+	   b.y >= y1 and b.y <= y2)
+	c.selected = true
+	c.update_properties(self)
+      else
+	c.selected = false
+      end
+    }
+
     draw
     dc = FXDCWindow.new(@canvas)
     dc.drawRectangle(x, y, w * @zoom, h * @zoom)
@@ -842,6 +914,52 @@ class FXMap < Map
     end
   end
 
+  #
+  # Given a room, center scrollwindow so room is visible
+  #
+  def center_view_on_room(r)
+    xx = (r.xx + W / 2) * @zoom
+    yy = (r.yy + H / 2) * @zoom
+    center_view_on_xy(xx, yy)
+  end
+
+  #
+  # Given an x and y coordinate for the canvas, center on it
+  #
+  def center_view_on_xy(xx, yy)
+    cw = @scrollwindow.getContentWidth
+    ch = @scrollwindow.getContentHeight
+    w = @scrollwindow.getViewportWidth
+    h = @scrollwindow.getViewportHeight
+
+    xx -= w / 2
+    yy -= h / 2
+    maxx = cw - w / 2
+    maxy = ch - h / 2
+    if xx > maxx
+      xx = maxx
+    elsif xx < 0
+      xx = 0
+    end
+    if yy > maxy
+      yy = maxy
+    elsif yy < 0
+      yy = 0
+    end
+
+    @scrollwindow.setPosition( -xx, -yy )
+  end
+
+  #
+  # Return current selection as an array of rooms and an array of
+  # connections
+  #
+  def get_selection
+    rooms = @sections[@section].rooms.find_all { |r| r.selected }
+    conns = @sections[@section].connections.find_all { |r| r.selected }
+    return rooms, conns
+  end
+
   #
   # Clear rooms/connections selected
   #
@@ -850,6 +968,66 @@ class FXMap < Map
     @sections[@section].connections.each { |r| r.selected = false }
   end
 
+  #
+  # Add a proper link submenu option for an exit  
+  #
+  def rmb_link_menu(submenu, c, room, idx, old_idx)
+    return if room[idx] == c
+    dir = Room::DIRECTIONS[idx]
+    dir = dir.upcase
+    if room[idx]
+      cmd = FXMenuCommand.new(submenu, "Switch with link in #{dir} Exit")
+      cmd.connect(SEL_COMMAND) { 
+	c2 = room[idx]
+	room[old_idx] = c2
+	room[idx] = c
+	create_pathmap
+	draw
+      }
+    else
+      cmd = FXMenuCommand.new(submenu, "Move link to #{dir} Exit")
+      cmd.connect(SEL_COMMAND) { 
+	room[old_idx] = nil
+	room[idx] = c
+	create_pathmap
+	draw
+      }
+    end
+  end
+
+  #
+  # Handle right mouse button click
+  #
+  def rmb_click_cb(sender, sel, event)
+    rooms, links = get_selection
+
+    menu = nil
+    if not links.empty? and links.size == 1
+      c = links[0]
+      a = c.roomA
+      b = c.roomB
+      menu = FXMenuPane.new(@window)
+      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)
+      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
+    if menu
+      menu.create
+      menu.popup(nil, event.root_x, event.root_y)
+      @window.getApp.runModalWhileShown(menu)
+    end
+  end
+
+
   #
   # Handle left mouse button click
   #
@@ -911,9 +1089,11 @@ class FXMap < Map
 	    if not roomA
 	      new_xy_connection( x, y )
 	    else
-	      @complexConnection = [roomA, exitA]
-	      new_connection( roomA, exitA, nil )
-	      new_complex_connection( x, y )
+	      if a and roomA
+		@complexConnection = [roomA, exitA]
+		new_connection( roomA, exitA, nil )
+		_new_complex_connection( roomA, exitA )
+	      end
 	    end
 	  else
 	    new_xy_connection( x, y )
@@ -932,6 +1112,7 @@ class FXMap < Map
 	  clear_selection
 	end
 	# Select the stuff
+	selection.update_properties(self)
 	selection.selected = true
       end
     end
@@ -1057,6 +1238,7 @@ class FXMap < Map
     @canvas.connect(SEL_MOTION, method(:motion_cb))
     @canvas.connect(SEL_MIDDLEBUTTONPRESS, method(:mmb_click_cb))
     @canvas.connect(SEL_MIDDLEBUTTONRELEASE, method(:mmb_release_cb))
+    @canvas.connect(SEL_RIGHTBUTTONPRESS, method(:rmb_click_cb))
     @canvas.connect(SEL_KEYPRESS, method(:keypress_cb))
   end
   
@@ -1167,6 +1349,9 @@ class FXMap < Map
     @modified = true
   end
 
+  #
+  # Give user some warning if he tries to modify a read-only mode.
+  #
   def navigation_warning
     w = FXWarningBox.new(@window, "Map is in Read Only Mode.  Go to Map Information to change this.")
     w.execute
@@ -1446,6 +1631,32 @@ class FXMap < Map
   # Print map
   #
   def print(printer)
+    # dc = FXDCPrint.new(@window.getApp)
+    require 'IFMapper/FXDCPostscript'
+    oldzoom = @zoom
+    oldsection = @section
+    begin
+      dc = FXDCPostscript.new(@window.getApp)
+      xmax = @width  * WW
+      ymax = @height * HH
+      @zoom = 1.0
+      dc.setContentRange(0, 0, xmax, ymax)
+      dc.beginPrint(printer) {
+	0.upto(@sections.size-1) { |p|
+	  self.section = p
+	  clear_selection
+	  dc.beginPage(p+1) {
+	    dc.lineCap = CAP_ROUND
+	    draw_connections(dc)
+	    draw_rooms(dc)
+	  }
+	}
+      }
+    rescue => e
+      status "#{e}"
+    end
+    self.section = oldsection
+    @zoom = oldzoom
   end
 
   #
@@ -1459,7 +1670,7 @@ class FXMap < Map
     dc = FXDCWindow.new(@image)
     dc.setClipRectangle( -pos[0]-5, -pos[1]-5, w, h)
     dc.font = @font
-    # dc.lineCap = CAP_ROUND
+    #dc.lineCap = CAP_ROUND
     draw_background(dc, event)
     draw_grid(dc, event) if @options['Grid Boxes']
     if @options['Grid Straight Connections']