fxruby 1.6.39-x64-mingw32 → 1.6.44-x64-mingw32

data/lib/fox16/input.rb

@@ -5,10 +5,13 @@ module Fox
     alias addInputOrig addInput # :nodoc:
 
     #
-    # Add a file descriptor _fileDesc_ to be watched for activity as determined
-    # by _mode_, where _mode_ is a bitwise OR (+INPUT_READ+, +INPUT_WRITE+, +INPUT_EXCEPT+).
-    # A message of type +SEL_IO_READ+, +SEL_IO_WRITE+, or +SEL_IO_EXCEPT+ will be sent
-    # to the target when the specified activity is detected on the file descriptor.
+    # Add an IO object as _io_ to be watched for activity as determined by _mode_, where _mode_ is a bitwise OR (+INPUT_READ+, +INPUT_WRITE+, +INPUT_EXCEPT+).
+    # A message of type +SEL_IO_READ+, +SEL_IO_WRITE+, or +SEL_IO_EXCEPT+ will be sent to the target when the specified activity is detected on the file descriptor.
+    #
+    # On POSIX operating systems all kinds of file descriptors can be watched.
+    # It works for +Socket.new+, +IO.popen+, +IO.pipe+, +IO.for_fd+, +File.open+, etc.
+    # Windows provides level triggered events only for network sockets.
+    # So on Windows only socket IO objects like +TCPSocket.new+ and +TCPServer.new+ are currently supported to be watched.
     #
     # There are several forms for #addInput; the original form (from FOX)
     # takes four arguments:
@@ -30,8 +33,7 @@ module Fox
     #     ... handle the I/O event ...
     #   }
     #
-
-    def addInput(fd, mode, *args, &block)
+    def addInput(io, mode, *args, &block)
       params = {}
       params = args.pop if args.last.is_a? Hash
       tgt, sel = nil, 0
@@ -51,7 +53,7 @@ module Fox
         tgt.pconnect(SEL_IO_WRITE, block, params)
         tgt.pconnect(SEL_IO_EXCEPT, block, params)
       end
-      addInputOrig(fd, mode, tgt, sel)
+      addInputOrig(io, mode, tgt, sel)
     end
 
   end # class FXApp

data/lib/fox16/undolist.rb

@@ -344,9 +344,9 @@ module Fox
 
     def onUpdUndo(sender, sel, ptr) # :nodoc:
       if canUndo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -358,9 +358,9 @@ module Fox
 
     def onUpdRedo(sender, sel, ptr) # :nodoc:
       if canRedo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -372,9 +372,9 @@ module Fox
 
     def onUpdClear(sender, sel, ptr) # :nodoc:
       if canUndo? || canRedo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -386,9 +386,9 @@ module Fox
 
     def onUpdRevert(sender, sel, ptr) # :nodoc:
       if canRevert?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.39"
+    "1.6.44"
   end
 end

data/rdoc-sources/FXGLVisual.rb

@@ -83,7 +83,7 @@ module Fox
 
     # Test if OpenGL is possible.
     #
-    # Same as {FXGLVisual.supported?}, but returns the first element (true/false) only.
+    # Same as {FXGLVisual.supported}, but returns the first element (true/false) only.
     #
     def FXGLVisual.supported?(app); end
 

data/rdoc-sources/FXIconList.rb

@@ -267,6 +267,8 @@ module Fox
     # after the item is appended.
     def appendItem(text, bigIcon=nil, miniIcon=nil, data=nil, notify=false); end
 
+    alias << appendItem
+
     # Prepend a new (possibly subclassed) _item_ to the beginning of the list.
     # If _notify_ is +true+, a +SEL_INSERTED+ message is sent to the list's message target
     # after the item is prepended.

data/rdoc-sources/FXImage.rb

@@ -45,6 +45,11 @@ module Fox
     # [deprecated] Pixel data {FXMemoryBuffer}
     attr_reader :data
 
+    # The pointer to the raw color representation of all image pixels.
+    #
+    # It can be used to pass raw image data to FFI, Fiddle or OpenGL.
+    attr_reader :dataPtr
+
     # Array of colors of all image pixels. Can also be written as String of raw [RGBA] values.
     attr_accessor :pixels
 

data/rdoc-sources/FXList.rb

@@ -217,6 +217,8 @@ module Fox
     # Returns the integer index of the newly appended item.
     def appendItem(text, icon=nil, data=nil, notify=false) ; end
 
