fxruby 1.6.11 → 1.6.12

data/lib/fox16/core.rb

@@ -182,6 +182,25 @@ module Fox
       end
     end
   end
+  
+  class FXHiliteStyle
+    #
+    # Construct a new FXHiliteStyle instance, with fields initialized from
+    # an FXText instance.
+    #
+    def FXHiliteStyle.from_text(textw)
+      hs = new
+      hs.activeBackColor = textw.activeBackColor
+      hs.hiliteBackColor = textw.hiliteBackColor
+      hs.hiliteForeColor = textw.hiliteTextColor
+      hs.normalBackColor = textw.backColor
+      hs.normalForeColor = textw.textColor
+      hs.selectBackColor = textw.selBackColor
+      hs.selectForeColor = textw.selTextColor
+      hs.style = 0
+      hs
+    end
+  end
 
   class FXScrollArea
 	  # Returns a reference to the scroll corner (an FXScrollCorner instance) for this window.

data/lib/fox16/input.rb

@@ -1,4 +1,5 @@
 module Fox
+  
   class FXApp
 
     alias addInputOrig addInput # :nodoc:
@@ -31,24 +32,28 @@ module Fox
     #
 
     def addInput(fd, mode, *args, &block)
+      params = {}
+      params = args.pop if args.last.is_a? Hash
       tgt, sel = nil, 0
       if args.length > 0
         if args[0].respond_to? :call
           tgt = FXPseudoTarget.new
-	  tgt.pconnect(SEL_IO_READ, args[0], block)
-	  tgt.pconnect(SEL_IO_WRITE, args[0], block)
-	  tgt.pconnect(SEL_IO_EXCEPT, args[0], block)
+          tgt.pconnect(SEL_IO_READ, args[0], params)
+          tgt.pconnect(SEL_IO_WRITE, args[0], params)
+          tgt.pconnect(SEL_IO_EXCEPT, args[0], params)
         else # it's some other kind of object
           tgt = args[0]
           sel = args[1]
         end
       else
         tgt = FXPseudoTarget.new
-	tgt.pconnect(SEL_IO_READ, nil, block)
-	tgt.pconnect(SEL_IO_WRITE, nil, block)
-	tgt.pconnect(SEL_IO_EXCEPT, nil, block)
+        tgt.pconnect(SEL_IO_READ, block, params)
+        tgt.pconnect(SEL_IO_WRITE, block, params)
+        tgt.pconnect(SEL_IO_EXCEPT, block, params)
       end
       addInputOrig(fd, mode, tgt, sel)
     end
-  end
-end
+    
+  end # class FXApp
+  
+end # module Fox

data/lib/fox16/kwargs.rb

@@ -56,7 +56,9 @@ module Fox
   end
   
   class FXFont
+
     alias old_initialize initialize
+    
     def initialize(a, arg1, *args, &blk)
       if args.length > 0
         face, size = arg1, args[0]
@@ -72,6 +74,22 @@ module Fox
         old_initialize(a, arg1, &blk)
       end
     end
+
+    class << self
+      alias old_listFonts listFonts
+    end
+    
+    def FXFont.listFonts(face, *args)
+      argument_names = %w{weight slant setWidth encoding hints}
+      default_params = { :weight => 0, :slant => 0, :setWidth => 0, :encoding => 0, :hints => 0 }     
+      params = {}
+      params = args.pop if args.last.is_a? Hash
+      args.each_with_index { |e, i| params[argument_names[i].intern] = e }
+      params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
+      params = default_params.merge(params)
+      old_listFonts(face, params[:weight], params[:slant], params[:setWidth], params[:encoding], params[:hints])
+    end
+
   end
   
   class FXGLCanvas
@@ -1654,6 +1672,24 @@ module Fox
     end
   end
 
