ffi-tk 2010.08.23 → 2018.02.20

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tcl
     # Nicer introspection and some accessors.
@@ -8,7 +9,7 @@ module FFI
       CODE
 
       def self.layout(*kvs)
-        kvs.each_slice(2) do |key, value|
+        kvs.each_slice(2) do |key, _value|
           eval ACCESSOR_CODE.gsub(/\{(.*?)\}/, '{name}' => key, '{sym}' => ":#{key}")
         end
 
@@ -17,8 +18,8 @@ module FFI
 
       def inspect
         kvs = members.zip(values)
-        kvs.map!{|key, value| "%s=%s" % [key, value.inspect] }
-        "<%s %s>" % [self.class, kvs.join(' ')]
+        kvs.map! { |key, value| '%s=%s' % [key, value.inspect] }
+        '<%s %s>' % [self.class, kvs.join(' ')]
       end
     end
 
@@ -39,42 +40,16 @@ module FFI
       end
 
       def inspect
-        "#<ObjType name=%p>" % [self[:name]]
+        '#<ObjType name=%p>' % [self[:name]]
       end
     end
 
     class Obj < PrettyStruct
-      class InternalRep < Union
-        class TwoPtrValue < PrettyStruct
-          layout(
-            :ptr1, :pointer,
-            :ptr2, :pointer
-          )
-        end
-
-        class PtrAndLongRep < PrettyStruct
-          layout(
-            :ptr,   :pointer,
-            :value, :ulong
-          )
-        end
-
-        layout(
-          :longValue,     :long,
-          :doubleValue,   :double,
-          :otherValuePtr, :pointer,
-          :wideValue,     :int64,
-          :twoPtrValue,   TwoPtrValue,
-          :ptrAndLongRep, PtrAndLongRep
-        )
-      end
-
       layout(
         :refCount,    :int,
         :bytes,       :string,
         :length,      :int,
-        :type,        ObjType,
-        :internalRep, InternalRep
+        :type,        :pointer
       )
 
       def pretty_type
@@ -82,7 +57,7 @@ module FFI
       end
 
       def inspect
-        "#<Obj bytes=%p type=%p>" % [self[:bytes], pretty_type]
+        '#<Obj bytes=%p type=%p>' % [self[:bytes], pretty_type]
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tcl
     class TclTime < PrettyStruct
@@ -33,4 +34,4 @@ module FFI
       alias usec= microseconds=
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tk
     extend FFI::Library
@@ -31,8 +32,8 @@ module FFI
     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_MainWindow, [:pointer], :pointer
+    attach_function :Tk_GetColor, [:pointer, :pointer, name = :string], :pointer
     attach_function :Tk_MainLoop, [], :void
 
     module_function
@@ -41,9 +42,9 @@ module FFI
       if ::Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
         XColor.new(Tk_GetColor(interp, Tk_MainWindow(interp), string))
       else
-        Tcl.thread_sender.thread_send{
+        Tcl.thread_sender.thread_send do
           XColor.new(Tk_GetColor(interp, Tk_MainWindow(interp), string))
-        }
+        end
       end
     end
 
@@ -51,7 +52,7 @@ module FFI
       if ::Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
         Tk_MainLoop()
       else
-        Tcl.thread_sender.thread_send{ Tk_MainLoop() }
+        Tcl.thread_sender.thread_send { Tk_MainLoop() }
       end
     end
 
@@ -59,13 +60,13 @@ module FFI
       if ::Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
         if Tk_Init(interp) == 1
           message = Tcl.Tcl_GetStringResult(interp)
-          raise RuntimeError, message
+          raise message
         end
       else
         Tcl.thread_sender.thread_send do
           if Tk_Init(interp) == 1
             message = Tcl.Tcl_GetStringResult(interp)
-            raise RuntimeError, message
+            raise message
           end
         end
       end

data/lib/ffi-tk/geometry.rb

@@ -1,32 +1,35 @@
+# frozen_string_literal: true
 module Tk
   class TkGeometry < Struct.new(:original, :width, :height, :x, :y)
     def initialize(tcl_string)
-      case tcl_string.to_s
-      when /^\=?(?<width>\d+)x(?<height>\d+)(?<x>[+-]\d+)(?<y>[+-]\d+)$/
-        md = $~
-        self.width, self.height, self.x, self.y =
-          md[:width].to_i, md[:height].to_i, md[:x].to_i, md[:y].to_i
-      when /^\=?(?<width>\d+)x(?<height>\d+)$/
-        md = $~
-        self.width, self.height = md[:width].to_i, md[:height].to_i
-      when /^\=?(?<x>[+-]\d+)(?<y>[+-]\d+)$/
-        md = $~
-        self.x, self.y = md[:x].to_i, md[:y].to_i
+      str = tcl_string.to_s
+
+      if /^\=?(?<width>\d+)x(?<height>\d+)(?<x>[+-]\d+)(?<y>[+-]\d+)$/ =~ str
+        self.width = Integer(width)
+        self.height = Integer(height)
+        self.x = Integer(x)
+        self.y = Integer(y)
+      elsif /^\=?(?<width>\d+)x(?<height>\d+)$/ =~ str
+        self.width = Integer(width)
+        self.height = Integer(height)
+      elsif /^\=?(?<x>[+-]\d+)(?<y>[+-]\d+)$/ =~ str
+        self.x = Integer(x)
+        self.y = Integer(y)
       else
-        raise "Invalid geometry: %p" % [tcl_string]
+        raise 'Invalid geometry: %p' % [tcl_string]
       end
     end
 
     def to_tcl
       if width && height && x && y
-        "=%dx%d%+d%+d" % [width, height, x, y]
+        '=%dx%d%+d%+d' % [width, height, x, y]
       elsif width && height
-        "=%dx%d%" % [width, height]
+        '=%dx%d%' % [width, height]
       elsif x && y
-        "=+d%+d" % [x, y]
+        '=+d%+d' % [x, y]
       else
-        raise "Incomplete geometry: %p" % [self]
+        raise 'Incomplete geometry: %p' % [self]
       end
     end
   end
-end
+end

data/lib/ffi-tk/thread_sender.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ThreadSender
   def initialize
     @queue = Queue.new

data/lib/ffi-tk/tk.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Object
   undef :type if respond_to?(:type)
 end
@@ -14,13 +15,12 @@ module Tk
 
   module_function
 
-
   def init
-    if RUN_EVENTLOOP_ON_MAIN_THREAD
-      @interp = FFI::Tcl.setup_eventloop_on_main_thread
-    else
-      @interp = FFI::Tcl.setup_eventloop_on_new_thread
-    end
+    @interp = if RUN_EVENTLOOP_ON_MAIN_THREAD
+                FFI::Tcl.setup_eventloop_on_main_thread
+              else
+                FFI::Tcl.setup_eventloop_on_new_thread
+              end
 
     FFI::Tcl.init(@interp)
     FFI::Tcl::EvalResult.reset_types(@interp)
@@ -35,7 +35,7 @@ module Tk
 
     module_eval('class << Tk; attr_reader :interp, :root; end')
 
-    return @interp
+    @interp
   end
 
   # A little something so people don't have to call Tk.init
@@ -53,9 +53,7 @@ module Tk
   def mainloop
     @running = true
 
-    while @running && interp.wait_for_event(0.1)
-      interp.do_one_event(0)
-    end
+    interp.do_one_event(0) while @running && interp.wait_for_event(0.05)
   end
 
   def stop
@@ -72,7 +70,7 @@ module Tk
 
   def execute(*args)
     interp.eval(convert_arguments(*args))
-    result
+    result.tap{|r| puts "eval= %p" % [r] if $DEBUG }
   end
 
   def result
@@ -96,14 +94,14 @@ module Tk
   end
 
   # without our callbacks, nothing goes anymore, abort mission
