ffi-tk 2010.08.23 → 2018.02.20

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Destroy
     def self.destroy(*windows)
@@ -9,4 +10,4 @@ module Tk
       Destroy.destroy(self)
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 
@@ -18,7 +19,7 @@ module Tk
   #   dialog, to the left of the text.
   #   If this is nil then no bitmap is displayed in the dialog.
   #
-  # @param default [nil Fixnum]
+  # @param default [nil Integer]
   #   If this is an integer greater than or equal to zero, then it gives the
   #   index of the button that is to be the default button for the dialog (0 for
   #   the leftmost button, and so on).
@@ -48,7 +49,7 @@ module Tk
   #     'questhead', 0, 'Yes', 'No', "I'm not sure")
   def dialog(window, title, text, bitmap, default, *answers)
     answer = Tk.execute(:tk_dialog,
-      window, title, text, bitmap, default, *answers).to_i
+                        window, title, text, bitmap, default, *answers).to_i
     return answer unless answer == -1
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Miscellaneous event facilities: define virtual events and generate events
   #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Utility methods for managing the input focus.
   module Focus
@@ -17,7 +18,7 @@ module Tk
         when :lastfor
           Tk.execute('focus', '-lastfor', window).to_s
         else
-          raise ArgumentError, "option must be one of: None, :displayof, :force, :lastfor"
+          raise ArgumentError, 'option must be one of: None, :displayof, :force, :lastfor'
         end
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Create and inspect fonts.
   # The font command provides several facilities for dealing with fonts, such as
@@ -8,8 +9,8 @@ module Tk
         string_or_hash =~ /^(.*)\s+(\d+)?$/
 
         params = {}
-        params[:family] = $1.to_s
-        params[:size] = $2.to_i if $2
+        params[:family] = Regexp.last_match(1).to_s
+        params[:size] = Regexp.last_match(2).to_i if Regexp.last_match(2)
 
         @font = Font.create(params)
       elsif string_or_hash.respond_to?(:to_hash)
@@ -47,8 +48,8 @@ module Tk
       underline:  :boolean,
       overstrike: :boolean,
       weight:     :symbol,
-      slant:      :symbol,
-    }
+      slant:      :symbol
+    }.freeze
 
     def self.execute(command, *args)
       Tk.execute(:font, command, *args)
@@ -74,9 +75,9 @@ module Tk
       char = options.fetch(:char, None)
 
       args = []
-      args << "-displayof" << window unless window == None
+      args << '-displayof' << window unless window == None
       args << option.to_tcl_option unless option == None
-      args << "--" << char.to_tcl unless char == None
+      args << '--' << char.to_tcl unless char == None
 
       array = execute(:actual, font, *args)
       array.tcl_options_to_hash(FONT_CONFIGURE_HINTS)
@@ -84,16 +85,18 @@ module Tk
 
     def self.configure(fontname, argument = None)
       Configure.common(
-        self, [:configure, fontname], argument, FONT_CONFIGURE_HINTS)
+        self, [:configure, fontname], argument, FONT_CONFIGURE_HINTS
+      )
     end
 
     def self.create(fontname, options = None)
       if fontname.respond_to?(:to_tcl_options)
-        fontname, options = None, fontname
+        options = fontname
+        fontname = None
         options = options.to_tcl_options
       end
 
-      execute(:create, fontname, options)
+      execute(:create, fontname, options)&.to_str
     end
 
     def self.delete(*fontnames)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Confine pointer and keyboard events to a window sub-tree
   #
@@ -61,7 +62,7 @@ module Tk
   # a given display at once.
   module Grab
     # @see Grab.global
-    def grab_global(window)
+    def grab_global(_window)
       Grab.globa(self)
     end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Geometry manager that arranges widgets in a grid
   #
@@ -37,7 +38,7 @@ module Tk
     #   Bbox.bbox('.', 0, 0) # top left cell
     #   Bbox.bbox('.', 1, 1) # cell in second column and row
     #   Bbox.bbox('.', 0, 0, 1, 1) # cells from top left to second col/row
-    def self.bbox(master, col1 = None, row1 = None, col2 = None, row2 = None)
+    def self.bbox(master, _col1 = None, row1 = None, _col2 = None, row2 = None)
       bbox = Tk.execute('grid', 'bbox', master, column1, row1, column2, row2)
       bbox.map(&:to_i)
     end
@@ -80,7 +81,7 @@ module Tk
     # The characters -, x and ^, can be specified instead of a window name to
     # alter the default location of a slave.
     def self.configure(*arguments)
-      options, slaves = arguments.partition{|arg| arg.respond_to?(:to_tcl_options?) }
+      options, slaves = arguments.partition { |arg| arg.respond_to?(:to_tcl_options?) }
       options = options.first
       Tk.execute('grid', 'configure', *slaves, options.to_tcl_options?)
     end
