ffi-tk 2010.01.02 → 2010.02

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

@@ -201,18 +201,22 @@ module Tk
       indices = [given_index]
 
       while arg = arguments.shift
-        case arg.to_tcl
-        when '-command'
-          command = arguments.shift
-          invocation << ['-command', command]
-        when /^-(all|image|mark|tag|text|window)$/
-          invocation << tcl_option(arg)
+        if arg.respond_to?(:to_tcl_option)
+          case tcl_option = arg.to_tcl_option
+          when '-command'
+            command = arguments.shift
+            invocation << ['-command', command]
+          when /^-(?:all|image|mark|tag|text|window)$/
+            invocation << tcl_option
+          else
+            indices.unshift(arg)
+          end
         else
           indices.unshift(arg)
         end
       end
 
-      execute('dump', *invocation, *indices)
+      execute('dump', *invocation, *indices).to_a.each_slice(3).to_a
     end
 
     # If boolean is not specified, returns the modified flag of the widget.
@@ -655,7 +659,7 @@ module Tk
     # and the substitutions performed on script before invoking it.
     # If all arguments are specified then a new binding is created, replacing
     # any existing binding for the same sequence and tagName (if the first
-    # character of script is “+” then script augments an existing binding
+    # character of script is "+" then script augments an existing binding
     # rather than replacing it).
     # In this case the return value is an empty string.
     # If script is omitted then the command returns the script associated
@@ -765,8 +769,8 @@ module Tk
     # active at the character position given by index.
     # If index is omitted, then the return value will describe all of the tags
     # that exist for the text (this includes all tags that have been named in a
-    # “pathName tag” widget command but have not been deleted by a “pathName
-    # tag delete” widget command, even if no characters are currently marked
+    # "pathName tag" widget command but have not been deleted by a "pathName
+    # tag delete" widget command, even if no characters are currently marked
     # with the tag).
     # The list will be sorted in order from lowest priority to highest
     # priority.
@@ -889,5 +893,33 @@ module Tk
     def paste
       Tk.execute(:tk_textPaste, self)
     end
+
+    def tk_prev_word_pos(start)
+      Tk.execute('tk::TextPrevPos', self, start, 'tcl_startOfPreviousWord').to_s
+    end
+
+    def tk_next_word_pos(start)
+      Tk.execute('tk::TextNextPos', self, start, 'tcl_startOfNextWord').to_s
+    end
+
+    def tk_next_word_pos_end(start)
+      Tk.execute('tk::TextNextWord', self, start).to_s
+    end
+
+    def tk_prev_line_pos(count)
+      Tk.execute('tk::TextUpDownLine', self, -count.abs).to_s
+    end
+
+    def tk_next_line_pos(count)
+      Tk.execute('tk::TextUpDownLine', self, count).to_s
+    end
+
+    def tk_prev_page_pos(count)
+      Tk.execute('tk::TextScrollPages', self, -count.abs).to_s
+    end
+
+    def tk_next_page_pos(count)
+      Tk.execute('tk::TextScrollPages', self, count).to_s
+    end
   end
 end

data/lib/ffi-tk/widget/tile/notebook.rb

@@ -38,17 +38,20 @@ module Tk
       # the string end, an integer index, or the name of a managed subwindow.
       # If subwindow is already managed by the notebook, moves it to
       # the specified position.
-      def insert(pos, window, options)
-          execute_only(:insert, pos, window, options.to_tcl_options)
+      def insert(pos, window, options = {})
+        execute_only(:insert, pos, window, options.to_tcl_options)
       end
 
       # Selects the specified tab. The associated slave window
       # will be displayed, and the previously-selected window
       # (if different) is unmapped. If tabid is omitted, returns
       # the widget name of the currently selected pane.
-      def select(window)
-        execute_only(:select, window)
-        window.tk_pathname
+      def select(window = None)
+        if None == window
+          execute(:select)
+        else
+          execute_only(:select, window)
+        end
       end
 
       # Remove the pane containing window from the panedwindow.
@@ -57,14 +60,18 @@ module Tk
         execute_only(:forget, window, *windows)
       end
 
-      def hide(window)
-        execute_only(:hide, window)
+      # Hides the tab specified by +tabid+.
+      # The tab will not be displayed, but the associated window remains managed
+      # by the notebook and its configuration remembered.
+      # Hidden tabs may be restored with the add command.
+      def hide(tabid)
+        execute_only(:hide, tabid)
       end
 
-      # Returns the numeric index of the tab specified by tabid,
+      # Returns the numeric index of the tab specified by +tabid+,
       # or the total number of tabs if tabid is the string 'end'.
-      def index(window)
-        execute(:index, window).to_i
+      def index(tabid)
+        execute(:index, tabid).to_i
       end
 
       def identify(x, y)

data/lib/ffi-tk/widget/tile/panedwindow.rb

@@ -3,7 +3,59 @@ module Tk
     class PanedWindow < Tk::PanedWindow
       def self.tk_command; 'ttk::panedwindow'; end
       include TileWidget
