ruby: add curview, fix item_find/unit_find wrt gview mode, fix refers-to to use binsearch

plugins/ruby/codegen.pl

@@ -298,8 +298,21 @@ sub render_field_reftarget {
     return if (!$tg);
     my $tgvec = $tg->getAttribute('instance-vector');
     return if (!$tgvec);
+    my $idx = $tg->getAttribute('key-field') || 'id';
 
-    render_field_refto($parent, $name, $tgvec);
+    $tgvec =~ s/^\$global/df/;
+    return if $tgvec !~ /^[\w\.]+$/;
+
+    my $tgname = "${name}_tg";
+    $tgname =~ s/_id(.?.?)_tg/_tg$1/;
+
+    for my $othername (map { $_->getAttribute('name') } $parent->findnodes('child::ld:field')) {
+        $tgname .= '_' if ($othername and $tgname eq $othername);
+    }
+
+    my $fidx = '';
+    $fidx = ', :' . $idx if ($idx ne 'id');
+    push @lines_rb, "def $tgname ; ${tgvec}.binsearch($name$fidx) ; end";
 }
 
 sub render_field_refto {
@@ -329,9 +342,9 @@ sub render_container_reftarget {
     return if (!$tg);
     my $tgvec = $tg->getAttribute('instance-vector');
     return if (!$tgvec);
+    my $idx = $tg->getAttribute('key-field') || 'id';
 
     $tgvec =~ s/^\$global/df/;
-    $tgvec =~ s/\[\$\]$//;
     return if $tgvec !~ /^[\w\.]+$/;
 
     my $tgname = "${name}_tg";
@@ -341,7 +354,9 @@ sub render_container_reftarget {
         $tgname .= '_' if ($othername and $tgname eq $othername);
     }
 
-    push @lines_rb, "def $tgname ; $name.map { |i| ${tgvec}[i] } ; end";
+    my $fidx = '';
+    $fidx = ', :' . $idx if ($idx ne 'id');
+    push @lines_rb, "def $tgname ; $name.map { |i| $tgvec.binsearch(i$fidx) } ; end";
 }
 
 sub render_class_vmethods {

plugins/ruby/item.rb

@@ -4,10 +4,18 @@ module DFHack
         # arg similar to unit.rb/unit_find; no arg = 'k' menu
         def item_find(what=:selected)
             if what == :selected
+                if curview._rtti_classname == :viewscreen_itemst
+                    ref = curview.entry_ref[curview.cursor_pos]
+                    ref.item_tg if ref.kind_of?(GeneralRefItem)
+                else
                     case ui.main.mode
                     when :LookAround
                         k = ui_look_list.items[ui_look_cursor]
                         k.item if k.type == :Item
+                    when :BuildingItems
+                        bld = world.selected_building
+                        bld.contained_items[ui_building_item_cursor].item if bld
+                    end
                 end
             elsif what.kind_of?(Integer)
                 world.items.all.binsearch(what)

plugins/ruby/ui.rb

@@ -1,6 +1,13 @@
 # df user-interface related methods
 module DFHack
     class << self
+        # returns the current active viewscreen
+        def curview
+            ret = gview.view
+            ret = ret.child while ret.child
+            ret
+        end
+
         # center the DF screen on something
         # updates the cursor position if visible
         def center_viewscreen(x, y=nil, z=nil)

plugins/ruby/unit.rb

@@ -6,6 +6,10 @@ module DFHack
         # with an argument that respond to x/y/z (eg cursor), find first unit at this position
         def unit_find(what=:selected)
             if what == :selected
+                if curview._rtti_classname == :viewscreen_itemst
+                    ref = curview.entry_ref[curview.cursor_pos]
+                    ref.unit_tg if ref.kind_of?(GeneralRefUnit)
+                else
                     case ui.main.mode
                     when :ViewUnits
                         # nobody selected => idx == 0
@@ -15,6 +19,7 @@ module DFHack
                         k = ui_look_list.items[ui_look_cursor]
                         k.unit if k.type == :Unit
                     end
+                end
             elsif what.kind_of?(Integer)
                 world.units.all.binsearch(what)
             elsif what.respond_to?(:x) or what.respond_to?(:pos)