ffi-tk 2010.08.23 → 2018.02.20

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Communicate with window manager
   # The wm command is used to interact with window managers in order to control
@@ -303,7 +304,7 @@ module Tk
         Tk.execute_only(:wm, :aspect, window, '', '', '', '')
       else
         result = Tk.execute_only(:wm, :aspect, window,
-          min_numer, min_denom, max_numer, max_denom)
+                                 min_numer, min_denom, max_numer, max_denom)
         if result.to_s == ''
           nil
         else
@@ -409,8 +410,8 @@ module Tk
       alpha:      :float,
       topmost:    :boolean,
       zoomed:     :boolean,
-      fullscreen: :boolean,
-    }
+      fullscreen: :boolean
+    }.freeze
 
     # If name is specified, this command stores name (which should be the name
     # of the host on which the application is executing) in window's
@@ -422,7 +423,7 @@ module Tk
     # WM_CLIENT_MACHINE property from window.
     def client(window, name = None)
       if name == None
-        Tk.execute(:wm, :client, window).to_s?
+        Tk.execute(:wm, :client, window)
       else
         Tk.execute_only(:wm, :client, window, name)
       end
@@ -471,7 +472,7 @@ module Tk
     # WM_COMMAND property from window.
     def command(window, value = None)
       if value == None
-        Tk.execute(:wm, :command, window).to_a
+        Tk.execute(:wm, :command, window)&.split
       else
         Tk.execute_only(:wm, :command, window, value)
       end
@@ -594,7 +595,7 @@ module Tk
     # functionality.
     def grid(window, base_width = None, base_height = None, width_inc = None, height_inc = None)
       if base_width == None
-        Tk.execute(:wm, :grid, window).to_a?(&:to_i)
+        Tk.execute(:wm, :grid, window)
       else
         Tk.execute_only(:wm, :grid, window, base_width, base_height, width_inc, height_inc)
       end
@@ -611,13 +612,13 @@ module Tk
     # if window is not part of any group.
     def group(window, pathname = None)
       if None == pathname
-        Tk.execute(:wm, :group, window).to_s?
+        Tk.execute(:wm, :group, window)
       else
         Tk.execute_only(:wm, :group, window, pathname)
       end
     end
 
-    #wm iconbitmap window ?bitmap?
+    # wm iconbitmap window ?bitmap?
     # If bitmap is specified, then it names a bitmap in the standard forms
     # accepted by Tk (see the Tk_GetBitmap manual entry for details).
     # This bitmap is passed to the window manager to be dis? played in window's
@@ -630,7 +631,7 @@ module Tk
     # On the Windows operating system, an additional flag is supported:
     def iconbitmap(window, bitmap = None)
       if None == bitmap
-        Tk.execute(:wm, :iconbitmap, window).to_s?
+        Tk.execute(:wm, :iconbitmap, window)
       else
         Tk.execute_only(:wm, :iconbitmap, window, bitmap)
       end
@@ -780,7 +781,7 @@ module Tk
     # maximum width and height currently in effect.
     # The maximum size defaults to the size of the screen.
     # See the sections on geometry management below for more information.
-    def maxsize(window, width = None, height = None)
+    def maxsize(_window, width = None, height = None)
       if width == None || height == None
         Tk.execute(:wm, :maxsize)
       else

data/lib/ffi-tk/core_extensions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Already converted statement, don't process again
   class TclString < String
@@ -11,7 +12,7 @@ module Tk
   module CoreExtensions
     module Array
       def to_tcl
-        TclString.new('{' << map(&:to_tcl).compact.join(' ') << '}')
+        TclString.new("{#{map(&:to_tcl).compact.join(' ')}}")
       end
 
       # try to convert to a Hash.
@@ -92,13 +93,13 @@ module Tk
           pattern = "(?#{embed.join})#{source}"
         end
 
