fxruby 1.6.29 → 1.6.30

data/lib/fox16.rb

@@ -28,3 +28,4 @@ require "fox16/execute_nonmodal"
 require "fox16/version"
 require "fox16/kwargs"
 require "fox16/exceptions_for_fxerror"
+require "fox16/thread"

data/lib/fox16/thread.rb

@@ -0,0 +1,51 @@
+require 'thread'
+
+module Fox
+
+  class FXApp
+
+    alias initialize_before_thread initialize # :nodoc:
+
+    def initialize(*args, &block)
+      initialize_before_thread(*args, &block)
+      event_handler_setup
+    end
+
+    def runOnUiThread(&block)
+      @event_handler_events << block
+      @event_handler_pwr.write 'e' if @event_handler_pwr
+    end
+
+    private
+
+    def event_handler_setup
+      if RUBY_PLATFORM =~ /mingw|mswin/i
+        require 'socket'
+        gs = TCPServer.open('localhost', 0)
+        prd = TCPSocket.open('localhost', gs.addr[1])
+        pwr = gs.accept
+        gs.close
+      else
+        prd, pwr = IO.pipe
+      end
+      self.addInput(prd, Fox::INPUT_READ){ event_handler_pull(prd) }
+      @event_handler_pwr = pwr
+      @event_handler_events = Queue.new
+    end
+
+    def event_handler_pull(prd)
+      prd.read(1) if prd
+      while !@event_handler_events.empty?
+        ev = @event_handler_events.shift
+        ev.call
+      end
+    end
+
+  end # class FXApp
+
+  class FXId
+    def runOnUiThread(&block)
+      app.runOnUiThread(&block)
+    end
+  end
+end # module Fox

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.29"
+    "1.6.30"
   end
 end

data/rdoc-sources/FXApp.rb

@@ -538,5 +538,10 @@ module Fox
 
     # Check to see if multithreaded applications are supported
     def threadsEnabled?(); end
+
+    # Runs the specified block on the UI thread.
+    #
+    # The block is posted to the event queue of the UI thread.
+    def runOnUiThread(&block); end
   end
 end

data/rdoc-sources/FXId.rb

@@ -30,5 +30,10 @@ module Fox
     # Destroy resource.
     #
     def destroy(); end
+
+    # Runs the specified block on the UI thread.
+    #
+    # The block is posted to the event queue of the UI thread.
+    def runOnUiThread(&block); end
   end
 end

data/swig-interfaces/FXApp.i

