reterm 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322cb2050b47800401185435691f5b5e79d9a9d3
-  data.tar.gz: 010ddff147de71d7a7163ab3627a05162b39e785
+  metadata.gz: bff784412370151ca2408d002ed6aeb7bd30547c
+  data.tar.gz: cfe8e79dcc10562e812cbae5716218d1a3393e63
 SHA512:
-  metadata.gz: 94489d9e2e1336538ea9605d82bd37ca1dfc4ea322ec382b1f5376ced1d0c631d0997a284f8799f24391ba1ca427c6c37f9ec8a054ce5e86b8ff6add06b6e1e0
-  data.tar.gz: 77f4e71b0ca2c0eb005ecb17f6bc5e85c94bf5a8339686fec4bab6e664c6ac57f71b2978c60620c4829fe23b8763a30c40dcbfd7151cc519b8cda33c4e54d753
+  metadata.gz: b58b7c2d4d8f5e1cd1ef98c54042278e13facdbc94afb764a82b367c3feae65df217424f391995c855cdee9ff826da93dcce61b8fee815b4699498233ac27e2e
+  data.tar.gz: 1d4282a52bd70a4a1aba638a9ecb7618be13da86afa9df3439cc01c17a729a2912a5f63a2d866be06df458604af51d44c4774e7557348672845d81b8ab4f36d7

data/lib/reterm/component.rb

@@ -14,9 +14,14 @@ module RETerm
         w
       end
 
+      def distance_from(c)
+        window.distance_from(c.kind_of?(Window) ? c : c.window)
+      end
+
       def initialize(args={})
         self.highlight_focus = args[:highlight_focus] if args.key?(:highlight_focus)
         self.activate_focus  = args[:activate_focus]  if args.key?(:activate_focus)
+        self.activatable     = args[:activatable]     if args.key?(:activatable)
         init_cdk(args) if cdk?
       end
 
@@ -49,12 +54,14 @@ module RETerm
         @colors = c
       end
 
+      attr_writer :activatable
+
       # Returns a boolean indicating if the user should be
       # able to focus on and activate the component. By default
       # this is false, but interactive components should override
       # and return true.
       def activatable?
-        false
+        defined?(@activatable) && @activatable
       end
 
       # Actual activation mechanism, invoked by the navigation

data/lib/reterm/components/entry.rb

@@ -36,6 +36,10 @@ module RETerm
         component.getValue
       end
 
+      def value=(v)
+        component.setValue(v)
+      end
+
       private
 
       def disp_type

data/lib/reterm/layouts/grid.rb

@@ -47,22 +47,24 @@ module RETerm
       def next_focus(ch)
         f = nil
         if     UP_CONTROLS.include?(ch)
-          f = focusable.select { |f| f.window.y < focused.window.y }.first
+          f = focusable.select { |f| f.window.y < focused.window.y }
 
         elsif  DOWN_CONTROLS.include?(ch)
-          f = focusable.select { |f| f.window.y > focused.window.y }.first
+          f = focusable.select { |f| f.window.y > focused.window.y }
 
         elsif  LEFT_CONTROLS.include?(ch)
-          f = focusable.select { |f| f.window.x < focused.window.x }.first
+          f = focusable.select { |f| f.window.x < focused.window.x }
 
         elsif RIGHT_CONTROLS.include?(ch)
-          f = focusable.select { |f| f.window.x > focused.window.x }.first
+          f = focusable.select { |f| f.window.x > focused.window.x }
 
         else
           return super
         end
 
-        focusable.index(f)
+        f.sort! { |a, b| focused.distance_from(a) <=> focused.distance_from(b) }
+
+        focusable.index(f.first)
       end
     end # class Grid
   end # module Layouts

data/lib/reterm/mixins/cdk_component.rb

@@ -69,7 +69,7 @@ module RETerm
 
     # CDK components may be activated
     def activatable?
-      true
+      !defined?(@activatable) || @activatable
     end
 
     # Invoke CDK activation routine

data/lib/reterm/version.rb

@@ -1,3 +1,3 @@
 module RETerm
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end # module RETerm

data/lib/reterm/window.rb

@@ -95,6 +95,12 @@ module RETerm
       @ty ||= parent? ? (parent.total_y + y) : y
     end
 
+    def distance_from(win)
+      # FIXME: need to expand to compare each of 4 window coords
+      #        to each of 4 in other window
+      Math.sqrt((x - win.x) ** 2 + (y - win.y) ** 2)
+    end
+
     # Instantiate Window with given args. None are required, but
     # unless :rows, :cols, :x, or :y is specified, window will be
     # created in it's default position.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reterm
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Mo Morsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo