ffi-tk 2010.01 → 2010.01.02

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

@@ -44,7 +44,7 @@ module Tk
     # This option is not available for separator or tear-off entries.
     # -bitmap value Specifies a bitmap to display in the menu instead of a
     # textual label, in any of the forms accepted by Tk_GetBitmap.
-    # This option overrides the -label option (as controlled by the -compound
+    # This option overrides the -label option (as controlled by the -com‐ pound
     # option) but may be reset to an empty string to enable a textual label to
     # be displayed.
     # If a -image option has been specified, it overrides -bitmap.
@@ -58,7 +58,7 @@ module Tk
     # -compound value Specifies whether the menu entry should display both an
     # image and text, and if so, where the image should be placed relative to
     # the text.
-    # Valid values for this option are bottom, center, left, none, right and
+    # Valid values for this option are bottom, cen‐ ter, left, none, right and
     # top. The default value is none, meaning that the button will display
     # either an image or text, depending on the values of the -image and
     # -bitmap options.
@@ -122,7 +122,7 @@ module Tk
     # bindings will refuse to activate or invoke the entry.
     # In this state the entry is displayed according to the disabledForeground
     # option for the menu and the background option from the entry.
-    # This option is not available for separator entries.
+    # This option is not available for separa‐ tor entries.
     # -underline value Specifies the integer index of a character to underline
     # in the entry.
     # This option is also queried by the default bindings and used to implement
@@ -255,7 +255,7 @@ module Tk
     # Unmap the window so that it is no longer displayed.
     # If a lower-level cascaded menu is posted, unpost that menu.
     # Returns an empty string.
-    # This subcommand does not work on Windows and the Macintosh, as those
+    # This subcommand does not work on Windows and the Mac‐ intosh, as those
     # platforms have their own way of unposting menus.
     def unpost
       execute(:unpost)
@@ -263,6 +263,7 @@ module Tk
 
     # Returns a decimal string giving the x-coordinate within the menu window
     # of the leftmost pixel in the entry specified by index.
+    # │
     def xposition(index)
       execute(:xposition, index)
     end
@@ -298,7 +299,7 @@ module Tk
     # menus. You create a torn-off menu by invoking the tear-off entry at the
     # top of an existing menu.
     # The default bindings will create a new menu that is a copy of the
-    # original menu and leave it permanently posted as a top-level window.
+    # original menu and leave it perma‐ nently posted as a top-level window.
     # The torn-off menu behaves just the same as the original menu.
     # and unposts the menu.
     # If the current menu is a top-level menu posted from a menubutton, then

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

@@ -62,7 +62,7 @@ module Tk
 
     # This command computes the difference between the given coordinates and
     # the coordinates given to the last sash mark command for the given sash.
-    # It then moves that sash the computed difference.
+    # It then moves that sash the computed dif‐ ference.
     def sash_dragto(index, x, y)
       execute_only(:sash, :dragto, index, x, y)
     end
@@ -84,107 +84,81 @@ module Tk
       execute(:panecget, window, option.to_tcl_option)
     end
 
-    # Query or modify the management options for +window+.
-    #
-    # If no +options+ is specified, returns a list describing all of the available
-    # options for +window+ (see Tk_ConfigureInfo for information on the format
+    # Query or modify the management options for window.
+    # If no option is specified, returns a list describing all of the available
+    # options for pathName (see Tk_ConfigureInfo for information on the format
     # of this list).