@@ -357,18 +357,13 @@ public:
     */
     bool addInput(VALUE obj,FXuint mode,FXObject *tgt,FXSelector sel){
       FXInputHandle fd;
-      FXuint m;
-      if(mode&INPUT_READ){
-        m=INPUT_READ;
-        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
-        fd=FXRbGetReadFileHandle(obj);
-        self->addInput(fd,m,tgt,sel);
+      if(mode&(INPUT_READ|INPUT_EXCEPT)){
+        fd=FXRbGetReadFileHandle(obj, mode);
+        self->addInput(fd,mode,tgt,sel);
         }
-      if(mode&INPUT_WRITE){
-        m=INPUT_WRITE;
-        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
-        fd=FXRbGetWriteFileHandle(obj);
-        self->addInput(fd,m,tgt,sel);
+      if(mode&(INPUT_WRITE|INPUT_EXCEPT)){
+        fd=FXRbGetWriteFileHandle(obj, mode);
+        self->addInput(fd,mode,tgt,sel);
         }
       return true;
       }
@@ -379,18 +374,15 @@ public:
     */
     bool removeInput(VALUE obj,FXuint mode){
       FXInputHandle fd;
-      FXuint m;
-      if(mode&INPUT_READ){
-        m=INPUT_READ;
-        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
-        fd=FXRbGetReadFileHandle(obj);
-        self->removeInput(fd,m);
+      if(mode&INPUT_READ|INPUT_EXCEPT){
+        fd=FXRbGetReadFileHandle(obj, mode);
+        self->removeInput(fd,mode);
+        FXRbRemoveReadFileHandle(obj, mode);
         }
-      if(mode&INPUT_WRITE){
-        m=INPUT_WRITE;
-        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
-        fd=FXRbGetWriteFileHandle(obj);
-        self->removeInput(fd,m);
+      if(mode&(INPUT_WRITE|INPUT_EXCEPT)){
+        fd=FXRbGetWriteFileHandle(obj, mode);
+        self->removeInput(fd,mode);
+        FXRbRemoveWriteFileHandle(obj, mode);
         }
       return true;
       }
@@ -402,62 +394,6 @@ public:
   /// Peek to determine if there's an event
   bool peekEvent();
 
-  /// Perform one event dispatch; return true if event was dispatched
-  bool runOneEvent(bool blocking=true);
-
-  /**
-  * Run the main application event loop until stop() is called,
-  * and return the exit code passed as argument to stop().
-  */
-  FXint run();
-
-  /**
-  * Run an event loop till some flag becomes non-zero, and
-  * then return.
-  */
-  FXint runUntil(FXuint& condition); // FIXME
-
-  /**
-  * Run event loop while events are available, non-modally.
-  * Return when no more events, timers, or chores are outstanding.
-  */
-  FXint runWhileEvents();
-
-  /**
-  * Run event loop while there are events are available in the queue.
-  * Returns 1 when all events in the queue have been handled, and 0 when
-  * the event loop was terminated due to stop() or stopModal().
-  * Except for the modal window and its children, user input to all windows
-  * is blocked; if the modal window is NULL, all user input is blocked.
-  */
-  FXint runModalWhileEvents(FXWindow* window=NULL);
-
-  /**
-  * Run modal event loop, blocking keyboard and mouse events to all windows
-  * until stopModal is called.
-  */
-  FXint runModal();
-
-  /**
-  * Run a modal event loop for the given window, until stop() or stopModal() is
-  * called. Except for the modal window and its children, user input to all
-  * windows is blocked; if the modal window is NULL all user input is blocked.
-  */
-  FXint runModalFor(FXWindow* window);
-
-  /**
-  * Run modal while window is shown, or until stop() or stopModal() is called.
-  * Except for the modal window and its children, user input to all windows
-  * is blocked; if the modal window is NULL all user input is blocked.
-  */
-  FXint runModalWhileShown(FXWindow* window);
-
-  /**
-  * Run popup menu while shown, until stop() or stopModal() is called.
-  * Also returns when entering previous cascading popup menu.
-  */
-  FXint runPopup(FXWindow* owner);
-
   /// True if the window is modal
   bool isModal(FXWindow* window) const;
 

data/swig-interfaces/macros.i

@@ -31,6 +31,62 @@
   /// Detach application's windows
   virtual void detach();
 
+  /**
+  * Run the main application event loop until stop() is called,
+  * and return the exit code passed as argument to stop().
+  */
+  FXint run();
+
+  /// Perform one event dispatch; return true if event was dispatched
+  bool runOneEvent(bool blocking=true);
+
+  /**
+  * Run an event loop till some flag becomes non-zero, and
+  * then return.
+  */
+  FXint runUntil(FXuint& condition); // FIXME
+
+  /**
+  * Run event loop while events are available, non-modally.
+  * Return when no more events, timers, or chores are outstanding.
+  */
+  FXint runWhileEvents();
+
+  /**
+  * Run event loop while there are events are available in the queue.
+  * Returns 1 when all events in the queue have been handled, and 0 when
+  * the event loop was terminated due to stop() or stopModal().
+  * Except for the modal window and its children, user input to all windows
+  * is blocked; if the modal window is NULL, all user input is blocked.
+  */
+  FXint runModalWhileEvents(FXWindow* window=NULL);
+
+  /**
+  * Run modal event loop, blocking keyboard and mouse events to all windows
+  * until stopModal is called.
+  */
+  FXint runModal();
+
+  /**
+  * Run a modal event loop for the given window, until stop() or stopModal() is
+  * called. Except for the modal window and its children, user input to all
+  * windows is blocked; if the modal window is NULL all user input is blocked.
+  */
+  FXint runModalFor(FXWindow* window);
+
+  /**
+  * Run modal while window is shown, or until stop() or stopModal() is called.
+  * Except for the modal window and its children, user input to all windows
+  * is blocked; if the modal window is NULL all user input is blocked.
+  */
+  FXint runModalWhileShown(FXWindow* window);
+
+  /**
+  * Run popup menu while shown, until stop() or stopModal() is called.
+  * Also returns when entering previous cascading popup menu.
+  */
+  FXint runPopup(FXWindow* owner);
+
   /**
    * Initialize application.
    * Parses and removes common command line arguments, reads the registry.

data/test/TC_FXApp.rb

@@ -7,9 +7,6 @@ class TC_FXApp < Test::Unit::TestCase
   include Fox
 
   def test_exception_for_second_app
-    app = FXApp.new
-    mainWindow = FXMainWindow.new(app, "")
-    app.create
     assert_raise RuntimeError do
       app2 = FXApp.new
     end
@@ -33,14 +30,16 @@ class TC_FXApp2 < Fox::TestCase
     app.removeInput(pipe_wr, INPUT_WRITE)
 
     app.addInput(pipe_rd, INPUT_READ, app, FXApp::ID_QUIT)
-    data_sent = false
-    app.addTimeout(1) do
-      data_sent = true
-      pipe_wr.write " "
+    2.times do
+      data_sent = false
+      app.addTimeout(1) do
+        data_sent = true
+        pipe_wr.write " "
+      end
+      app.run
+      assert data_sent, "the read input event shouldn't fire before some data is available"
+      assert " ", pipe_rd.read(1)
     end
-    app.run
-    assert data_sent, "the read input event shouldn't fire before some data is available"
-
     app.removeInput(pipe_rd, INPUT_READ)
     pipe_wr.close
     pipe_rd.close unless pipe_rd.closed?
@@ -50,6 +49,22 @@ class TC_FXApp2 < Fox::TestCase
     check_events *IO.pipe
   end
 
+  def test_addInput_on_socket_accept
+    s = TCPServer.open 'localhost', 0
+    app.addInput(s, INPUT_READ, app, FXApp::ID_QUIT)
+    2.times do
+      pipe_wr = nil
+      app.addTimeout(1) do
+        pipe_wr = TCPSocket.open 'localhost', s.addr[1]
+      end
+      app.run
+      assert pipe_wr, "the read input event shouldn't fire before client connection happens"
+      s.accept.close
+    end
+    app.removeInput(s, INPUT_READ)
+    s.close
+  end
+
   def test_addInput_on_socket
     s = TCPServer.open 'localhost', 0
     pipe_wr = TCPSocket.open 'localhost', s.addr[1]
@@ -63,4 +78,39 @@ class TC_FXApp2 < Fox::TestCase
     pipe_rdwr = IO.popen("cat", "r+")
     check_events pipe_rdwr, pipe_rdwr
   end
+
+  def test_runOnUiThread
+    count = 0
+    thread = nil
+    Thread.new do
+      10.times do |idx|
+        app.runOnUiThread do
+          count += 1
+          thread = Thread.current
+          app.stop if idx == 9
+        end
+        sleep 0.001
+      end
+    end
+    app.run
+
+    assert_equal Thread.current, thread
+    assert_equal 10, count
+  end
+
+  def test_runOnUiThread_same_thread
+    count = 0
+    app.addTimeout(1) do
+      10.times do |idx|
+        app.runOnUiThread do
+          count += 1
+          app.stop if idx == 9
+        end
+        sleep 0.001
+      end
+    end
+    app.run
+
+    assert_equal 10, count
+  end
 end

data/test/TC_FXJPGImage.rb

@@ -0,0 +1,47 @@
+require 'fox16'
+require 'test/unit'
+require 'testcase'
+require 'openssl'
+
+class TC_FXJPGImage < Fox::TestCase
+  include Fox
+
+  def setup
+    super(self.class.name)
+  end
+
+  def test_save_with_thread
+    w, h = 4000, 3000
+    img_data = OpenSSL::Random.random_bytes(w) * h * 4
+
+    count = 0
+    th = Thread.new do
+      loop do
+        count += 1
+      end
+    end
+
+    img = FXJPGImage.new(app)
+    img.setPixels( img_data, 0, w, h )
+
+    jpeg_data = FXMemoryStream.open(FXStreamSave, nil) do |outfile|
+      img.savePixels(outfile)
+      outfile.takeBuffer
+    end
+
+    assert_operator(count, :>=, 1000000)
+    assert_operator(jpeg_data.bytesize, :>=, 1000)
+
+    count = 0
+    img = FXJPGImage.new(app)
+    FXMemoryStream.open(FXStreamLoad, jpeg_data) do |infile|
+      img.loadPixels(infile)
+    end
+
+    th.kill
+
+    assert_equal 4000, img.width
+    assert_equal 3000, img.height
+    assert_operator(count, :>=, 1000000)
+  end
+end

metadata

@@ -1,37 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.29
+  version: 1.6.30
 platform: ruby
 authors:
 - Lyle Johnson
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
-  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
-  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
-  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
-  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
-  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
-  dS4=
-  -----END CERTIFICATE-----
-date: 2015-02-17 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +197,7 @@ files:
 - examples/textedit/helpwindow.rb
 - examples/textedit/prefdialog.rb
 - examples/textedit/textedit.rb
+- examples/thread.rb
 - examples/unicode.rb
 - ext/fox16_c/FXRbApp.cpp
 - ext/fox16_c/FXRbDataTarget.cpp
@@ -216,6 +210,7 @@ files:
 - ext/fox16_c/extconf.rb
 - ext/fox16_c/frames_wrap.cpp
 - ext/fox16_c/fx3d_wrap.cpp
+- ext/fox16_c/gvl_wrappers.cpp
 - ext/fox16_c/iconlist_wrap.cpp
 - ext/fox16_c/icons_wrap.cpp
 - ext/fox16_c/image_wrap.cpp
@@ -441,6 +436,7 @@ files:
 - ext/fox16_c/include/FXRbXPMIcon.h
 - ext/fox16_c/include/FXRbXPMImage.h
 - ext/fox16_c/include/FXRuby.h
+- ext/fox16_c/include/gvl_wrappers.h
 - ext/fox16_c/include/impl.h
 - ext/fox16_c/include/inlinestubs.h
 - ext/fox16_c/label_wrap.cpp
@@ -486,6 +482,7 @@ files:
 - lib/fox16/settings.rb
 - lib/fox16/signal.rb
 - lib/fox16/splashscreen.rb
+- lib/fox16/thread.rb
 - lib/fox16/timeout.rb
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
@@ -953,6 +950,7 @@ files:
 - test/TC_FXIconList.rb
 - test/TC_FXId.rb
 - test/TC_FXImage.rb
+- test/TC_FXJPGImage.rb
 - test/TC_FXLight.rb
 - test/TC_FXList.rb
 - test/TC_FXListBox.rb
@@ -1032,85 +1030,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
-test_files:
-- test/TC_FXWindow.rb
-- test/TC_FXArc.rb
-- test/TC_FXViewport.rb
-- test/TC_FXText.rb
-- test/TC_FXAccelTable.rb
-- test/TC_FXTreeListBox.rb
-- test/TC_FXMainWindow.rb
-- test/TC_FXDirList.rb
-- test/TC_FXVec3f.rb
-- test/TC_FXBMPImage.rb
-- test/TC_FXXPMImage.rb
-- test/TC_FXRegion.rb
-- test/TC_FXButton.rb
-- test/TC_FXGLViewer.rb
-- test/TC_FXRanged.rb
-- test/TC_FXRegistry.rb
-- test/TC_FXMat4f.rb
-- test/TC_FXListBox.rb
-- test/TC_FXTopWindow.rb
-- test/TC_FXTableItem.rb
-- test/TC_FXFileStream.rb
-- test/TC_FXComboBox.rb
-- test/TC_FXApp.rb
-- test/TC_FXTable.rb
-- test/TC_FXRadioButton.rb
-- test/TC_FXVec4f.rb
-- test/TC_FXExtentd.rb
-- test/TC_FXMenuCommand.rb
-- test/TC_FXPoint.rb
-- test/TC_FXFontDesc.rb
-- test/TC_FXTreeList.rb
-- test/TC_FXIconList.rb
-- test/TC_FXGLShape.rb
-- test/TC_FXId.rb
-- test/TC_FXVec2f.rb
-- test/TC_FXXBMIcon.rb
-- test/TC_FXLight.rb
-- test/TC_FXMaterial.rb
-- test/TC_FXSegment.rb
-- test/TC_FXMemoryStream.rb
-- test/TC_FXScrollWindow.rb
-- test/TC_FXImage.rb
-- test/TC_FXUndoList.rb
-- test/TC_FXXBMImage.rb
-- test/TC_FXSize.rb
-- test/TC_FXDC.rb
-- test/TC_FXIconDict.rb
-- test/TC_FXSettings.rb
-- test/TC_FXBMPIcon.rb
-- test/TC_FXFileAssoc.rb
-- test/TC_Misc.rb
-- test/TC_FXList.rb
-- test/TC_FXDataTarget.rb
-- test/TC_FXXPMIcon.rb
-- test/TC_FXRangef.rb
-- test/TC_FXHeader.rb
-- test/TC_FXRectangle.rb
-- test/TC_FXMessageBox.rb
-- test/TC_downcast.rb
-- test/TC_FXDialogBox.rb
-- test/TC_FXStream.rb
-- test/TC_FXQuatf.rb
-- test/TC_FXVec3d.rb
-- test/TC_FXHiliteStyle.rb
-- test/TC_FXExtentf.rb
-- test/TC_FXShell.rb
-- test/TC_FXMenuCheck.rb
-- test/TC_FXGradientBar.rb
-- test/TC_FXMenuRadio.rb
-- test/TC_FXDCWindow.rb
-- test/TC_FXScrollArea.rb
-- test/TC_FXFont.rb
-- test/TC_FXDCPrint.rb
-- test/TC_FXFoldingList.rb
-- test/TC_FXCheckButton.rb
-- test/TC_FXGLGroup.rb
-- test/TC_FXVec2d.rb
+test_files: []