+    alias << appendItem
+
     # Prepend a (possibly subclassed) _item_ to the list, e.g.
     #
     #   list.prependItem(FXListItem.new("clyde"))

data/rdoc-sources/FXListBox.rb

@@ -186,6 +186,6 @@ module Fox
     # Sort items using current sort function
     def sortItems; end
 
-    alias appendItem <<
+    alias << appendItem
   end
 end

data/rdoc-sources/FXText.rb

@@ -436,8 +436,8 @@ module Fox
     #
     # Search for _string_ in text buffer, and return the extent of
     # the string as a two-element array of arrays.
-    # The first array contains the beginning index (or indices)
-    # and the second array contains the ending index (or indices).
+    # The first array contains the beginning index (or indices if +SEARCH_REGEX+)
+    # and the second array contains the ending index (or indices if +SEARCH_REGEX+) of the first match.
     # The search starts from the given
     # _start_ position, scans forward (+SEARCH_FORWARD+) or backward
     # (+SEARCH_BACKWARD+), and wraps around if +SEARCH_WRAP+ has been
@@ -445,6 +445,8 @@ module Fox
     # case insensitive search (+SEARCH_IGNORECASE+), or regular expression
     # search (+SEARCH_REGEX+).
     #
+    # For regular expression searches, the found regex match begin and end is returned at index 0 and captures are returned as entries starting at index 1 in both beginning and ending arrays.
+    #
     def findText(string, start=0, flags=SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT); end
 
     # Return +true+ if position _pos_ is selected

data/swig-interfaces/FXImage.i

@@ -58,7 +58,7 @@ public:
     FXImage(FXApp* a,VALUE string_or_ary=Qnil,FXuint opts=0,FXint w=1,FXint h=1){
       FXColor* pix=0;
       if(!NIL_P(string_or_ary)){
-        FXuint len=FXRbNumberOfFXColors(string_or_ary);
+        FXint len=FXRbNumberOfFXColors(string_or_ary);
         if(w*h != len){
           rb_raise( rb_eArgError, "Array size does not match image size" );
         }
@@ -76,6 +76,11 @@ public:
         return 0;
       }
     }
+
+    /// Get a pointer to the pixel data
+    VALUE getDataPtr() const {
+      return ULL2NUM((uintptr_t)self->getData());
+    }
   }
 
   /// To get to the option flags