-    #
-    # If +options+ is specified with no value, then the command returns a 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).
-    #
-    # 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.
-    #
-    # The following options are supported:
-    #   :after window
-    #     Insert the window after the window specified.
-    #     window should be the name of a window already managed by +window+.
-    #
-    #   :before window
-    #     Insert the window before the window specified.
-    #     window should be the name of a window already managed by +window+.
-    #
-    #   :height size
-    #     Specify a height for the window.
-    #     The height will be the outer dimension of the window including its
-    #     border, if any.
-    #     If size is an empty string, or if -height is not specified, then the
-    #     height requested internally by the window will be used initially; the
-    #     height may later be adjusted by the movement of sashes in the
-    #     panedwindow. Size may be any value accepted by Tk_GetPixels.
-    #
-    #   :hide boolean
-    #     Controls the visibility of a pane.
-    #     When the boolean is true (according to Tcl_GetBoolean) the pane will
-    #     not be visible, but it will still be maintained in the list of panes.
-    #
-    #   :minsize n
-    #     Specifies that the size of the window cannot be made less than n.
-    #     This constraint only affects the size of the widget in the paned
-    #     dimension -- the x dimension for horizontal panedwindows, the y
-    #     dimension for vertical panedwindows.
-    #     May be any value accepted by Tk_GetPixels.
-    #
-    #   :padx n
-    #     Specifies a non-negative value indicating how much extra space to
-    #     leave on each side of the window in the X-direction.
-    #     The value may have any of the forms accepted by Tk_GetPixels.
-    #
-    #   :pady n
-    #     Specifies a non-negative value indicating how much extra space to
-    #     leave on each side of the window in the Y-direction.
-    #     The value may have any of the forms accepted by Tk_GetPixels.
-    #   :sticky style
-    #     If a window's pane is larger than the requested dimensions of the
-    #     window, this option may be used to position (or stretch) the window
-    #     within its pane.
-    #     Style is a string that contains zero or more of the characters n, s, e
-    #     or w.
-    #     The string can optionally contains spaces or commas, but they are
-    #     ignored. Each letter refers to a side (north, south, east, or west)
-    #     that the window will "stick" to.
-    #     If both n and s (or e and w) are specified, the window will be
-    #     stretched to fill the entire height (or width) of its cavity.
-    #   :stretch when
-    #     Controls how extra space is allocated to each of the panes.
-    #     When is one of always, first, last, middle, and never.
-    #     The panedwindow will calculate the required size of all its panes.
-    #     Any remaining (or deficit) space will be distributed to those panes
-    #     marked for stretching.
-    #     The space will be distributed based on each panes current ratio of the
-    #     whole.
-    #     The when values have the following definition:
-    #       :always
-    #         This pane will always stretch.
-    #       :first
-    #         Only if this pane is the first pane (left-most or top-most) will
-    #         it stretch.
-    #       :last
-    #         Only if this pane is the last pane (right-most or bottom-most)
-    #         will it stretch. This is the default value.
-    #       :middle
-    #         Only if this pane is not the first or last pane will it stretch.
-    #       :never
-    #         This pane will never stretch.
-    #
-    #   :width size
-    #     Specify a width for the window.
-    #     The width will be the outer dimension of the window including its
-    #     border, if any.
-    #     If size is an empty string, or if -width is not specified, then the
-    #     width requested internally by the window will be used initially; the
-    #     width may later be adjusted by the movement of sashes in the
-    #     panedwindow. Size may be any value accepted by Tk_GetPixels.
+    # 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.
+    # The following options are supported: -after window Insert the window
+    # after the window specified.
+    # window should be the name of a window already managed by pathName.
+    # -before window Insert the window before the window specified.
+    # window should be the name of a window already managed by pathName.
+    # -height size Specify a height for the window.
+    # The height will be the outer dimension of the window including its
+    # border, if any.
+    # If size is an empty string, or if -height is not specified, then the
+    # height requested internally by the window will be used initially; the
+    # height may later be adjusted by the movement of sashes in the
+    # panedwindow. Size may be any value accepted by Tk_GetPixels.
+    # -hide boolean Controls the visibility of a pane.
+    # When the boolean is true (according to Tcl_GetBoolean) the pane will not
+    # be visible, but it will still be maintained in the list of panes.
+    # │ -minsize n Specifies that the size of the window cannot be made less
+    # than n.
+    # This constraint only affects the size of the widget in the paned
+    # dimension — the x dimension for horizontal panedwin‐ dows, the y
+    # dimension for vertical panedwindows.
+    # May be any value accepted by Tk_GetPixels.
+    # -padx n Specifies a non-negative value indicating how much extra space to
+    # leave on each side of the window in the X-direction.
+    # The value may have any of the forms accepted by Tk_GetPixels.
+    # -pady n Specifies a non-negative value indicating how much extra space to
+    # leave on each side of the window in the Y-direction.
+    # The value may have any of the forms accepted by Tk_GetPixels.
+    # -sticky style If a window's pane is larger than the requested dimensions
+    # of the window, this option may be used to position (or stretch) the
+    # window within its pane.
+    # Style is a string that contains zero or more of the characters n, s, e or
+    # w. The string can optionally contains spaces or commas, but they are
+    # ignored. Each letter refers to a side (north, south, east, or west) that
+    # the window will “stick” to.
+    # If both n and s (or e and w) are specified, the window will be stretched
+    # to fill the entire height (or width) of its cavity.
+    # -stretch when Controls how extra space is allocated to each of the panes.
+    # When is one of always, first, last, middle, and never.
+    # The panedwindow will calculate the required size of all its panes.
+    # │ Any remaining (or deficit) space will be distributed to those panes
+    # marked for stretching.
+    # The space will be distributed based on each panes current ratio of the
+    # whole. The when values │ have the following definition: │ always │ This
+    # pane will always stretch.
+    # │ first │ Only if this pane is the first pane (left-most or top-most)
+    # will it stretch.
+    # │ last │ Only if this pane is the last pane (right-most or bottom-most)
+    # will it stretch.
+    # This is the default value.
+    # │ middle │ Only if this pane is not the first or last pane will it
+    # stretch. │ never │ This pane will never stretch.
+    # │ -width size Specify a width for the window.
+    # The width will be the outer dimension of the window including its border,
+    # if any.
+    # If size is an empty string, or if -width is not specified, then the width
+    # requested internally by the window will be used initially; the width may
+    # later be adjusted by the movement of sashes in the panedwindow.
+    # Size may be any value accepted by Tk_Get‐ Pixels.
     def paneconfigure(window, options = None)
       common_configure([:paneconfigure, window], options)
     end
 