-  def tcl_delete(client_data)
-    raise RuntimeError, "tcl function is going to be removed"
+  def tcl_delete(_client_data)
+    raise 'tcl function is going to be removed'
   end
   TCL_DELETE = method(:tcl_delete)
 
   # TODO: support for break and continue return status (by catch/throw)
   # 1 means true, 0 means false.
-  def tcl_callback(client_data, interp, objc, objv)
+  def tcl_callback(_client_data, interp, objc, objv)
     cmd, id, *args = tcl_cmd_args(interp, objc, objv)
     id = id.first if id.is_a?(Array)
 
@@ -126,7 +124,7 @@ module Tk
   TCL_CALLBACK = method(:tcl_callback)
 
   # TODO: support for break and continue return status (by catch/throw)
-  def tcl_event(client_data, interp, objc, objv)
+  def tcl_event(_client_data, interp, objc, objv)
     cmd, id, sequence, *args = tcl_cmd_args(interp, objc, objv)
 
     catch :callback_break do
@@ -149,15 +147,17 @@ module Tk
   def tcl_cmd_args(interp, objc, objv)
     length = FFI::MemoryPointer.new(0)
     array = objv.read_array_of_pointer(objc)
-    array.map{|e|
+    array.map do |e|
       obj = FFI::Tcl::EvalResult.guess(interp, e)
       case obj
-      when Fixnum, Float
+      when Integer, Float
         obj
+      when nil
+        nil
       else
         obj.respond_to?(:dup) ? obj.dup : obj
       end
-    }
+    end
   end
 
   def handle_callback(id, *args)
@@ -173,20 +173,20 @@ module Tk
     pathname = [parent_name, id].join('.').squeeze('.')
     @widgets[pathname] = object
 
-    return pathname
+    pathname
   end
 
   def unregister_object(object)
-    @widgets.delete_if{|path, obj| obj == object }
+    @widgets.delete_if { |_path, obj| obj == object }
   end
 
   def unregister_objects(*objects)
-    @widgets.delete_if{|path, obj| objects.include?(obj) }
+    @widgets.delete_if { |_path, obj| objects.include?(obj) }
   end
 
   def register_proc(proc, argument_string = '')
