ffi-tk 2010.01 → 2010.01.02

data/MANIFEST

@@ -1,4 +1,3 @@
-.gitignore
 AUTHORS
 CHANGELOG
 MANIFEST
@@ -21,7 +20,6 @@ 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
@@ -128,7 +126,6 @@ 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

data/ffi-tk.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-tk}
-  s.version = "2010.01"
+  s.version = "2010.01.02"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-01-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.files = ["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/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/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}

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

@@ -1,28 +1,11 @@
 module Tk
   module Bind
-    def self.bind(tag, sequence = None)
-      if None == sequence
-        Tk.execute(:bind, tag).to_a
-      else
-        if block_given?
-          Event::Handler.register(tag, sequence, &Proc.new)
-        else
-          Tk.execute(:bind, tag, sequence).to_s
-        end
-      end
+    def self.bind(pathname, sequence, &block)
+      Event::Handler.register(pathname, sequence, &block)
     end
 
-    # TODO: remove the block associated
-    def self.unbind(tag, sequence)
-      Event::Handler.unregister(tag, sequence)
-    end
-
-    def bind(sequence = None, &block)
+    def bind(sequence, &block)
       Bind.bind(tk_pathname, sequence, &block)
     end
-
-    def unbind(sequence)
-      Bind.unbind(tk_pathname, sequence)
-    end
   end
-end
+end

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

@@ -58,16 +58,12 @@ module Tk
   end
 
   class BindTag < Struct.new(:name)
-    def bind(sequence = None, &block)
+    def bind(sequence, &block)
       Bind.bind(name, sequence, &block)
     end
 
-    def unbind(sequence)
-      Bind.unbind(name, sequence)
-    end
-
     def to_tcl
       TclString.new(name)
     end
   end
-end
+end

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

@@ -21,7 +21,8 @@ module Tk
     end
 
     def clipboard_set(string, options = {})
-      Clipboard.set(string, options)
+      clipboard_clear
+      clipboard_append(options.merge(data: string))
     end
 
     module_function
@@ -84,12 +85,6 @@ module Tk
       Tk.execute_only(:clipboard, :append, *args)
     end
 
-    # Shortcut to clear clipboard and append given +string+.
-    def set(string, options = {})
-      clear
-      append(options.merge(data: string))
-    end
-
     # Retrieve data from the clipboard on +window+'s display.
     # +window+ defaults to ".".
     # +type+ specifies the form in which the data is to be returned and should be

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

@@ -60,7 +60,7 @@ module Tk
     # processed. Certain events, such as key events, require that the window has
     # focus to receive the event properly.
     def self.generate(window = None, event = None, options = {})
-      Tk.execute_only(:event, :generate, window, event, options.to_tcl_options)
+      Tk.execute_only(:event, :generate, window, event, options)
     end
 
     # Returns information about virtual events.
@@ -76,4 +76,4 @@ module Tk
       Tk.execute(:event, :info, virtual).to_a
     end
   end
-end
+end

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

@@ -25,7 +25,7 @@ module Tk
   # mouse motion events are reported to window, and window entry and window exit
   # events are ignored.
   #
-  # The grab subtree owns the pointer: windows outside the grab subtree
+  # The grab subtree “owns” the pointer: windows outside the grab subtree
   # will be visible on the screen but they will be insensitive until the grab is
   # released. The tree of windows underneath the grab window can include
   # top-level windows, in which case all of those top-level windows and their
@@ -138,4 +138,4 @@ module Tk
       Tk.execute(:grab, :set, '-global', window)
     end
   end
-end
+end

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

@@ -70,9 +70,9 @@ module Tk
     # If only an option is specified, with no value, the current value of that
     # option is returned.
     # If only the master window and index is specified, all the current settings
-    # are returned in a list of "-option value" pairs.
-    def self.columnconfigure(master, index, options = None)
-      Tk.execute('grid', 'columnconfigure', master, index, options.to_tcl_options?)
+    # are returned in a list of “-option value” pairs.
+    def self.columnconfigure(master, index, options = {})
+      Tk.execute('grid', 'columnconfigure', master, index, options)
     end
 
     # The arguments consist of the names of one or more slave windows followed
@@ -97,7 +97,7 @@ module Tk
     # Returns a list whose elements are the current configuration state of the
     # slave given by slave in the same option-value form that might be specified
     # to grid configure.
-    # The first two elements of the list are "-in master" where master is
+    # The first two elements of the list are “-in master” where master is
     # the slave's master.
     def self.info(slave)
       Tk.execute('grid', 'info', slave)
@@ -148,7 +148,7 @@ module Tk
     # If only an option is specified, with no value, the current value of that
     # option is returned.
     # If only the master window and index is specified, all the current settings
-    # are returned in a list of "-option value" pairs.
+    # are returned in a list of “-option value” pairs.
     def self.rowconfigure(master, index, options = None)
       Tk.execute('grid', 'rowconfigure', master, index, options.to_tcl_options?)
     end
@@ -194,8 +194,8 @@ module Tk
     end
 
     # @see Grid::columnconfigure
-    def grid_columnconfigure(index, options = None)
-      Grid.columnconfigure(self, index, options)
+    def grid_columnconfigure(index, options = {})
+      Grid.columnconfigure(self, index, options.to_tcl_options)
     end
 
     # @see Grid::configure

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

@@ -32,7 +32,11 @@ module Tk
     # option(s) to have the given value(s); in this case the command returns
     # nil.
     def self.configure(window, options = None)
-      Configure.common(Tk, [:place, :configure, window], options)
+      if options == None
+        Tk.execute('place', 'configure', window)
+      else
+        Tk.execute_only('place', 'configure', window, options)
+      end
     end
 
     def self.forget(window)
@@ -84,4 +88,4 @@ module Tk
       Place.slaves(self)
     end
   end
-end
+end

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

@@ -31,14 +31,14 @@ module Tk
     # This command shifts the view in the window left or right according to
     # number and what.
     # What must be units, pages or pixels.
-    # If what is units or pages then number must be an integer, otherwise
-    # number may be specified in any of the forms acceptable to
-    # Tk_GetPixels, such as "2.0c" or "1i" (the result is rounded to the
-    # nearest integer value.
+    # If what is units or pages then number │ must be an integer, otherwise
+    # number may be specified in any of the forms accept│ able to
+    # Tk_GetPixels, such as “2.0c” or “1i” (the result is rounded to the
+    # nearest │ integer value.
     # If no units are given, pixels are assumed).
-    # If what is units, the view adjusts left or right by number
-    # average-width characters on the display; if it is pages then the view
-    # adjusts by number screenfuls; if it is pixels then the view adjusts by
+    # If what is units, the │ view adjusts left or right by number
+    # average-width characters on the display; if │ it is pages then the view
+    # adjusts by number screenfuls; if it is pixels then the │ view adjusts by
     # number pixels.
     # If number is negative then characters farther to the left become visible;
     # if it is positive then characters farther to the right become visible.
@@ -75,11 +75,11 @@ module Tk
     # Fraction is a fraction between 0 and 1; 0 indicates the first pixel of
     # the first character in the text, 0.33 indicates the pixel that is
     # one-third the way through the text; and so on.
-    # Values close to 1 will indicate values close to the last pixel in the
-    # text (1 actually refers to one pixel beyond the last pixel), but in
-    # such cases the widget will never scroll beyond the last pixel, and so a
-    # value of 1 will effectively be rounded back to whatever fraction
-    # ensures the last pixel is at the bottom of the window, and some other
+    # Values close to 1 │ will indicate values close to the last pixel in the
+    # text (1 actually refers to one │ pixel beyond the last pixel), but in
+    # such cases the widget will never scroll │ beyond the last pixel, and so a
+    # value of 1 will effectively be rounded back to │ whatever fraction
+    # ensures the last pixel is at the bottom of the window, and some │ other
     # pixel is at the top.
     def yview_moveto(fraction)
       execute_only(:yview, :moveto, fraction)
@@ -88,14 +88,14 @@ module Tk
     # This command adjust the view in the window up or down according to number
     # and what.
     # What must be units, pages or pixels.
-    # If what is units or pages then number must be an integer, otherwise
-    # number may be specified in any of the forms acceptable to
-    # Tk_GetPixels, such as "2.0c" or "1i" (the result is rounded to the
-    # nearest integer value.
+    # If what is units or pages then number │ must be an integer, otherwise
+    # number may be specified in any of the forms accept│ able to
+    # Tk_GetPixels, such as “2.0c” or “1i” (the result is rounded to the
+    # nearest │ integer value.
     # If no units are given, pixels are assumed).
-    # If what is units, the view adjusts up or down by number lines on the
-    # display; if it is pages then the view adjusts by number screenfuls; if
-    # it is pixels then the view adjusts by number pixels.
+    # If what is units, the │ view adjusts up or down by number lines on the
+    # display; if it is pages then the │ view adjusts by number screenfuls; if
+    # it is pixels then the view adjusts by number │ pixels.
     # If number is negative then earlier positions in the text become visible;
     # if it is positive then later positions in the text become visible.
     def yview_scroll(number, what)

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

@@ -35,9 +35,9 @@ module Tk
     end
 
     # Retrieves the value of selection from window's display and returns it as a
-    # result. Selection defaults to PRIMARY and window defaults to ".".
+    # result. Selection defaults to PRIMARY and window defaults to “.”.
     # Type specifies the form in which the selection is to be returned (the
-    # desired "target" for conversion, in ICCCM terminology), and should be
+    # desired “target” for conversion, in ICCCM terminology), and should be
     # an atom name such as STRING or FILE_NAME; see the Inter-Client
     # Communication Conventions Manual for complete details.
     # Type defaults to STRING.
@@ -129,4 +129,4 @@ module Tk
       end
     end
   end
-end
+end

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

@@ -51,9 +51,8 @@ module Tk
     # application (the name that may be used in send commands to communicate
     # with the application).
     # If newName is specified, then the name of the application is changed to
-    # newName.
-    # If the given name is already in use, then a suffix of the form "#2" or
-    # "#3" is appended in order to make the name unique.
+    # newName. If the given name is already in use, then a suffix of the form “
+    # #2” or “ #3” is appended in order to make the name unique.
     # The command's result is the name actually chosen.
     # newName should not start with a capital letter.
     # This will interfere with option processing, since names starting with
@@ -91,7 +90,7 @@ module Tk
     # If the window argument is omitted, it defaults to the main window.
     # If the number argument is omitted, the current value of the scaling
     # factor is returned.
-    # A "point" is a unit of measurement equal to 1/72 inch.
+    # A “point” is a unit of measurement equal to 1/72 inch.
     # A scaling factor of 1.0 corresponds to 1 pixel per point, which is
     # equivalent to a standard 72 dpi monitor.
     # A scaling factor of 1.25 would mean 1.25 pixels per point, which is the

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

@@ -434,7 +434,7 @@ module Tk
     # Returns the number of pixels in window corresponding to the distance
     # given by number.
     # Number may be specified in any of the forms acceptable to Tk_GetPixels,
-    # such as "2.0c" or "1i".
+    # such as “2.0c” or “1i”.
     # The result is rounded to the nearest integer value; for a fractional
     # result, use winfo fpixels.
     def pixels(window, number)
@@ -665,4 +665,4 @@ module Tk
       Tk.execute(:winfo, :y, window)
     end
   end
-end
+end

data/lib/ffi-tk/core_extensions.rb

@@ -14,8 +14,6 @@ module Tk
         TclString.new('{' << map(&:to_tcl).compact.join(' ') << '}')
       end
 
-      # try to convert to a Hash.
-      # it may return an Array if this contains none.
       def tcl_options_to_hash(hints = {})
         if first.respond_to?(:to_ary)
           hash = {}
@@ -38,8 +36,9 @@ module Tk
           end
 
           hash
-        elsif first =~ /^-/
+        else
           ::Hash[each_slice(2).map{|key, value|
+
             key = key.sub(/^-/, '').to_sym
 
             case hint = hints[key]
@@ -53,8 +52,6 @@ module Tk
               [key, value]
             end
           }]
-        else
-          self
         end
       end
     end
@@ -98,7 +95,7 @@ module Tk
 
     module String
       def to_tcl
-        TclString.new('"' << gsub(/[\[\]{}$"\\]/, '\\\\\&') << '"')
+        TclString.new('"' << gsub(/[\[\]$"\\]/, '\\\\\&') << '"')
       end
 
       def to_tcl_option

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

@@ -33,8 +33,8 @@ module Tk
         ['%K', :String,  :keysym            ],
         ['%N', :Integer, :keysym_number     ],
         ['%P', :String,  :property          ],
-        ['%R', :String,  :root              ],
-        ['%S', :String,  :subwindow         ],
+        ['%R', :Integer, :root              ],
+        ['%S', :Integer, :subwindow         ],
         ['%T', :Integer, :type              ],
         ['%W', :String,  :window_path       ],
         ['%X', :Integer, :x_root            ],
@@ -45,8 +45,7 @@ module Tk
         super id, sequence
 
         PROPERTIES.each do |code, conv, name|
-          value = properties.shift
-          converted = __send__(conv, value)
+          converted = __send__(conv, properties.shift)
           next if converted == '??'
           self[name] = converted
         end
@@ -55,36 +54,6 @@ module Tk
       def call
         Handler.invoke(id, self) if id
       end
-
-      # Try to resend the event with as much information preserved as possible.
-      # Unfortunately that doesn't seem to be easy.
-      def resend(widget, virtual, changes = {})
-        original = {}
-        members.each do |name|
-          value = self[name]
-
-          case name
-          when :id, :sequence, :border_width, :button, :count, :focus, :height,
-            :keycode, :keysym, :keysym_number, :mode, :mousewheel_delta,
-            :override_redirect, :place, :property, :root, :send_event,
-            :subwindow, :type, :unicode, :width, :window, :window_path
-          when :x_root
-            original[:rootx] = value
-          when :y_root
-            original[:rooty] = value
-          when :detail
-            original[name] = value if value
-          else
-            original[name] = value
-          end
-        end
-
-        Event.generate(widget, virtual, original.merge(changes))
-      end
-
-      def widget
-        Tk.widgets[window_path]
-      end
     end
   end
 end

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

@@ -4,7 +4,6 @@ module Tk
       data = Data::PROPERTIES.transpose[0].join(' ').gsub(/%/, '%%')
       @callback = %(bind %s %s { ::RubyFFI::event %d %s #{data} })
       @store = []
-      @bound = {}
       @mutex = Mutex.new
 
       module_function
@@ -28,7 +27,6 @@ module Tk
       def register(tag, sequence, &block)
         id = register_block(block)
         Tk.interp.eval(@callback % [tag, sequence, id, sequence])
-        @bound[[tag, sequence]] = block
         id
       end
 
@@ -38,15 +36,8 @@ module Tk
         id
       end
 
-      def unregister(tag, sequence)
-        key = [tag, sequence]
-
-        if block = @bound[key]
-          Tk.execute(:bind, tag, sequence, nil)
-          id = @store.index(block)
-          @store[id] = nil
-          @bound.delete(key)
-        end
+      def unregister(id)
+        @store[id] = nil
       end
     end
   end

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

@@ -30,9 +30,6 @@ module FFI
             Tcl.new_string_obj(ruby_obj, ruby_obj.bytesize)
           when Fixnum
             Tcl.new_int_obj(ruby_obj)
-          when Exception
-            string = [ruby_obj.message, *ruby_obj.backtrace].join("\n")
-            Tcl.new_string_obj(string, string.bytesize)
           else
             if ruby_obj.respond_to?(:to_tcl)
               ruby_obj.to_tcl

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

@@ -3,44 +3,11 @@ module FFI
     extend FFI::Library
     ffi_lib 'libtk8.5.so', 'libtk.so', *::Tk::LIBPATH[:tk]
 
-    class XColor < FFI::Struct
-      layout(
-        :pixel, :ulong,
-        :red,   :ushort,
-        :green, :ushort,
-        :blue,  :ushort,
-        :flags, :char,
-        :pad,   :char
-      )
-
-      def red
-        self[:red]
-      end
-
-      def green
-        self[:green]
-      end
-
-      def blue
-        self[:blue]
-      end
-    end
-
-    # This is opaque
-    class Window < FFI::Struct
-    end
-
     attach_function :Tk_Init, [:pointer], :int
-    attach_function :Tk_MainWindow, [Tcl::Interp], Window
-    attach_function :Tk_GetColor, [Tcl::Interp, Window, name = :string], XColor
     attach_function :Tk_MainLoop, [], :void
 
     module_function
 
-    def get_color(interp, string)
-      XColor.new(Tk_GetColor(interp, Tk_MainWindow(interp), string))
-    end
-
     def mainloop
       if ::Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
         Tk_MainLoop()

data/lib/ffi-tk/tk.rb

@@ -124,7 +124,7 @@ module Tk
 
     return BREAK
   rescue => ex
-    FFI::Tcl::Interp.new(interp).obj_result = ex
+    FFI::Tcl::Interp.new(interp).obj_result = ex.message
     return ERROR
   end
   TCL_CALLBACK = method(:tcl_callback)
@@ -145,7 +145,7 @@ module Tk
 
     return BREAK
   rescue => ex
-    FFI::Tcl::Interp.new(interp).obj_result = ex
+    FFI::Tcl::Interp.new(interp).obj_result = ex.message
     return ERROR
   end
   TCL_EVENT = method(:tcl_event)

data/lib/ffi-tk/version.rb

@@ -1,3 +1,3 @@
 module FFI::Tk
-  VERSION = "2010.01"
+  VERSION = "2010.01.02"
 end

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

@@ -15,7 +15,7 @@ module Tk
       end
     end
 
-    # Deselects the checkbutton and sets the associated variable to its "off"
+    # Deselects the checkbutton and sets the associated variable to its “off”
     # value.
     def deselect
       execute_only(:deselect)
@@ -36,12 +36,12 @@ module Tk
     # Tcl command associated with the checkbutton, if there is one.
     # The return value is the return value from the Tcl command, or an empty
     # string if there is no command associated with the checkbutton.
-    # This command is ignored if the checkbutton's state is disabled.
+    # This command is ignored if the checkbut‐ ton's state is disabled.
     def invoke
       execute_only(:invoke)
     end
 
-    # Selects the checkbutton and sets the associated variable to its "on"
+    # Selects the checkbutton and sets the associated variable to its “on”
     # value.
     def select
       execute_only(:select)

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

@@ -20,7 +20,7 @@ module Tk
     # Sets the active element to the one indicated by index.
     # If index is outside the range of elements in the listbox then the closest
     # element is activated.
-    # The active element is drawn as specified by -activestyle when the
+    # The active element is drawn as speci‐ fied by -activestyle when the
     # widget has the input focus, and its index may be retrieved with the index
     # active.
     def activate(index)
@@ -100,7 +100,7 @@ module Tk
     # of this list).
     # If option is specified with no value, then the command returns a list
     # describing the one named option (this list will be identical to the
-    # corresponding sublist of the value returned if no option is specified).
+    # correspond‐ ing sublist of the value returned if no option is specified).
     # If one or more option-value pairs are specified, then the command
     # modifies the given widget option(s) to have the given value(s); in this
     # case the command returns an empty string.
@@ -136,7 +136,7 @@ module Tk
 
     # This command computes the difference between its x and y arguments and
     # the x and y arguments to the last scan mark command for the widget.
-    # It then adjusts the view by 10 times the difference in coordinates.
+    # It then adjusts the view by 10 times the dif‐ ference in coordinates.
     # This command is typically associated with mouse motion events in the
     # widget, to produce the effect of dragging the list at high speed through
     # the window.