ffi-tk 2010.02 → 2010.03

data/AUTHORS

@@ -1,5 +1,6 @@
 Following persons have contributed to ffi-tk.
 (Sorted by number of submitted patches, then alphabetically)
 
-   217 Michael Fellinger <m.fellinger@gmail.com>
-    18 Julian Langschaedel <meta.rb@gmail.com>
+   225 Michael Fellinger <m.fellinger@gmail.com>
+    19 Julian Langschaedel <meta.rb@gmail.com>
+     1 unknown <manveru@.(none)>

data/CHANGELOG

@@ -1,3 +1,43 @@
+[920e7c5 | 2010-03-02 05:07:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.03
+
+[d0db268 | 2010-03-02 05:07:23 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update Rakefile
+
+[6704d90 | 2010-03-01 05:38:20 UTC] Julian Langschaedel <meta.rb@gmail.com>
+
+  * Fix ffi_lib loadpaths osx
+
+[9a44790 | 2010-03-01 10:24:38 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some constants for flags
+
+[7c520c9 | 2010-02-28 21:56:12 UTC] unknown <manveru@.(none)>
+
+  * Fix ffi_lib for windows
+
+[8ad1897 | 2010-02-28 06:47:48 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Force output of clipboard to UTF-8
+
+[fb959b5 | 2010-02-26 17:45:24 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Text#get_displaychars should return String
+
+[12d960a | 2010-02-25 15:19:05 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add shortcut for the tcl update command
+
+[2de99ed | 2010-02-17 17:57:57 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make sure Text#tag_cget doesn't return EvalResult
+
+[a173b8a | 2010-02-15 06:37:09 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adapt to FFI 0.6
+
 [e1ae1ee | 2010-02-14 18:34:03 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.02

data/Rakefile

@@ -7,10 +7,10 @@ require 'date'
 PROJECT_SPECS = FileList['spec/ffi-tk/**/*.rb']
 PROJECT_MODULE = 'FFI::Tk'
 PROJECT_README = 'README.md'
-PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
+PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
-  'ffi' => {:version => '~> 0.5.4'},
+  'ffi' => {:version => '= 0.6.2'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {
@@ -29,7 +29,7 @@ GEMSPEC = Gem::Specification.new{|s|
   s.files        = `git ls-files`.split("\n").sort
   s.has_rdoc     = true
   s.require_path = 'lib'
-  s.required_rubygems_version = '>= 1.3.5'
+  s.required_rubygems_version = '>= 1.3.3'
 }
 
 DEPENDENCIES.each do |name, options|

data/ffi-tk.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-tk}
-  s.version = "2010.02"
+  s.version = "2010.03"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.3") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-03-02}
   s.description = %q{Pure Ruby FFI wrapper for the Tk GUI toolkit.}
   s.email = %q{m.fellinger@gmail.com}
   s.files = [".gitignore", "AUTHORS", "CHANGELOG", "MANIFEST", "README.md", "Rakefile", "TODO.md", "bin/rwish", "doc/MIT_LICENSE", "doc/TCL_LICENSE", "example/choose_color.rb", "example/choose_directory.rb", "example/dialog.rb", "example/hello.rb", "example/message_box.rb", "example/option_menu.rb", "example/popup.rb", "example/set_palette.rb", "example/text.rb", "example/tile/kroc_demo_small.rb", "example/tile/kroc_rb_demo.rb", "example/tile/notebook.rb", "example/tile/theme_hello.rb", "example/tile/themes.rb", "example/tile/treeview.rb", "example/tkgo.rb", "example/various.rb", "example/wait.rb", "ffi-tk.gemspec", "lib/ffi-tk.rb", "lib/ffi-tk/command.rb", "lib/ffi-tk/command/after.rb", "lib/ffi-tk/command/bell.rb", "lib/ffi-tk/command/bind.rb", "lib/ffi-tk/command/bindtags.rb", "lib/ffi-tk/command/cget.rb", "lib/ffi-tk/command/choose_color.rb", "lib/ffi-tk/command/choose_directory.rb", "lib/ffi-tk/command/clipboard.rb", "lib/ffi-tk/command/configure.rb", "lib/ffi-tk/command/destroy.rb", "lib/ffi-tk/command/dialog.rb", "lib/ffi-tk/command/event.rb", "lib/ffi-tk/command/focus.rb", "lib/ffi-tk/command/font.rb", "lib/ffi-tk/command/get_open_file.rb", "lib/ffi-tk/command/get_save_file.rb", "lib/ffi-tk/command/grab.rb", "lib/ffi-tk/command/grid.rb", "lib/ffi-tk/command/image.rb", "lib/ffi-tk/command/lower.rb", "lib/ffi-tk/command/message_box.rb", "lib/ffi-tk/command/option_menu.rb", "lib/ffi-tk/command/pack.rb", "lib/ffi-tk/command/place.rb", "lib/ffi-tk/command/popup.rb", "lib/ffi-tk/command/raise.rb", "lib/ffi-tk/command/scrollable.rb", "lib/ffi-tk/command/selection.rb", "lib/ffi-tk/command/set_palette.rb", "lib/ffi-tk/command/tk_cmd.rb", "lib/ffi-tk/command/vars.rb", "lib/ffi-tk/command/wait.rb", "lib/ffi-tk/command/winfo.rb", "lib/ffi-tk/command/wm.rb", "lib/ffi-tk/core_extensions.rb", "lib/ffi-tk/event/data.rb", "lib/ffi-tk/event/handler.rb", "lib/ffi-tk/ffi/tcl.rb", "lib/ffi-tk/ffi/tcl/cmd_proc.rb", "lib/ffi-tk/ffi/tcl/eval_result.rb", "lib/ffi-tk/ffi/tcl/interp.rb", "lib/ffi-tk/ffi/tcl/obj.rb", "lib/ffi-tk/ffi/tcl/time.rb", "lib/ffi-tk/ffi/tk.rb", "lib/ffi-tk/geometry.rb", "lib/ffi-tk/thread_sender.rb", "lib/ffi-tk/tk.rb", "lib/ffi-tk/variable.rb", "lib/ffi-tk/version.rb", "lib/ffi-tk/widget.rb", "lib/ffi-tk/widget/button.rb", "lib/ffi-tk/widget/canvas.rb", "lib/ffi-tk/widget/canvas/arc.rb", "lib/ffi-tk/widget/canvas/bitmap.rb", "lib/ffi-tk/widget/canvas/image.rb", "lib/ffi-tk/widget/canvas/item.rb", "lib/ffi-tk/widget/canvas/line.rb", "lib/ffi-tk/widget/canvas/oval.rb", "lib/ffi-tk/widget/canvas/polygon.rb", "lib/ffi-tk/widget/canvas/rectangle.rb", "lib/ffi-tk/widget/canvas/text.rb", "lib/ffi-tk/widget/canvas/window.rb", "lib/ffi-tk/widget/checkbutton.rb", "lib/ffi-tk/widget/entry.rb", "lib/ffi-tk/widget/frame.rb", "lib/ffi-tk/widget/label.rb", "lib/ffi-tk/widget/labelframe.rb", "lib/ffi-tk/widget/listbox.rb", "lib/ffi-tk/widget/menu.rb", "lib/ffi-tk/widget/menubutton.rb", "lib/ffi-tk/widget/message.rb", "lib/ffi-tk/widget/panedwindow.rb", "lib/ffi-tk/widget/radiobutton.rb", "lib/ffi-tk/widget/root.rb", "lib/ffi-tk/widget/scale.rb", "lib/ffi-tk/widget/scrollbar.rb", "lib/ffi-tk/widget/spinbox.rb", "lib/ffi-tk/widget/text.rb", "lib/ffi-tk/widget/text/peer.rb", "lib/ffi-tk/widget/tile.rb", "lib/ffi-tk/widget/tile/button.rb", "lib/ffi-tk/widget/tile/checkbutton.rb", "lib/ffi-tk/widget/tile/combobox.rb", "lib/ffi-tk/widget/tile/entry.rb", "lib/ffi-tk/widget/tile/frame.rb", "lib/ffi-tk/widget/tile/label.rb", "lib/ffi-tk/widget/tile/labelframe.rb", "lib/ffi-tk/widget/tile/menubutton.rb", "lib/ffi-tk/widget/tile/notebook.rb", "lib/ffi-tk/widget/tile/panedwindow.rb", "lib/ffi-tk/widget/tile/progressbar.rb", "lib/ffi-tk/widget/tile/radiobutton.rb", "lib/ffi-tk/widget/tile/scale.rb", "lib/ffi-tk/widget/tile/scrollbar.rb", "lib/ffi-tk/widget/tile/separator.rb", "lib/ffi-tk/widget/tile/sizegrip.rb", "lib/ffi-tk/widget/tile/style.rb", "lib/ffi-tk/widget/tile/treeview.rb", "lib/ffi-tk/widget/toplevel.rb", "spec/ffi-tk/command/bind.rb", "spec/ffi-tk/command/bindtags.rb", "spec/ffi-tk/command/clipboard.rb", "spec/ffi-tk/command/font.rb", "spec/ffi-tk/command/grid.rb", "spec/ffi-tk/command/image.rb", "spec/ffi-tk/command/pack.rb", "spec/ffi-tk/command/place.rb", "spec/ffi-tk/command/selection.rb", "spec/ffi-tk/command/vars.rb", "spec/ffi-tk/command/winfo.rb", "spec/ffi-tk/command/wm.rb", "spec/ffi-tk/event.rb", "spec/ffi-tk/tile/button.rb", "spec/ffi-tk/tile/checkbutton.rb", "spec/ffi-tk/tile/combobox.rb", "spec/ffi-tk/tile/entry.rb", "spec/ffi-tk/tile/frame.rb", "spec/ffi-tk/tile/label.rb", "spec/ffi-tk/tile/labelframe.rb", "spec/ffi-tk/tile/menubutton.rb", "spec/ffi-tk/tile/notebook.rb", "spec/ffi-tk/tile/panedwindow.rb", "spec/ffi-tk/tile/progressbar.rb", "spec/ffi-tk/tile/radiobutton.rb", "spec/ffi-tk/tile/scale.rb", "spec/ffi-tk/tile/scrollbar.rb", "spec/ffi-tk/tile/separator.rb", "spec/ffi-tk/tile/sizegrip.rb", "spec/ffi-tk/tile/style.rb", "spec/ffi-tk/tile/treeview.rb", "spec/ffi-tk/variable.rb", "spec/ffi-tk/widget/button.rb", "spec/ffi-tk/widget/canvas.rb", "spec/ffi-tk/widget/checkbutton.rb", "spec/ffi-tk/widget/entry.rb", "spec/ffi-tk/widget/frame.rb", "spec/ffi-tk/widget/label.rb", "spec/ffi-tk/widget/labelframe.rb", "spec/ffi-tk/widget/listbox.rb", "spec/ffi-tk/widget/menu.rb", "spec/ffi-tk/widget/menubutton.rb", "spec/ffi-tk/widget/message.rb", "spec/ffi-tk/widget/panedwindow.rb", "spec/ffi-tk/widget/radiobutton.rb", "spec/ffi-tk/widget/root.rb", "spec/ffi-tk/widget/scale.rb", "spec/ffi-tk/widget/scrollbar.rb", "spec/ffi-tk/widget/spinbox.rb", "spec/ffi-tk/widget/text.rb", "spec/ffi-tk/widget/toplevel.rb", "spec/helper.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/ffi-tk}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Pure Ruby FFI wrapper for the Tk GUI toolkit.}
 
   if s.respond_to? :specification_version then
@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, ["~> 0.5.4"])
+      s.add_runtime_dependency(%q<ffi>, ["= 0.6.2"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
     else
-      s.add_dependency(%q<ffi>, ["~> 0.5.4"])
+      s.add_dependency(%q<ffi>, ["= 0.6.2"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
     end
   else
-    s.add_dependency(%q<ffi>, ["~> 0.5.4"])
+    s.add_dependency(%q<ffi>, ["= 0.6.2"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
   end
 end

data/lib/ffi-tk/command/clipboard.rb

@@ -101,7 +101,9 @@ module Tk
       options[:displayof] = window unless None == window
       options[:type] = type.to_s.upcase unless None == type
 
-      Tk.execute(:clipboard, :get, options.to_tcl_options).to_s
+      content = Tk.execute(:clipboard, :get, options.to_tcl_options).to_s
+      content.force_encoding('UTF-8')
+      content
     end
   end
 end

data/lib/ffi-tk/ffi/tcl.rb

@@ -7,7 +7,7 @@ require 'ffi-tk/ffi/tcl/eval_result'
 module FFI
   module Tcl
     extend FFI::Library
-    ffi_lib 'libtcl8.5.so', 'tcl85.dll', *::Tk::LIBPATH[:tcl]
+    ffi_lib [*::Tk::LIBPATH[:tcl], 'libtcl', 'tcl85', 'libtcl8.5']
 
     attach_function :Tcl_AppendAllObjTypes, [Interp, Obj], :int
     attach_function :Tcl_CreateInterp, [], Interp

data/lib/ffi-tk/ffi/tk.rb

@@ -1,7 +1,7 @@
 module FFI
   module Tk
     extend FFI::Library
-    ffi_lib 'libtk8.5.so', 'libtk.so', *::Tk::LIBPATH[:tk]
+    ffi_lib [*::Tk::LIBPATH[:tk], 'libtk', 'tk85', 'libtk8.5']
 
     class XColor < FFI::Struct
       layout(

data/lib/ffi-tk/tk.rb

@@ -23,6 +23,13 @@ module Tk
     RUN_EVENTLOOP_ON_MAIN_THREAD = false
   end
 
+  DONT_WAIT     = 1 << 1
+  WINDOW_EVENTS = 1 << 2
+  FILE_EVENTS   = 1 << 3
+  TIMER_EVENTS  = 1 << 4
+  IDLE_EVENTS   = 1 << 5
+  ALL_EVENTS    = ~DONT_WAIT
+
   def init
     if RUN_EVENTLOOP_ON_MAIN_THREAD
       @interp = FFI::Tcl.setup_eventloop_on_main_thread
@@ -91,6 +98,10 @@ module Tk
     execute('exit')
   end
 
+  def update(idletasks = None)
+    execute('update', idletasks)
+  end
+
   def callback_break
     throw :callback_break
   end

data/lib/ffi-tk/version.rb

@@ -1,3 +1,3 @@
 module FFI::Tk
-  VERSION = "2010.02"
+  VERSION = "2010.03"
 end

data/lib/ffi-tk/widget/text.rb

@@ -291,7 +291,7 @@ module Tk
     # This may have the effect that some of the returned ranges are empty
     # strings.
     def get_displaychars(index, *indices)
-      execute('get', '-displaychars', index, *indices)
+      execute('get', '-displaychars', index, *indices).to_s
     end
 
     def image_cget(index, option)
@@ -728,7 +728,8 @@ module Tk
     # Option may have any of the values accepted by the pathName tag
     # configure widget command.
     def tag_cget(tag_name, option)
-      execute(:tag, :cget, tag_name, option.to_tcl_option)
+      value = execute(:tag, :cget, tag_name, option.to_tcl_option)
+      Cget.option_to_ruby(option, value)
     end
 
     # This command is similar to the pathName configure widget command except

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-tk
 version: !ruby/object:Gem::Version 
-  version: "2010.02"
+  prerelease: false
+  segments: 
+  - 2010
+  - 3
+  version: "2010.03"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,29 +13,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +09:00
+date: 2010-03-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.4
-    version: 
+        segments: 
+        - 0
+        - 6
+        - 2
+        version: 0.6.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Pure Ruby FFI wrapper for the Tk GUI toolkit.
 email: m.fellinger@gmail.com
 executables: []
@@ -248,18 +260,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.5
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 3
+      version: 1.3.3
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Pure Ruby FFI wrapper for the Tk GUI toolkit.