-    # Returns an ordered list of the widgets managed by +window+.
-    def panes(window = None)
-      execute(:panes, window).to_a
+    # Returns an ordered list of the widgets managed by pathName.
+    def panes
+      execute(:panes).to_a
     end
   end
 end

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

@@ -201,22 +201,18 @@ module Tk
       indices = [given_index]
 
       while arg = arguments.shift
-        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
+        case arg.to_tcl
+        when '-command'
+          command = arguments.shift
+          invocation << ['-command', command]
+        when /^-(all|image|mark|tag|text|window)$/
+          invocation << tcl_option(arg)
         else
           indices.unshift(arg)
         end
       end
 
-      execute('dump', *invocation, *indices).to_a.each_slice(3).to_a
+      execute('dump', *invocation, *indices)
     end
 
     # If boolean is not specified, returns the modified flag of the widget.
@@ -659,7 +655,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
@@ -769,8 +765,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.
@@ -893,33 +889,5 @@ 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,20 +38,17 @@ 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 = None)
-        if None == window
-          execute(:select)
-        else
-          execute_only(:select, window)
-        end
+      def select(window)
+        execute_only(:select, window)
+        window.tk_pathname
       end
 
       # Remove the pane containing window from the panedwindow.
@@ -60,18 +57,14 @@ module Tk
         execute_only(:forget, window, *windows)
       end
 
-      # 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)
+      def hide(window)
+        execute_only(:hide, window)
       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(tabid)
-        execute(:index, tabid).to_i
+      def index(window)
+        execute(:index, window).to_i
       end
 
       def identify(x, y)

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

@@ -3,59 +3,7 @@ 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/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

@@ -217,10 +217,6 @@ 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
@@ -326,12 +322,12 @@ module Tk
 
       # Returns the list of selected items.
       def selection
-        execute(:selection).to_a.map{|id| Item.new(self, id) }
+        execute(:selection).to_a
       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

metadata

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

data/.gitignore

@@ -1 +0,0 @@
-tags

data/example/tile/themes.rb

@@ -1,13 +0,0 @@
-require 'ffi-tk'
-
-Tk::Tile::Style.theme_names.each do |name|
-  button = Tk::Tile::Button.new(
-    text: name,
-    command: ->{ Tk::Tile.set_theme(name) })
-  button.pack side: :top, anchor: :nw
-end
-
-button = Tk::Tile::Button.new(text: 'Exit', command: ->{ Tk.exit })
-button.pack side: :top, anchor: :nw
-
-Tk.mainloop

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

@@ -1,25 +0,0 @@
-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