-    id = uuid(:proc){|uuid| @callbacks[uuid] = proc }
-    return id, %(RubyFFI::callback #{id} #{argument_string})
+    id = uuid(:proc) { |uuid| @callbacks[uuid] = proc }
+    [id, %(RubyFFI::callback #{id} #{argument_string})]
   end
 
   def unregister_proc(id)

data/lib/ffi-tk/variable.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
 module Tk
   # This class is used for communication of variables with Tcl.
   class Variable
+    include Comparable
+
     attr_reader :name, :tcl_name, :bytesize
 
     def initialize(name, value = None)
       @name = name.freeze
-      @tcl_name = "$#{name}".freeze
+      @tcl_name = "$#{name}"
       set(value) unless None == value
     end
 
@@ -36,11 +39,30 @@ module Tk
     end
 
     def to_boolean
-      get.to_boolean
+      got = get
+
+      if got.respond_to?(:to_boolean)
+        got.to_boolean
+      elsif got == '0'
+        false
+      elsif got == '1'
+        true
+      else
+        got
+      end
     end
 
     def to_f
       get.to_f
     end
+
+    def <=>(other)
+      case other
+      when self.class
+        get <=> other.get
+      else
+        get <=> other
+      end
+    end
   end
-end
+end

data/lib/ffi-tk/version.rb

@@ -1,3 +1,3 @@
 module FFI::Tk
-  VERSION = "2010.08.23"
+  VERSION = "2018.02.20"
 end

data/lib/ffi-tk/widget.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Widget
     include Pack, Destroy, Bind, Bindtags, WM, Winfo, Grid, Clipboard, Place, TkCmd
@@ -62,7 +63,7 @@ module Tk
     private
 
     def assign_pathname
-      @tk_pathname = Tk.register_object(tk_parent, self)
+      @tk_pathname ||= Tk.register_object(tk_parent, self)
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # A button is a widget that displays a textual string, bitmap or image.
   # If text is displayed, it must all be in a single font, but it can occupy
@@ -13,7 +14,9 @@ module Tk
   class Button < Widget
     include Cget, Configure
 
-    def self.tk_command; 'button'; end
+    def self.tk_command
+      'button'
+    end
 
     # TODO: implement custom procs
     def initialize(parent = Tk.root, options = None, &block)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Canvas widgets implement structured graphics.
   #
@@ -11,20 +12,22 @@ module Tk
   # mouse cursor over an item.
   # This means that items in a canvas can have behaviors defined.
   class Canvas < Widget
-    require "ffi-tk/widget/canvas/item.rb"
-    require "ffi-tk/widget/canvas/arc.rb"
-    require "ffi-tk/widget/canvas/bitmap.rb"
-    require "ffi-tk/widget/canvas/image.rb"
-    require "ffi-tk/widget/canvas/line.rb"
-    require "ffi-tk/widget/canvas/oval.rb"
-    require "ffi-tk/widget/canvas/polygon.rb"
-    require "ffi-tk/widget/canvas/rectangle.rb"
-    require "ffi-tk/widget/canvas/text.rb"
-    require "ffi-tk/widget/canvas/window.rb"
+    require 'ffi-tk/widget/canvas/item.rb'
+    require 'ffi-tk/widget/canvas/arc.rb'
+    require 'ffi-tk/widget/canvas/bitmap.rb'
+    require 'ffi-tk/widget/canvas/image.rb'
+    require 'ffi-tk/widget/canvas/line.rb'
+    require 'ffi-tk/widget/canvas/oval.rb'
+    require 'ffi-tk/widget/canvas/polygon.rb'
+    require 'ffi-tk/widget/canvas/rectangle.rb'
+    require 'ffi-tk/widget/canvas/text.rb'
+    require 'ffi-tk/widget/canvas/window.rb'
 
     include Cget, Configure
 
-    def self.tk_command; 'canvas'; end
+    def self.tk_command
+      'canvas'
+    end
 
     # For each item that meets the constraints specified by +search_spec+ and
     # the +args+, add +tag+ to the list of tags associated with the item if it
@@ -169,12 +172,12 @@ module Tk
         end
       end
 
-      name = "#{tag_or_id}".scan(/\w+/).join('_')
+      name = tag_or_id.to_s.scan(/\w+/).join('_')
       @events ||= {}
       # unregister_event(name)
 
       Event::Handler.register_custom(script) do |id|
-        code = "%s bind %s %s { ::RubyFFI::event %d %s %s }"
+        code = '%s bind %s %s { ::RubyFFI::event %d %s %s }'
         props = Event::Data::PROPERTIES.transpose[0].join(' ')
         tcl = code % [tk_pathname, tag_or_id, sequence, id, sequence, props]
         Tk.interp.eval(tcl)
@@ -250,7 +253,7 @@ module Tk
     # Line items support coordinate indexing operations using the methods
     # [dchars], [index], and [insert].
     def create_line(*arguments)
-      options, coords = arguments.partition{|arg| arg.respond_to?(:to_tcl_options) }
+      options, coords = arguments.partition { |arg| arg.respond_to?(:to_tcl_options) }
       create(:line, coords, options.first)
     end
 
@@ -264,7 +267,7 @@ module Tk
     # display. Polygon items support coordinate indexing operations using the
     # methods [dchars], [index], or [insert].
     def create_polygon(*arguments)
-      options, coords = arguments.partition{|arg| arg.respond_to?(:to_tcl_options) }
+      options, coords = arguments.partition { |arg| arg.respond_to?(:to_tcl_options) }
       create(:polygon, coords, options.first)
     end