-        TclString.new('{' << pattern.gsub(/([^\\])(?=[{}])/, '\1\\\\\2') << '}')
+        TclString.new(%({#{pattern.gsub(/([^\\])(?=[{}])/, '\1\\\\\2')}}))
       end
     end
 
     module String
       def to_tcl
-        TclString.new('"' << gsub(/[\[\]{}$"\\]/, '\\\\\&') << '"')
+        TclString.new(%("#{gsub(/[\[\]{}$"\\]/, '\\\\\&')}"))
       end
 
       def to_tcl_option
@@ -128,7 +129,7 @@ module Tk
       end
     end
 
-    module Fixnum
+    module Integer
       def tcl_to_ruby(option, hints)
         name = option.sub(/^-/, '').to_sym
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Event
     Data = Struct.new(
@@ -10,41 +11,41 @@ module Tk
 
     class Data
       PROPERTIES = [
-        ['%#', :Integer, :serial            ],
-        ['%b', :Integer, :button            ],
-        ['%c', :Integer, :count             ],
-        ['%d', :String,  :detail            ],
-        ['%f', :String,  :focus             ],
-        ['%h', :Integer, :height            ],
-        ['%i', :String,  :window            ],
-        ['%k', :Integer, :keycode           ],
-        ['%m', :String,  :mode              ],
-        ['%o', :String,  :override_redirect ],
-        ['%p', :String,  :place             ],
-        ['%s', :String,  :state             ],
-        ['%t', :Integer, :time              ],
-        ['%w', :Integer, :width             ],
-        ['%x', :Integer, :x                 ],
-        ['%y', :Integer, :y                 ],
-        ['%A', :String,  :unicode           ],
-        ['%B', :Integer, :border_width      ],
-        ['%D', :Integer, :mousewheel_delta  ],
-        ['%E', :Integer, :send_event        ],
-        ['%K', :String,  :keysym            ],
-        ['%N', :Integer, :keysym_number     ],
-        ['%P', :String,  :property          ],
-        ['%R', :String,  :root              ],
-        ['%S', :String,  :subwindow         ],
-        ['%T', :Integer, :type              ],
-        ['%W', :String,  :window_path       ],
-        ['%X', :Integer, :x_root            ],
-        ['%Y', :Integer, :y_root            ],
-      ]
+        ['%#', :Integer, :serial],
+        ['%b', :Integer, :button],
+        ['%c', :Integer, :count],
+        ['%d', :String,  :detail],
+        ['%f', :String,  :focus],
+        ['%h', :Integer, :height],
+        ['%i', :String,  :window],
+        ['%k', :Integer, :keycode],
+        ['%m', :String,  :mode],
+        ['%o', :String,  :override_redirect],
+        ['%p', :String,  :place],
+        ['%s', :String,  :state],
+        ['%t', :Integer, :time],
+        ['%w', :Integer, :width],
+        ['%x', :Integer, :x],
+        ['%y', :Integer, :y],
+        ['%A', :String,  :unicode],
+        ['%B', :Integer, :border_width],
+        ['%D', :Integer, :mousewheel_delta],
+        ['%E', :Integer, :send_event],
+        ['%K', :String,  :keysym],
+        ['%N', :Integer, :keysym_number],
+        ['%P', :String,  :property],
+        ['%R', :String,  :root],
+        ['%S', :String,  :subwindow],
+        ['%T', :Integer, :type],
+        ['%W', :String,  :window_path],
+        ['%X', :Integer, :x_root],
+        ['%Y', :Integer, :y_root]
+      ].freeze
 
       def initialize(id, pattern, *properties)
         super id, pattern
 
-        PROPERTIES.each do |code, conv, name|
+        PROPERTIES.each do |_code, conv, name|
           value = properties.shift
           converted = String(value)
           next if converted == '??'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Event
     module Handler
@@ -17,12 +18,12 @@ module Tk
       def register_block(block)
         id = nil
 
-        @mutex.synchronize{
+        @mutex.synchronize do
           @store << block
           id = @store.size - 1
-        }
+        end
 
-        return id
+        id
       end
 
       def register(tag, sequence, &block)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ffi-tk/ffi/tcl/obj'
 require 'ffi-tk/ffi/tcl/interp'
 require 'ffi-tk/ffi/tcl/cmd_proc'
@@ -9,40 +10,50 @@ module FFI
     extend FFI::Library
     ffi_lib ::Tk::TCL_LIBPATH
 
-    attach_function :Tcl_AppendAllObjTypes, [Interp, Obj], :int
-    attach_function :Tcl_CreateInterp, [], Interp
-    attach_function :Tcl_DeleteInterp, [Interp], :void
-    attach_function :Tcl_DoOneEvent, [flags = :int], :int
-    attach_function :Tcl_EvalEx, [Interp, script = :string, length = :int, flags = :int], :int
-    attach_function :Tcl_GetBoolean, [Interp, :string, :pointer], :int
-    attach_function :Tcl_GetBooleanFromObj, [Interp, Obj, boolean = :pointer], :int
-    attach_function :Tcl_GetDoubleFromObj, [Interp, Obj, :pointer], :int
-    attach_function :Tcl_GetIntFromObj, [Interp, Obj, int = :pointer], :int
-    attach_function :Tcl_GetObjResult, [Interp], Obj
-    attach_function :Tcl_GetObjType, [:string], ObjType
-    attach_function :Tcl_GetString, [Obj], :string
-    attach_function :Tcl_GetStringFromObj, [Obj, length = :pointer], :string
-    attach_function :Tcl_GetStringResult, [Interp], :string
-    attach_function :Tcl_GetUnicode, [Obj], :string
-    attach_function :Tcl_Init, [Interp], :int
-    attach_function :Tcl_ListObjGetElements, [Interp, Obj, count = :pointer, list = :pointer], :int
-    attach_function :Tcl_ListObjIndex, [Interp, list = :pointer, index = :int, result = :pointer], :int
-    attach_function :Tcl_ListObjLength, [Interp, list = :pointer, int = :pointer], :int
-    attach_function :Tcl_NewBooleanObj, [:int], Obj
-    attach_function :Tcl_NewIntObj, [:int], Obj
-    attach_function :Tcl_NewListObj, [count = :int, values = :pointer], Obj
-    attach_function :Tcl_NewStringObj, [:string, :int], Obj
-    attach_function :Tcl_ObjGetVar2, [Interp, :pointer, :pointer, :int], Obj
-    attach_function :Tcl_ObjSetVar2, [Interp, Obj, Obj, Obj, :int], Obj
-    attach_function :Tcl_ParseVar, [Interp, :pointer, :pointer], :pointer
-    attach_function :Tcl_SetObjResult, [Interp, Obj], :void
-    attach_function :Tcl_WaitForEvent, [TclTime], :int
-    attach_function :Tcl_SetMaxBlockTime, [TclTime], :void
+    attach_function :Tcl_AppendAllObjTypes, [:pointer, :pointer], :int
+    attach_function :Tcl_CreateInterp, [], :pointer
+    attach_function :Tcl_DeleteInterp, [:pointer], :void
+    attach_function :Tcl_DoOneEvent, [:int], :int
+    attach_function :Tcl_EvalEx, [:pointer, :string, :int, :int], :int
+    attach_function :Tcl_GetBoolean, [:pointer, :string, :pointer], :int
+    attach_function :Tcl_GetBooleanFromObj, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_GetDoubleFromObj, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_GetIntFromObj, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_GetObjResult, [:pointer], :pointer
+    attach_function :Tcl_GetObjType, [:string], :pointer
+    attach_function :Tcl_GetString, [:pointer], :string
+    attach_function :Tcl_GetStringFromObj, [:pointer, :pointer], :string
+    attach_function :Tcl_GetStringResult, [:pointer], :string
+    attach_function :Tcl_GetUnicode, [:pointer], :string
+    attach_function :Tcl_Init, [:pointer], :int
+    attach_function :Tcl_ListObjGetElements, [:pointer, :pointer, :pointer, :pointer], :int
+    attach_function :Tcl_ListObjIndex, [:pointer, :pointer, :int, :pointer], :int
+    attach_function :Tcl_ListObjLength, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_NewBooleanObj, [:int], :pointer
+    attach_function :Tcl_NewIntObj, [:int], :pointer
+    attach_function :Tcl_NewListObj, [:int, :pointer], :pointer
+    attach_function :Tcl_NewStringObj, [:string, :int], :pointer
+    attach_function :Tcl_NewDictObj, [], :pointer
+    attach_function :Tcl_ObjGetVar2, [:pointer, :pointer, :pointer, :int], :pointer
+    attach_function :Tcl_ObjSetVar2, [:pointer, :pointer, :pointer, :pointer, :int], :pointer
+    attach_function :Tcl_ParseVar, [:pointer, :pointer, :pointer], :pointer
+    attach_function :Tcl_SetObjResult, [:pointer, :pointer], :void
+    attach_function :Tcl_WaitForEvent, [:pointer], :int
+    attach_function :Tcl_SetMaxBlockTime, [:pointer], :void
+    attach_function :Tcl_DictObjGet, [:pointer, :pointer, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjPut, [:pointer, :pointer, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjRemove, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjSize, [:pointer, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjFirst, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjNext, [:pointer, :pointer, :pointer, :pointer], :void
+    attach_function :Tcl_DictObjDone, [:pointer], :void
+    attach_function :Tcl_DictObjPutKeyList, [:pointer, :pointer, :int, :pointer, :pointer], :int
+    attach_function :Tcl_DictObjRemoveKeyList, [:pointer, :pointer, :int, :pointer], :int
 
-    callback :obj_cmd_proc, [:int, Interp, :int, :pointer], :int
+    callback :obj_cmd_proc, [:int, :pointer, :int, :pointer], :int
     callback :obj_delete_proc, [:int], :void
     attach_function :Tcl_CreateObjCommand, [
-      Interp, name = :string, :obj_cmd_proc, :int, :obj_delete_proc], :pointer
+      :pointer, :string, :obj_cmd_proc, :int, :obj_delete_proc], :pointer
 
     module_function
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tcl
     class CmdProc < PrettyStruct
@@ -7,4 +8,4 @@ module FFI
              :argv,       :pointer
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tcl
     # This whole class feels very awkward, maybe it should be merged with Obj.
@@ -15,6 +16,7 @@ module FFI
         string_length_ptr = MemoryPointer.new(:int)
 
         if Tcl.list_obj_get_elements(interp, list, objc_ptr, objv_ptr) == 0
+          return [] if objv_ptr.get_pointer(0).null?
           array_ptr = objv_ptr.get_pointer(0)
           array_length = objc_ptr.get_int(0)
           array = array_ptr.read_array_of_pointer(array_length)
@@ -30,6 +32,7 @@ module FFI
 
       def self.guess(interp, obj, fallback = nil)
         obj = Obj.new(obj) unless obj.respond_to?(:type)
+        # p obj: obj, obj_type: obj.type
         type = TYPES[obj.type.to_i]
 
         case type
@@ -41,16 +44,49 @@ module FFI
           to_int(interp, obj)
         when :double
           to_double(interp, obj)
+        when :dict
+          to_dict(interp, obj)
+        when :window
+          to_window(interp, obj)
         else
           if fallback
             __send__(fallback, interp, obj)
+          elsif type.nil? && obj.bytes == ''
+            nil
+          elsif type.nil?
+            to_string(interp, obj)
           else
-            raise "Unknown type: %p" % [type] if type
-            new(interp, obj)
+            raise 'Unknown type: %p' % [type]
           end
         end
       end
 
+      def self.to_window(interp, obj)
+        p interp: interp, obj: obj
+      end
+
+      def self.to_dict(interp, obj)
+        out = {}
+
+        search = MemoryPointer.new(:pointer)
+        done = MemoryPointer.new(:int)
+        key_ptr = MemoryPointer.new(:pointer)
+        value_ptr = MemoryPointer.new(:pointer)
+        strlen = MemoryPointer.new(:int)
+
+        Tcl.dict_obj_first(interp, obj, search, key_ptr, value_ptr, done)
+
+        while done.get_int(0) != 1
+          key = Tcl.get_string_from_obj(key_ptr.get_pointer(0), strlen)
+          value = Tcl.get_string_from_obj(value_ptr.get_pointer(0), strlen)
+          out[key] = value
+
+          Tcl.dict_obj_next(search, key_ptr, value_ptr, done)
+        end
+
+        out
+      end
+
       def self.to_double(interp, obj)
         double_pointer = MemoryPointer.new(:double)
 
@@ -73,9 +109,10 @@ module FFI
         objv_ptr = MemoryPointer.new(:pointer)
 
         if Tcl.list_obj_get_elements(interp, obj, objc_ptr, objv_ptr) == 0
-          objv_ptr.get_pointer(0).
-            read_array_of_pointer(objc_ptr.get_int(0)).
-            map(&block)
+          return [] if objv_ptr.get_pointer(0).null?
+          objv_ptr.get_pointer(0)
+                  .read_array_of_pointer(objc_ptr.get_int(0))
+                  .map(&block)
         else
           panic(interp, 'Tcl_ListObjGetElements')
         end
@@ -94,14 +131,16 @@ module FFI
       def self.to_int(interp, obj)
         int_pointer = MemoryPointer.new(:int)
 
-        if Tcl.get_int_from_obj(interp, obj, int_pointer) == 0
+        if obj.bytes == ''
+          '' # used by text widget -endline
+        elsif Tcl.get_int_from_obj(interp, obj, int_pointer) == 0
           int_pointer.get_int(0)
         else
           panic(interp, 'Tcl_GetIntFromObj')
         end
       end
 
-      def self.to_string(interp, obj)
+      def self.to_string(_interp, obj)
         length_pointer = MemoryPointer.new(:int)
 
         string = Tcl.get_string_from_obj(obj, length_pointer)
@@ -162,7 +201,7 @@ module FFI
       end
 
       def inspect
-        "#<EvalResult #{to_s}>"
+        "#<EvalResult #{self}>"
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FFI
   module Tcl
     class Interp < PrettyStruct
@@ -11,7 +12,7 @@ module FFI
       EVAL_DIRECT = 0x40000
 
       def inspect
-        "Interp"
+        'Interp'
       end
 
       def guess_result
@@ -31,7 +32,7 @@ module FFI
             Tcl.new_boolean_obj(0)
           when String
             Tcl.new_string_obj(ruby_obj, ruby_obj.bytesize)
-          when Fixnum
+          when Integer
             Tcl.new_int_obj(ruby_obj)
           when Exception
             string = [ruby_obj.message, *ruby_obj.backtrace].join("\n")
@@ -79,16 +80,18 @@ module FFI
       def eval(string)
         if $DEBUG
           if string =~ /\n/
-            puts "eval: %p" % [string]
+            puts "\neval: %p" % [string]
           else
-            puts "eval: %s" % [string]
+            puts "\neval: %s" % [string]
           end
         end
 
         code = Tcl.eval_ex(self, string, string.bytesize, EVAL_DIRECT)
+        puts 'eval= %p' % [code] if $DEBUG
         return true if code == 0
 
         message = guess_result.to_s
+        puts 'eval= %p' % [message] if $DEBUG
 
         if message.empty?
           raise 'Failure during eval of: %p' % [string]