@@ -92,9 +97,9 @@ public:
     * This can be done by calling render().
     */
     void setPixels(VALUE string_or_ary,FXuint opts=0,VALUE w=Qnil,VALUE h=Qnil){
-      FXuint len=FXRbNumberOfFXColors(string_or_ary);
+      FXint len=FXRbNumberOfFXColors(string_or_ary);
       if( ( (NIL_P(w) || NIL_P(h)) && self->getWidth()*self->getHeight() != len) ||
-          (!(NIL_P(w) || NIL_P(h)) && NUM2UINT(w)*NUM2UINT(h) != len)){
+          (!(NIL_P(w) || NIL_P(h)) && NUM2INT(w)*NUM2INT(h) != len)){
         rb_raise( rb_eArgError, "Array size does not match image size" );
       }
 
@@ -111,7 +116,7 @@ public:
       if (data) {
         FXuint size = self->getWidth()*self->getHeight();
         VALUE ary = rb_ary_new2(size);
-        for (int i = 0; i < size; i++)
+        for (FXuint i = 0; i < size; i++)
           rb_ary_store(ary, i, UINT2NUM(data[i]));
         return ary;
       } else {

data/swig-interfaces/FXMemoryBuffer.i

@@ -27,7 +27,7 @@
 class FXMemoryBuffer {
 public:
   // Create an memory buffer object
-  FXMemoryBuffer(FXColor *data,FXuint size);
+  FXMemoryBuffer(FXColor *data,FXint size);
 
   // Returns the size (in bytes)
   FXuint getSize() const;
@@ -39,7 +39,7 @@ public:
       if (data) {
         FXuint size = self->getSize();
         VALUE ary = rb_ary_new2(size);
-        for (int i = 0; i < size; i++)
+        for (FXuint i = 0; i < size; i++)
           rb_ary_store(ary, i, UINT2NUM(data[i]));
         return ary;
         }

data/swig-interfaces/FXText.i

@@ -519,6 +519,8 @@ public:
 
   %extend {
     /**
+    * TODO: Change API to return [beg, end] instead of [[beg], [end]] for non regex.
+    *
     * Search for string in text buffer, returning the extent of
     * the string in beg and end.  The search starts from the given
     * starting position, scans forward (SEARCH_FORWARD) or backward
@@ -536,23 +538,23 @@ public:
       FXint* beg;
       FXint* end;
       VALUE ary=Qnil;
-			FXint ngroups=string.contains('(')+1;  // FIXME: is this right?
+      FXint ngroups = flags&SEARCH_REGEX ? string.contains('(')+1 : 1;  // FIXME: is this right?
       if(!FXMALLOC(&beg,FXint,ngroups)){
         return Qnil;
-				}
+      }
       if(!FXMALLOC(&end,FXint,ngroups)){
         FXFREE(&beg);
-				return Qnil;
-				}
+        return Qnil;
+      }
       if(self->findText(string,beg,end,start,flags,ngroups)){
         ary=rb_ary_new();
-				rb_ary_push(ary,FXRbMakeArray(beg,ngroups));
-				rb_ary_push(ary,FXRbMakeArray(end,ngroups));
-        }
+        rb_ary_push(ary,FXRbMakeArray(beg,ngroups));
+        rb_ary_push(ary,FXRbMakeArray(end,ngroups));
+      }
       FXFREE(&beg);
       FXFREE(&end);
       return ary;
-      }
+    }
   }
 
   /// Return TRUE if position pos is selected

data/swig-interfaces/macros.i

@@ -1165,6 +1165,15 @@
 
 %define DECLARE_FXTEXT_VIRTUALS(klass)
 %extend klass {
+  virtual void eraseCursorOverhang();
+  virtual void drawCursor(FXuint state);
+  virtual FXuint style(FXint row,FXint beg,FXint end,FXint pos);
+  virtual void drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style);
+  virtual void fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style);
+  virtual void drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right);
+  virtual void drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+  virtual void drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+
   virtual void setCursorPos(FXint pos,FXbool notify=FALSE);
   virtual FXbool extendSelection(FXint pos,FXTextSelectionMode mode=SELECT_CHARS,FXbool notify=FALSE);
   virtual FXbool killSelection(FXbool notify=FALSE);

data/test/TC_FXImage.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'testcase'
 require 'fox16'
+require 'fiddle'
 
 class TC_FXImage < Fox::TestCase
   include Fox
@@ -80,6 +81,13 @@ class TC_FXImage < Fox::TestCase
     assert_equal("rgbaRGBA", img.pixel_string)
   end
 
+  def test_dataPtr
+    img = FXImage.new(app, nil, 0, 2, 1)
+    img.pixels = "rgbaRGBA"
+    assert_equal(0, img.options)
+    assert_equal("rgbaRGBA", Fiddle::Pointer.new(img.dataPtr)[0, 8])
+  end
+
   def test_create
     #
     # If the image owns its pixel data and IMAGE_KEEP was not specified,

data/test/TC_FXList.rb

@@ -46,17 +46,17 @@ class TC_FXList < Fox::TestCase
 
   def test_appendItem_byText
     assert_equal(0, @list.numItems)
-    itemIndex = @list.appendItem("")
+    assert_equal 0, @list.appendItem("")
     assert_equal(1, @list.numItems)
-    itemIndex = @list.appendItem("anItem")
+    assert_equal 1, @list.appendItem("anItem")
     assert_equal(2, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil)
+    assert_equal 2, @list.appendItem("anItem", nil)
     assert_equal(3, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData")
+    assert_equal 3, @list.appendItem("anItem", nil, "someData")
     assert_equal(4, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData", true)
+    assert_equal 4, @list.appendItem("anItem", nil, "someData", true)
     assert_equal(5, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData", false)
+    assert_equal 5, @list.appendItem("anItem", nil, "someData", false)
     assert_equal(6, @list.numItems)
     assert_raises(ArgumentError) do
       @list.appendItem("anItem", nil, "someData", 42) # last argument must be true or false
@@ -103,9 +103,9 @@ class TC_FXList < Fox::TestCase
   end
 
   def test_makeItemVisible
-    items = []
     0.upto(2) { |i|
-      items << @list.appendItem("item#{i}")
+      itemIndex = @list.appendItem("item#{i}")
+      assert_equal i, itemIndex
     }
     assert_raises(IndexError) {
       @list.makeItemVisible(-1)

data/test/TC_FXText.rb

@@ -87,6 +87,13 @@ public
     assert_equal([10], endIndex)
   end
 
+  def test_find_text_with_startpos_wrap_nocase
+    @text.text = "I came, i saw, I conquered"
+    startIndex, endIndex = @text.findText("i ", 16, SEARCH_FORWARD|SEARCH_IGNORECASE|SEARCH_WRAP)
+    assert_equal([0], startIndex)
+    assert_equal([2], endIndex)
+  end
+
   def test_find_text_with_groups
     @text.text = "I came, I saw, I conquered"
     startIndex, endIndex = @text.findText("I ([a-z]+)(, )?", 0, SEARCH_REGEX)
@@ -94,6 +101,18 @@ public
     assert_equal([8, 6, 8], endIndex)
   end
 
+  def test_find_text_with_loop
+    @text.text = "()  ()()"
+    e = Enumerator.new do |y|
+      pos = 0
+      while a=@text.findText("()", pos, SEARCH_FORWARD|SEARCH_EXACT)
+        y << a
+        pos = a[1][0]
+      end
+    end
+    assert_equal [[[0], [2]], [[4], [6]], [[6], [8]]], e.to_a
+  end
+
   if ''.respond_to?(:encoding)
     def test_encoding
       @text.text = "世界線航跡蔵"

data/test/TC_FXVec4f.rb

@@ -5,6 +5,20 @@ require 'fox16'
 class TC_FXVec4f < Test::Unit::TestCase
   include Fox
 
+  def assert_in_delta(v1, v2, delta)
+    case v1
+      when FXVec3f
+        3.times do |i|
+          super(v1[i], v2[i], delta)
+        end
+      when FXVec4f
+        4.times do |i|
+          super(v1[i], v2[i], delta)
+        end
+      else
+        super(v1, v2, delta)
+    end
+  end
 
   def test_new
     FXVec4f.new
@@ -65,37 +79,37 @@ class TC_FXVec4f < Test::Unit::TestCase
   def test_neg
     vec = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
     vec = -vec
-    assert_equal(vec[0], -1.0)
-    assert_equal(vec[1], -2.0)
-    assert_equal(vec[2], -3.0)
-    assert_equal(vec[3], -4.0)
+    assert_in_delta(vec[0], -1.0, 0.001)
+    assert_in_delta(vec[1], -2.0, 0.001)
+    assert_in_delta(vec[2], -3.0, 0.001)
+    assert_in_delta(vec[3], -4.0, 0.001)
   end
 
   def test_add
     v1 = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
     v3 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
-    assert_equal(v3, v1 + v2)
+    assert_in_delta(v3, v1 + v2, 0.001)
   end
 
   def test_sub
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
     v3 = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
-    assert_equal(v3, v1 - v2)
+    assert_in_delta(v3, v1 - v2, 0.001)
   end
 
   def test_mul
     v1 = FXVec4f.new(3.0,  6.0,  9.0, 12.0)
     v2 = FXVec4f.new(6.0, 12.0, 18.0, 24.0)
-    assert_equal(v2, v1 * 2)
+    assert_in_delta(v2, v1 * 2, 0.001)
   end
 
   def test_mul2 # same as dot product
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
-    assert_equal(180.0, v1*v2)
-    assert_equal(180.0, v2*v1)
+    assert_in_delta(180.0, v1*v2, 0.001)
+    assert_in_delta(180.0, v2*v1, 0.001)
   end
 
   def test_div
@@ -110,8 +124,8 @@ class TC_FXVec4f < Test::Unit::TestCase
   def test_dot
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
-    assert_equal(180.0, v1.dot(v2))
-    assert_equal(180.0, v2.dot(v1))
+    assert_in_delta(180.0, v1.dot(v2), 0.001)
+    assert_in_delta(180.0, v2.dot(v1), 0.001)
   end
 
   def test_length
@@ -121,7 +135,7 @@ class TC_FXVec4f < Test::Unit::TestCase
 
   def test_normalize
     vec = FXVec4f.new(1.0, 1.0, 1.0, 1.0)
-    assert_equal(FXVec4f.new(0.5, 0.5, 0.5, 0.5), vec.normalize)
+    assert_in_delta(FXVec4f.new(0.5, 0.5, 0.5, 0.5), vec.normalize, 0.001)
   end
 
   def test_lo