@@ -104,12 +105,12 @@ module Tk
       hash = {}
 
       info.scan(/(?:-(\w+))\s+([^-][\S]*)/) do
-        key = $1.to_sym
+        key = Regexp.last_match(1).to_sym
         case key
         when :column, :row, :columnspan, :rowspan, :ipadx, :ipady, :padx, :pady
-          hash[key] = Integer($2)
+          hash[key] = Integer(Regexp.last_match(2))
         else
-          hash[key] = $2.to_str
+          hash[key] = Regexp.last_match(2).to_str
         end
       end
 
@@ -187,7 +188,7 @@ module Tk
     # returned, most recently manages first.
     # Option can be either -row or -column which causes only the slaves in the
     # row (or column) specified by value to be returned.
-    def self.slaves(master, options = {})
+    def self.slaves(_master, _options = {})
       Tk.execute('grid', 'slaves')
     end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Image
     module_function
@@ -29,9 +30,9 @@ module Tk
       if None == name
         Tk.execute(:image, :create, type)
       elsif None == options && name.respond_to?(:to_hash)
-        Tk.execute(:image, :create, name.to_tcl_options)
+        Tk.execute(:image, :create, type, name.to_tcl_options)
       elsif None != name && None != options
-        Tk.exeucte(:image, :create, name, options.to_tcl_options)
+        Tk.exeucte(:image, :create, type, name, options.to_tcl_options)
       end
     end
 
@@ -73,7 +74,7 @@ module Tk
     # of the values that may be supplied for the type argument to image
     # create).
     def types
-      Tk.execute(:image, :types).to_sym
+      Tk.execute(:image, :types).to_a(&:to_sym)
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Change a window's position in the stacking order
   module Lower

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 
@@ -62,4 +63,4 @@ module Tk
   def message_box(options = None)
     Tk.execute(:tk_messageBox, options.to_tcl_options?).to_sym
   end
-end
+end

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

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module Tk
   def self.option_menu(pathname, *values)
     variable = Variable.new('the_option_menu')
 
     Tk.execute_only(:tk_optionMenu, pathname, variable, *values)
-    return variable
+    variable
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Geometry manager that packs around edges of cavity
   #
@@ -33,7 +34,7 @@ module Tk
     def self.info(slave)
       info = Tk.execute('pack', 'info', slave)
 
-      array = info.split.each_slice(2).map{|key, value|
+      array = info.map do |key, value|
         case key = key[1..-1].to_sym
         when :expand
           [key, Tk.boolean(value)]
@@ -44,9 +45,9 @@ module Tk
         when :after, :anchor, :before, :in
           [key, value]
         else
-          raise "Unknown info pair: %p => %p" % [key, value]
+          raise 'Unknown info pair: %p => %p' % [key, value]
         end
-      }
+      end
 
       Hash[array]
     end
@@ -96,4 +97,4 @@ module Tk
       Pack.slaves(self)
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Geometry manager for fixed or rubber-sheet placement
   #
@@ -17,7 +18,7 @@ module Tk
     # +window+'s geometry is managed.
     # Option may have any of the values accepted by [Place.configure].
     def self.place(window, options = {})
-      args = options.map{|k,v| ["-#{k}", v] }.flatten
+      args = options.map { |k, v| ["-#{k}", v] }.flatten
       Tk.execute_only('place', window, *args)
     end
 
@@ -42,7 +43,7 @@ module Tk
     def self.info(window)
       info = Tk.execute('place', 'info', window).to_s
 
-      array = info.split.each_slice(2).map{|key, value|
+      array = info.split.each_slice(2).map do |key, value|
         case key = key[1..-1].to_sym
         when :anchor, :in
           [key, value]
@@ -53,9 +54,9 @@ module Tk
         when :relheight, :relwidth, :relx, :rely
           [key, value.to_f]
         else
-          raise "Unknown info pair: %p => %p" % [key, value]
+          raise 'Unknown info pair: %p => %p' % [key, value]
         end
-      }
+      end
 
       Hash[array]
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # This procedure posts a menu at a given position on the screen and configures
   # Tk so that the menu and its cascaded children can be traversed with the
@@ -11,4 +12,4 @@ module Tk
   def self.popup(menu, x, y, entry = None)
     Tk.execute_only(:tk_popup, menu, x, y, entry)
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Change a window's position in the stacking order
   #

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

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module Tk
   module Scrollable
-
     # Returns a list containing two elements.
     # Each element is a real fraction between 0 and 1; together they describe
     # the portion of the document's horizontal span that is visible in the
@@ -69,7 +69,6 @@ module Tk
       end
     end
 
-
     # Adjusts the view in the window so that the pixel given by fraction
     # appears at the top of the top line of the window.
     # Fraction is a fraction between 0 and 1; 0 indicates the first pixel of
@@ -124,8 +123,8 @@ module Tk
       @yscrollbar = sbar
       @yscrollbar.orient :vertical
 