+
+      # pathname add subwindow options...
+      # Adds a new pane to the window.
+      # subwindow must be a direct child of the paned window pathname.
+      # See PANE OPTIONS for the list of available options.
+      def add(subwindow, options = {})
+        execute_only(:add, subwindow, options.to_tcl_options)
+      end
+
+      # pathname forget pane
+      # Removes the specified subpane from the widget.
+      # pane is either an integer index or the name of a managed subwindow.
+      def forget(pane)
+        execute_only(:forget, pane)
+      end
+
+      # pathname identify x y
+      # Returns the index of the sash at point x,y, or the empty string if x,y
+      # is not over a sash.
+      def identify(x, y)
+        execute(:identify, x, y)
+      end
+
+      # pathname insert pos subwindow options...
+      # Inserts a pane at the specified position.
+      # pos is either the string end, an integer index, or the name of a managed
+      # subwindow. If subwindow is already managed by the paned window, moves it
+      # to the specified position.
+      # See PANE OPTIONS for the list of available options.
+      def insert(pos, subwindow, options = {})
+        execute_only(:insert, pos, subwindow, options.to_tcl_options)
+      end
+
+      # pathname pane pane -option ?value ?-option value...
+      # Query or modify the options of the specified pane, where pane is either
+      # an integer index or the name of a managed subwindow.
+      # If no -option is specified, returns a dictionary of the pane option
+      # values. If one -option is specified, returns the value of that option.
+      # Otherwise, sets the -options to the corresponding values.
+      def pane(pane, options = {})
+        common_configure([:pane, pane], options)
+      end
+
+      # pathname sashpos index ?newpos?
+      # If newpos is specified, sets the position of sash number index.
+      # May adjust the positions of adjacent sashes to ensure that positions are
+      # monotonically increasing.
+      # Sash positions are further constrained to be between 0 and the total
+      # size of the widget.
+      # Returns the new position of sash number index.
+      def sashpos(index, newpos = None)
+        execute(:sashpos, index, newpos)
+      end
     end
   end
 end
-

data/lib/ffi-tk/widget/tile/scrollbar.rb

@@ -22,8 +22,6 @@ module Tk
       def command(&block)
         configure(:command => block) if block
       end
-
-      def scrollbar_default; end
     end
 
     class YScrollbar < Tk::Tile::Scrollbar

data/lib/ffi-tk/widget/tile/sizegrip.rb

@@ -17,8 +17,8 @@ module Tk
       # BUG: http://tcl.activestate.com/man/tcl8.5/TkCmd/ttk_sizegrip.htm
       # If the containing toplevel's position was specified relative to the
       # right or bottom of the screen (e.g., 'wm geometry ... wxh-x-y' instead
-      # of “wm geometry ... wxh+x+y”), the sizegrip widget will not resize the
-      # window. ttk::sizegrip widgets only support “southeast” resizing.
+      # of "wm geometry ... wxh+x+y"), the sizegrip widget will not resize the
+      # window. ttk::sizegrip widgets only support "southeast" resizing.
     end
   end
 end

data/lib/ffi-tk/widget/tile/style.rb

@@ -103,7 +103,7 @@ module Tk
       # Returns the value specified for -option in style style in state
       # state, using the standard lookup rules for element options.
       # state is a list of state names; if omitted, it defaults to all
-      # bits off (the “normal” state). If the default argument is present,
+      # bits off (the "normal" state). If the default argument is present,
       # it is used as a fallback value in case no specification
       # for -option is found.
       def self.lookup(style, option, state=Tk::None, default=Tk::None)

data/lib/ffi-tk/widget/tile/treeview.rb

@@ -19,7 +19,7 @@ module Tk
     # Treeview widgets support horizontal and vertical scrolling with the
     # standard -[xy]scrollcommand options and [xy]view widget commands.
     class Treeview < Tk::Widget
-      include Tk::Tile::TileWidget, Cget, Configure
+      include Tk::Tile::TileWidget, Scrollable, Cget, Configure
 
       def self.tk_command; 'ttk::treeview'; end
 
@@ -217,6 +217,10 @@ module Tk
           tk_parent.children(id, *new_children)
         end
 
+        def selection_set
+          tk_parent.selection_set(id)
+        end
+
         def selection_add
           tk_parent.selection_add(id)
         end
@@ -322,12 +326,12 @@ module Tk
 
       # Returns the list of selected items.
       def selection
-        execute(:selection).to_a
+        execute(:selection).to_a.map{|id| Item.new(self, id) }
       end
 
       # +items+ becomes the new selection.
       def selection_set(*items)
-        execute(:selection, set, *items.flatten)
+        execute(:selection, :set, *items.flatten)
       end
 
       # Add +items+ to the selection

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

@@ -0,0 +1,25 @@
+require_relative '../../helper'
+
+describe Tk::Bind do
+  entry = Tk::Entry.new
+  entry.pack
+  entry.focus
+
+  it 'should bind a block' do
+    foo = false
+    entry.bind('f'){ foo = true }
+    Tk.interp.do_events_until{
+      Tk::Event.generate(entry, 'f')
+      foo
+    }
+    foo.should == true
+  end
+
+  it 'should return the bound proc' do
+    entry.bind('f').should == ' ::RubyFFI::event 0 f %# %b %c %d %f %h %i %k %m %o %p %s %t %w %x %y %A %B %D %E %K %N %P %R %S %T %W %X %Y '
+  end
+
+  it 'should list the sequences bound' do
+    entry.bind.should == ['f']
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-tk
 version: !ruby/object:Gem::Version 
-  version: 2010.01.02
+  version: "2010.02"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 +09:00
+date: 2010-02-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - AUTHORS
 - CHANGELOG
 - MANIFEST
@@ -63,6 +64,7 @@ files:
 - 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
@@ -169,6 +171,7 @@ files:
 - 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