+  class FXPacker
+    alias old_initialize initialize
+    def initialize(parent, *args, &blk)
+      argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
+      default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
+      params = {}
+      params = args.pop if args.last.is_a? Hash
+      args.each_with_index { |e, i| params[argument_names[i].intern] = e }
+      if params.key? :padding
+        value = params.delete(:padding)
+        [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
+      end
+      params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
+      params = default_params.merge(params)
+      old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
+    end
+  end
+
   class FXPCXIcon
     alias old_initialize initialize
     def initialize(a, *args, &blk)

data/lib/fox16/responder2.rb

@@ -21,30 +21,25 @@ module Fox
     #
     def initialize
       super
-      @blocks = {}
+      @context = {}
     end
 
     #
     # Store an association between a message of type
-    # _messageType_ with a callable object or a block.
+    # _message_type_ with a callable object.
     #
-    def pconnect(messageType, callableObject, block)
-      if callableObject.nil?
-	@blocks[messageType] = block
-      else
-	@blocks[messageType] = callableObject
-      end
-      FXMAPTYPE(messageType, :onHandleMsg)
-      
-      case messageType
-        when SEL_TIMEOUT
-	  @@targets_of_pending_timers[self] = self
-        when SEL_CHORE
-	  @@targets_of_pending_chores[self] = self
-        when SEL_SIGNAL
-	  @@targets_of_pending_signals[self] = self
-        when SEL_IO_READ, SEL_IO_WRITE, SEL_IO_EXCEPT
-	  @@targets_of_pending_inputs[self] = self
+    def pconnect(message_type, callable_object, params={})
+      @context[message_type] = { :callable => callable_object, :params => params }
+      FXMAPTYPE(message_type, :onHandleMsg)
+      case message_type
+      when SEL_TIMEOUT
+        @@targets_of_pending_timers[self] = self
+      when SEL_CHORE
+        @@targets_of_pending_chores[self] = self
+      when SEL_SIGNAL
+        @@targets_of_pending_signals[self] = self
+      when SEL_IO_READ, SEL_IO_WRITE, SEL_IO_EXCEPT
+        @@targets_of_pending_inputs[self] = self
       end
     end
 
@@ -53,18 +48,31 @@ module Fox
     # message data _ptr_.
     #
     def onHandleMsg(sender, sel, ptr)
-      messageType = Fox.FXSELTYPE(sel)
-      result = @blocks[messageType].call(sender, sel, ptr)
-      case messageType
-        when SEL_TIMEOUT
-	  @@targets_of_pending_timers.delete(self)
-        when SEL_CHORE
-	  @@targets_of_pending_chores.delete(self)
+      message_type = Fox.FXSELTYPE(sel)
+      ctx = @context[message_type]
+      callable_object = ctx[:callable]
+      params = ctx[:params]
+      result = callable_object.call(sender, sel, ptr)
+      case message_type
+      when SEL_TIMEOUT
+        if params[:repeat]
+          FXApp.instance.addTimeout(params[:delay], callable_object, params)
+        else
+          @@targets_of_pending_timers.delete(self)
+        end
+      when SEL_CHORE
+        if params[:repeat]
+          FXApp.instance.addChore(callable_object, params)
+        else
+          @@targets_of_pending_chores.delete(self)
+        end
       end
       result
     end
-  end
-end
+    
+  end # class FXPseudoTarget
+  
+end # module Fox
 
 #
 # The Responder2 module provides the #connect method,
@@ -95,13 +103,14 @@ module Responder2
   # will be "called" with three arguments (the sender, selector and
   # message data).
   #
-  def connect(messageType, callableObject=nil, &block)
+  def connect(message_type, callable_object=nil, &block)
     unless instance_variables.include?('@pseudoTarget')
       @pseudoTarget = Fox::FXPseudoTarget.new
       self.target = @pseudoTarget
     end
-    @pseudoTarget.pconnect(messageType, callableObject, block)
+    @pseudoTarget.pconnect(message_type, callable_object ? callable_object : block)
   end
+  
 end
 
 module Fox

data/lib/fox16/signal.rb

@@ -1,4 +1,5 @@
 module Fox
+  
   class FXApp
 
     alias addSignalOrig addSignal # :nodoc:
@@ -18,7 +19,7 @@ module Fox
     # the message to be sent when this signal is raised.
     # If _sendImmediately_ is +true+, the message will be sent to the target right away;
     # this should be used with extreme care as the application is interrupted
-    # at an unknown point it its execution.
+    # at an unknown point in its execution.
     # The _flags_ are to be set as per POSIX definitions.
     #
     # A second form of #addSignal takes a Method instance as its second argument:
@@ -38,16 +39,18 @@ module Fox
     #
 
     def addSignal(sig, *args, &block)
+      params = {}
+      params = args.pop if args.last.is_a? Hash
       tgt, sel, immediate, flags = nil, 0, false, 0
       if args.length > 0
         if args[0].respond_to? :call
           tgt = FXPseudoTarget.new
-          tgt.pconnect(SEL_SIGNAL, args[0], block)
+          tgt.pconnect(SEL_SIGNAL, args[0], params)
           immediate = (args.length > 1) ? args[1] : false
           flags = (args.length > 2) ? args[2] : 0
         elsif (args[0].kind_of? TrueClass) || (args[0].kind_of? FalseClass)
           tgt = FXPseudoTarget.new
-          tgt.pconnect(SEL_SIGNAL, nil, block)
+          tgt.pconnect(SEL_SIGNAL, block, params)
           immediate = args[0]
           flags = (args.length > 1) ? args[1] : 0
         else # it's some other kind of object
@@ -58,9 +61,11 @@ module Fox
         end
       else
         tgt = FXPseudoTarget.new
-        tgt.pconnect(SEL_SIGNAL, nil, block)
+        tgt.pconnect(SEL_SIGNAL, block, params)
       end
       addSignalOrig(sig, tgt, sel, immediate, flags)
     end
-  end
-end
+    
+  end # class FXApp
+  
+end # module Fox

data/lib/fox16/timeout.rb

@@ -1,4 +1,5 @@
 module Fox
+  
   class FXApp
 
     alias addTimeoutOrig	addTimeout # :nodoc:
@@ -7,8 +8,8 @@ module Fox
     alias remainingTimeoutOrig	remainingTimeout # :nodoc:
 
     #
-    # Add a timeout message to be sent to target object in _ms_ milliseconds;
-    # the timer fires only once after the interval expires.  The last argument
+    # Add a timeout message to be sent to target object in _ms_ milliseconds.
+    # By default, the timer fires only once after the interval expires.  The last argument
     # is optional user data which will be passed along as the _ptr_ argument of
     # the message handler. If a timer with the same target and message already exists,
     # it will be rescheduled.
@@ -34,30 +35,43 @@ module Fox
     #
     # The last form of #addTimeout takes a block:
     #
-    #     timeout = app.addTimeout(delay) { |sender, sel, data|
+    #     timeout = app.addTimeout(delay) do |sender, sel, data|
     #         ... handle the timeout ...
-    #     }
+    #     end
     #
     # All of these return a reference to an opaque object (actually, a hash) that
     # can be passed to #removeTimeout if it is necessary to remove the timeout
     # before it fires.
     #
+    # For the last two forms, you can pass in the optional +:repeat+ parameter to
+    # cause the timeout to be re-registered after it fires, e.g.
+    #
+    #     timeout = app.addTimeout(delay, :repeat => true) do |sender, sel, data|
+    #         ... handle the timeout ...
+    #         ... re-add the timeout with the same delay ...
+    #     end
+    #
     def addTimeout(ms, *args, &block)
+      params = {}
+      params = args.pop if args.last.is_a? Hash
+      params[:delay] = ms
       tgt, sel = nil, 0
       if args.length > 0
         if args[0].respond_to? :call
-          tgt = FXPseudoTarget.new
-	  tgt.pconnect(SEL_TIMEOUT, args[0], nil)
+          tgt = params[:target] || FXPseudoTarget.new
+          tgt.pconnect(SEL_TIMEOUT, args[0], params)
         else # it's some other kind of object
           tgt = args[0]
           sel = args[1]
         end
       else
-        tgt = FXPseudoTarget.new
-	tgt.pconnect(SEL_TIMEOUT, nil, block)
+        tgt = params[:target] || FXPseudoTarget.new
+        tgt.pconnect(SEL_TIMEOUT, block, params)
       end
       addTimeoutOrig(tgt, sel, ms)
-      return { :target => tgt, :selector => sel }
+      params[:target] = tgt
+      params[:selector] = sel
+      params
     end
 
     #
@@ -69,8 +83,8 @@ module Fox
       if args.length == 2
         removeTimeoutOrig(args[0], args[1])
       else
-        hsh = args[0]
-        removeTimeoutOrig(hsh[:target], hsh[:selector])
+        params = args[0]
+        removeTimeoutOrig(params[:target], params[:selector])
       end
     end
 
@@ -116,5 +130,7 @@ module Fox
         remainingTimeoutOrig(hsh[:target], hsh[:selector])
       end
     end
-  end
-end
+    
+  end # class FXApp
+  
+end # module Fox

data/lib/fox16/version.rb

@@ -3,7 +3,7 @@ module Fox
   # Returns the FXRuby version number as a string, e.g. "1.0.19".
   #
   def Fox.fxrubyversion
-    "1.6.11"
+    "1.6.12"
   end
 end
 

data/rdoc-sources/FXButton.rb

@@ -14,7 +14,7 @@ module Fox
   # The option <tt>BUTTON_AUTOGRAY</tt> (<tt>BUTTON_AUTOHIDE</tt>) causes the button to be grayed
   # out (hidden) if its handler does not respond to the <tt>SEL_UPDATE</tt> message.
   # This is useful when messages are delegated, for example when using a
-  # multiple document interface, where the ultimaye destination of a message
+  # multiple document interface, where the ultimate destination of a message
   # can be changed.
   #
   # === Events

data/rdoc-sources/FXCursor.rb

@@ -48,7 +48,7 @@ module Fox
     #
     # Make cursor from FXColor pixels; cursor size should be 32x32 for portability!
     #
-    def initialize(a, src, msk, width=32, height=32, hotX=-1, hotY=-1) # :yields: theCursor
+    def initialize(a, pixels, width=32, height=32, hotX=-1, hotY=-1) # :yields: theCursor
     end
 
     #

data/rdoc-sources/FXImage.rb

@@ -165,6 +165,86 @@ module Fox
     # +color+::	fill color for blank areas after crop [FXColor]
     #
     def crop(x, y, w, h, color=0) ; end
+    
+    # Fill image with uniform color.
+    def fill(color); end
+    
+    #
+    # Fade an image to a certain color by a certain factor. The _factor_ is
+    # some integer value between 0 and 255 inclusive, where a factor of 255 indicates no fading and a factor
+    # of zero indicates that the image is completely faded to the fade _color_.
+    #
+    # ==== Parameters:
+    #
+    # +color+::   the fade color [FXColor]
+    # +factor+::	fading factor [Integer]
+    #
+    def fade(color, factor=255); end
+
+    #
+    # Shear image horizontally; the number of pixels is equal to the
+    # _shear_ parameter times 256. The area outside the image is filled
+    # with transparent black, unless another _color_ is specified.
+    #
+    # ==== Parameters:
+    #
+    # +shear+::   how far to shear [Integer]
+    # +color+::	  fill color for areas outside the sheared image [FXColor]
+    #
+    def xshear(shear, color=0); end
+
+    #
+    # Shear image vertically; the number of pixels is equal to the
+    # _shear_ parameter times 256. The area outside the image is filled
+    # with transparent black, unless another _color_ is specified.
+    #
+    # ==== Parameters:
+    #
+    # +shear+::   how far to shear [Integer]
+    # +color+::	  fill color for areas outside the sheared image [FXColor]
+    #
+    def yshear(shear, color=0); end
+
+    #
+    # Fill image using a horizontal gradient.
+    #
+    # ==== Parameters:
+    #
+    # +left+::   starting color, for leftmost pixels [FXColor]
+    # +right+::  ending color, for rightmost pixels [FXColor]
+    #
+    def hgradient(left, right); end
+
+    #
+    # Fill image using a vertical gradient.
+    #
+    # ==== Parameters:
+    #
+    # +top+::      starting color, for topmost pixels [FXColor]
+    # +bottom+::	 ending color, for bottommost pixels [FXColor]
+    #
+    def vgradient(top, bottom); end
+
+    #
+    # Fill image using a bilinear gradient.
+    #
+    # ==== Parameters:
+    #
+    # +topleft+::      pixel color for top-left corner [FXColor]
+    # +topright+::	   pixel color for top-right corner [FXColor]
+    # +bottomleft+::   pixel color for bottom-left corner [FXColor]
+    # +bottomright+::  pixel color for bottom-right corner [FXColor]
+    #
+    def gradient(topleft, topright, bottomleft, bottomright); end
+
+    #
+    # Blend image over uniform color.
+    #
+    # ==== Parameters:
+    #
+    # +color+::	  the blended color [FXColor]
+    #
+    def blend(color); end
   
     #
     # Save pixel data to a stream.