-      self.yscrollcommand {|*arg| @yscrollbar.set(*arg); true }
-      @yscrollbar.command {|action,fraction| self.yview_moveto(fraction) }
+      yscrollcommand { |*arg| @yscrollbar.set(*arg); true }
+      @yscrollbar.command { |_action, fraction| yview_moveto(fraction) }
       @yscrollbar
     end
 
@@ -133,19 +132,17 @@ module Tk
       @xscrollbar = sbar
       @xscrollbar.orient :horizontal
 
-      self.xscrollcommand {|*arg| @xscrollbar.set(*arg); true }
-      @xscrollbar.command {|action,fraction| self.xview_moveto(fraction) }
+      xscrollcommand { |*arg| @xscrollbar.set(*arg); true }
+      @xscrollbar.command { |_action, fraction| xview_moveto(fraction) }
       @xscrollbar
     end
 
     def xscrollcommand(&block)
-      configure(:xscrollcommand => block) if block
+      configure(xscrollcommand: block) if block
     end
 
     def yscrollcommand(&block)
-      configure(:yscrollcommand => block) if block
+      configure(yscrollcommand: block) if block
     end
-
   end
 end
-

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # This command provides a Tcl interface to the X selection mechanism and
   # implements the full selection functionality described in the X Inter-Client
@@ -7,11 +8,11 @@ module Tk
   # clipboard command may also be used.
   module Selection
     def selection_clear(options = {})
-      Selection.clear({displayof: self}.merge(options))
+      Selection.clear({ displayof: self }.merge(options))
     end
 
     def selection_get(options = {})
-      Selection.get({displayof: self}.merge(options))
+      Selection.get({ displayof: self }.merge(options))
     end
 
     def selection_handle(options = {}, &command)
@@ -120,7 +121,7 @@ module Tk
 
         if cmd = (options[:command] || command)
           command = register_command(:selection_own, &cmd)
-          Tk.execute(:selection, :own, {command: command}.merge(options).to_tcl_options)
+          Tk.execute(:selection, :own, { command: command }.merge(options).to_tcl_options)
         else
           Tk.execute(:selection, :own, options.to_tcl_options)
         end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   def self.set_palette(background, *rest)
     if rest.empty?
@@ -6,4 +7,4 @@ module Tk
       Tk.execute(:tk_setPalette, background, *rest)
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manipulate Tk internal state
 module Tk
   module TkCmd

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   @library       = Variable.new('tk_library')
 
@@ -79,4 +80,4 @@ module Tk
   def version
     @version.to_s
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Wait for variable to change or window to be destroyed
   #
@@ -36,4 +37,4 @@ module Tk
       Tk.execute_only(:tkwait, :window, name)
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Winfo
     # @see Winfo.atom
@@ -324,7 +325,7 @@ module Tk
       if None == window
         Tk.execute(:winfo, :containing, root_x, root_y).to_s?
       else
-        Tk.execute(:winfo, :containing, '-displayof', window, root_x, root_y).to_s?
+        Tk.execute(:winfo, :containing, '-displayof', window, root_x, root_y)
       end
     end
 
@@ -401,7 +402,7 @@ module Tk
     # If the geometry manager is a widget, such as canvases or text, the name
     # is the widget's class command, such as canvas.
     def manager(window)
-      Tk.execute(:winfo, :manager, window).to_s?
+      Tk.execute(:winfo, :manager, window)
     end
 
     # Returns window's name (i.e. its name within its parent, as opposed to its
@@ -414,7 +415,7 @@ module Tk
     # Returns the path name of +window+'s parent, or nil if +window+ is the main
     # window of the application.
     def parent(window)
-      Tk.execute(:winfo, :parent, window).to_s?
+      Tk.execute(:winfo, :parent, window)
     end
 
     # Returns the path name of the window whose X identifier is +id+.
@@ -491,7 +492,7 @@ module Tk
     # in the window given by window.
     # Color may be specified in any of the forms acceptable for a color option.
     def rgb(window, color)
-      Tk.execute(:winfo, :rgb, window, color).to_a(&:to_i)
+      Tk.execute(:winfo, :rgb, window, color).split.map(&:to_i)
     end
 
     # Returns a decimal string giving the x-coordinate, in the root window of
@@ -602,16 +603,16 @@ module Tk
     def visualsavailable(window, includeids = None)
       if None == includeids
         list = Tk.execute(:winfo, :visualsavailable, window).to_a
-        list.uniq.map{|string|
+        list.uniq.map do |string|
           klass, depth = string.split
           [klass, depth.to_i]
-        }
+        end
       else
         list = Tk.execute(:winfo, :visualsavailable, window, :includeids).to_a
-        list.uniq.map{|string|
+        list.uniq.map do |string|
           klass, depth, id = string.split
           [klass, depth.to_i, id]
-        }
+        end
       end
     end