cetus 0.1.36 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273d25acae029a8c12d1e07bd80396c7f6eeb05f6136b112be702a7cebd7a01d
-  data.tar.gz: 25891b9fc8105132be8cb4325f23767fc2abf79096b98bcee9c11a41f0ffb612
+  metadata.gz: 0adbfa483176301769749c1f1756cf6ae616ee572ad5b2ca56c28b2339f0386f
+  data.tar.gz: 2506a1e5264337d8648022083d7c37a6616d36e1be12b65d29b5172211cbdc67
 SHA512:
-  metadata.gz: 905206ed55286799c28ef2e3c9fee6fc1eedc34730ac4632138c117ce747be62da7ed377c44414ba8499f3cfc2a2b539c4fb2b868522ef9ffc775aa0528b1d43
-  data.tar.gz: 53e8235558e298e9f08dbaefd5f65fcde07a821e8052ee630db51bc74e340a56ddae0abc430028dfda702700c659686ad449c342250d4cc9a26ef5387eadb98c
+  metadata.gz: 7e18775e80ebc7cf5367e4040fb27c73eb2cff2e0cabac603afd1958de18cc1a82055b51c3b13eaaef2b03c0937b9aeff045a29f255b4ab8f7221821e0dc97f0
+  data.tar.gz: d7efa83ac9196fc74768e6fad5e87df973ec9ba49a44921310462cfe834cd53bb288be52d76f92d7ca6d45b9363e0545dac584ea5a3e47dad28e2fd0344c0daa

data/bin/cetus

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # --------------------------------------------------------------------------- #
 #         File: cetus
 #  Description: Fast file navigation, a tiny version of zfm
@@ -6,7 +8,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-04-14 19:11
+#  Last update: 2019-04-19 09:51
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -26,19 +28,19 @@ require 'shellwords'
 # https://docs.ruby-lang.org/en/2.6.0/FileUtils.html
 require 'fileutils'
 require 'logger'
-# @log = Logger.new(File.expand_path '~/tmp/log.txt')
-@log = Logger.new('log.txt')
+@log = Logger.new(File.expand_path('~/tmp/log.txt'))
+# @log = Logger.new('log.txt')
 
 ## INSTALLATION
 # copy into PATH
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.1.36.0'.freeze
+VERSION = '0.1.38.0'
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
-CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml".freeze
+CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
 
-$bindings = {
+@bindings = {
   '`' => 'main_menu',
   '=' => 'toggle_menu',
   'M-s' => 'selection_menu',
@@ -50,14 +52,14 @@ $bindings = {
   'C-s' => 'toggle_select',
   'C-r' => 'reduce',
   'C-g' => 'debug_vars',
-  '*' => 'toggle_selection_mode',
+  '*' => 'toggle_multiple_selection',
   'M-a' => 'select_all',
   'M-A' => 'unselect_all',
   '!' => 'execute',
   ',' => 'goto_parent_dir',
   '~' => 'goto_home_dir',
   '-' => 'goto_previous_dir',
-  '+' => 'goto_dir',          # 2019-03-07 - TODO: change binding
+  '+' => 'goto_dir', # 2019-03-07 - TODO: change binding
   '.' => 'pop_dir',
   ':' => 'subcommand',
   "'" => 'goto_bookmark',
@@ -65,6 +67,10 @@ $bindings = {
   '/' => 'enter_regex',
   'M-p' => 'prev_page',
   'M-n' => 'next_page',
+  'PgUp' => 'prev_page',
+  'PgDn' => 'next_page',
+  'Home' => 'goto_top',
+  'End' => 'goto_end',
   'SPACE' => 'next_page:Page Down',
   'M-f' => 'select_from_visited_files',
   'M-d' => 'select_from_used_dirs',
@@ -94,7 +100,7 @@ $bindings = {
   'C-b' => 'cursor_scroll_up',
   'UP' => 'cursor_up',
   'DOWN' => 'cursor_dn',
-  'C-SPACE' => 'visual_mode_toggle',
+  'C-SPACE' => 'toggle_visual_mode',
   '@' => 'scripts',
   '#' => 'generators',
 
@@ -109,51 +115,51 @@ $bindings = {
 }
 
 ## clean this up a bit, copied from shell program and macro'd
-$kh = {}
-$kh["\eOP"] = 'F1'
-$kh["\e[A"] = 'UP'
-$kh["\e[5~"] = 'PGUP'
-$kh[''] = 'ESCAPE'
-KEY_PGDN = "\e[6~".freeze
-KEY_PGUP = "\e[5~".freeze
+@kh = {}
+@kh["\eOP"] = 'F1'
+@kh["\e[A"] = 'UP'
+@kh["\e[5~"] = 'PGUP'
+@kh[''] = 'ESCAPE'
+KEY_PGDN = "\e[6~"
+KEY_PGUP = "\e[5~"
 ## I needed to replace the O with a [ for this to work
 #  in Vim Home comes as ^[OH whereas on the command line it is correct as ^[[H
-KEY_HOME = ''.freeze
-KEY_END = "\e[F".freeze
-KEY_F1 = "\eOP".freeze
-KEY_UP = "\e[A".freeze
-KEY_DOWN = "\e[B".freeze
-
-$kh[KEY_PGDN] = 'PgDn'
-$kh[KEY_PGUP] = 'PgUp'
-$kh[KEY_HOME] = 'Home'
-$kh[KEY_END] = 'End'
-$kh[KEY_F1] = 'F1'
-$kh[KEY_UP] = 'UP'
-$kh[KEY_DOWN] = 'DOWN'
-KEY_LEFT = ''.freeze
-KEY_RIGHT = ''.freeze
-$kh["\eOQ"] = 'F2'
-$kh["\eOR"] = 'F3'
-$kh["\eOS"] = 'F4'
-$kh[KEY_LEFT] = 'LEFT'
-$kh[KEY_RIGHT] = 'RIGHT'
-KEY_F5 = '[15~'.freeze
-KEY_F6 = '[17~'.freeze
-KEY_F7 = '[18~'.freeze
-KEY_F8 = '[19~'.freeze
-KEY_F9 = '[20~'.freeze
-KEY_F10 = '[21~'.freeze
-KEY_S_F1 = ''.freeze
-$kh[KEY_F5] = 'F5'
-$kh[KEY_F6] = 'F6'
-$kh[KEY_F7] = 'F7'
-$kh[KEY_F8] = 'F8'
-$kh[KEY_F9] = 'F9'
-$kh[KEY_F10] = 'F10'
+KEY_HOME = ''
+KEY_END = "\e[F"
+KEY_F1 = "\eOP"
+KEY_UP = "\e[A"
+KEY_DOWN = "\e[B"
+
+@kh[KEY_PGDN] = 'PgDn'
+@kh[KEY_PGUP] = 'PgUp'
+@kh[KEY_HOME] = 'Home'
+@kh[KEY_END] = 'End'
+@kh[KEY_F1] = 'F1'
+@kh[KEY_UP] = 'UP'
+@kh[KEY_DOWN] = 'DOWN'
+KEY_LEFT = ''
+KEY_RIGHT = ''
+@kh["\eOQ"] = 'F2'
+@kh["\eOR"] = 'F3'
+@kh["\eOS"] = 'F4'
+@kh[KEY_LEFT] = 'LEFT'
+@kh[KEY_RIGHT] = 'RIGHT'
+KEY_F5 = '[15~'
+KEY_F6 = '[17~'
+KEY_F7 = '[18~'
+KEY_F8 = '[19~'
+KEY_F9 = '[20~'
+KEY_F10 = '[21~'
+KEY_S_F1 = ''
+@kh[KEY_F5] = 'F5'
+@kh[KEY_F6] = 'F6'
+@kh[KEY_F7] = 'F7'
+@kh[KEY_F8] = 'F8'
+@kh[KEY_F9] = 'F9'
+@kh[KEY_F10] = 'F10'
 # testing out shift+Function. these are the codes my kb generates
-$kh[KEY_S_F1] = 'S-F1'
-$kh[''] = 'S-F2'
+@kh[KEY_S_F1] = 'S-F1'
+@kh[''] = 'S-F2'
 
 # copied from fff
 def clear_screen
@@ -166,8 +172,8 @@ def clear_screen
   #              Also sets cursor to (0,0).
   # ENV["TMUX:+\e[2J]"],
   printf("\e[%sH\e[9999C\e[1J\e[1;%sr", \
-         $glines - 0, # was 2
-         $glines) # was grows
+         @glines - 0, # was 2
+         @glines) # was grows
 end
 
 # copied from fff
@@ -196,9 +202,9 @@ def setup_terminal
   # '\e[2J':     Clear the screen.
   # '\e[1;Nr':   Limit scrolling to scrolling area.
   #              Also sets cursor to (0,0).
-  # printf("\e[?1049h\e[?7l\e[?25l\e[2J\e[1;%sr", $glines)
+  # printf("\e[?1049h\e[?7l\e[?25l\e[2J\e[1;%sr", @glines)
   # 2019-03-29 - XXX temporarily not hiding cursor to see if we can place it.
-  printf("\e[?1049h\e[?7l\e[?25h\e[2J\e[1;%sr", $glines)
+  printf("\e[?1049h\e[?7l\e[?25h\e[2J\e[1;%sr", @glines)
   # earlier glines was grows
 
   # Hide echoing of user input
@@ -214,6 +220,10 @@ def readline prompt='>'
   print "\e[?25h"
   system 'stty echo'
   begin
+    if prompt.length > 40
+      puts prompt
+      prompt = '>'
+    end
     target = Readline.readline(prompt, true)
   rescue Interrupt
     return nil
@@ -256,7 +266,7 @@ def get_char
         # puts "got #{k}"
         buff += k.chr
       else
-        x = $kh[buff]
+        x = @kh[buff]
         return x if x
 
         # puts "returning with  #{buff}"
@@ -280,36 +290,37 @@ end
 
 ## GLOBALS
 # hints or shortcuts to get to files without moving
-$IDX = ('a'..'y').to_a
-$IDX.delete 'q'
-$IDX.concat ('za'..'zz').to_a
-$IDX.concat ('Za'..'Zz').to_a
-$IDX.concat ('ZA'..'ZZ').to_a
-
-$selected_files = []
-$bookmarks = {}
-$mode = nil
-$glines = `tput lines`.to_i
-$gcols = `tput cols`.to_i
-$grows = $glines - 3  # can be a func
-# $pagesize = 60
-$gviscols = 3
-$pagesize = $grows * $gviscols # can be a func
-$stact = 0 # used when panning a folder to next column
-# $editor_mode = true
-$editor_mode = false # changed 2018-03-12 - so we start in pager mode
-$enhanced_mode = true
-$visual_block_start = nil
+IDX = ('a'..'y').to_a
+IDX.delete 'q'
+IDX.concat ('za'..'zz').to_a
+IDX.concat ('Za'..'Zz').to_a
+IDX.concat ('ZA'..'ZZ').to_a
+IDX.freeze
+
+@selected_files = []
+@bookmarks = {}
+@mode = nil
+@glines = `tput lines`.to_i
+@gcols = `tput cols`.to_i
+@grows = @glines - 3 # can be a func
+# @pagesize = 60
+@gviscols = 3
+@pagesize = @grows * @gviscols # can be a func
+@stact = 0 # used when panning a folder to next column
+# @editor_mode = true
+@editor_mode = false # changed 2018-03-12 - so we start in pager mode
+@enhanced_mode = true
+@visual_block_start = nil
 PAGER_COMMAND = {
   text: 'most',
   image: 'open',
   zip: 'tar ztvf %% | most',
   unknown: 'open'
-}
-$dir_position = {}
-@movement = @old_cursor = nil  # cursor movement has happened only, don't repaint
-$selection_mode = 1 # single select
+}.freeze
+@dir_position = {}
+@movement = @old_cursor = nil # cursor movement has happened only, don't repaint
 ## FLAGS
+@multiple_selection = true # single select
 @group_dirs = true
 # truncate long filenames from :right, :left or :center.
 @truncate_from = :center
@@ -319,26 +330,56 @@ $selection_mode = 1 # single select
 @selected_files_escaped_flag = false
 @keys_to_clear = nil
 
+# See toggle_value
+# we need to set these on startup
+@toggles = {
+  ignore_case: true,
+  # group_directories: true,
+  long_listing: false,
+  enhanced_mode: true,
+  visual_mode: false,
+  display_file_stats: true,
+  toggle_selected_files_fullpath_flag: false,
+  toggle_selected_files_escaped_flag: false,
+  multiple_selection: true,
+  editor_mode: false,
+  selection_mode: false, # typing hint adds to selection, does not open
+  debug_flag: false,
+  toggle_filename_status_line: true
+}
+# @cycles = { truncate_from: :center,
+            # show_hidden: nil }
+# @enums = {
+  # truncate_from: %i[left right center],
+  # show_hidden: [nil, 'D']
+# }
+# var is name of variable to be set
+@options = {
+  truncate_from: { current: :center, values: %i[left right center], var: :truncate_from },
+  group_directories: { current: :first, values: %i[first none last] },
+  show_hidden: { current: nil, values: [nil, 'D'], var: :hidden }
+}
+
 ## ----------------- CONSTANTS ----------------- ##
-GMARK = '*'.freeze
-CURMARK = '>'.freeze
+GMARK = '*'
+CURMARK = '>'
 MSCROLL = 10
-SPACE = ' '.freeze
-SEPARATOR = '-------'.freeze
-CLEAR      = "\e[0m".freeze
-BOLD       = "\e[1m".freeze
-BOLD_OFF = "\e[22m".freeze
-RED = "\e[31m".freeze
-ON_RED = "\e[41m".freeze
-GREEN      = "\e[32m".freeze
-YELLOW     = "\e[33m".freeze
-BLUE       = "\e[1;34m".freeze
-MAGENTA    = "\e[35m".freeze
-CYAN       = "\e[36m".freeze
-
-ON_BLUE    = "\e[44m".freeze
-REVERSE    = "\e[7m".freeze
-UNDERLINE    = "\e[4m".freeze
+SPACE = ' '
+SEPARATOR = '-------'
+CLEAR      = "\e[0m"
+BOLD       = "\e[1m"
+BOLD_OFF = "\e[22m"
+RED = "\e[31m"
+ON_RED = "\e[41m"
+GREEN      = "\e[32m"
+YELLOW     = "\e[33m"
+BLUE       = "\e[1;34m"
+MAGENTA    = "\e[35m"
+CYAN       = "\e[36m"
+
+ON_BLUE    = "\e[44m"
+REVERSE    = "\e[7m"
+UNDERLINE    = "\e[4m"
 CURSOR_COLOR = REVERSE
 
 # NOTE: that osx uses LSCOLORS which only has colors for filetypes not
@@ -351,45 +392,44 @@ CURSOR_COLOR = REVERSE
 
 # This hash contains color codes for extensions. It is updated from
 # LS_COLORS.
-$ls_color = {
+@ls_color = {
   '.rb' => RED,
   '.tgz' => MAGENTA,
   '.zip' => MAGENTA,
   '.torrent' => GREEN,
   '.srt' => GREEN,
-  '.part' =>  "\e[40;31;01m",
+  '.part' => "\e[40;31;01m",
   '.sh' => CYAN
 }
 # This hash contains colors for file patterns, updated from LS_COLORS
-$ls_pattern = {}
+@ls_pattern = {}
 # This hash contains colors for file types, updated from LS_COLORS
 # Default values in absence of LS_COLORS
-$ls_ftype = {
+@ls_ftype = {
   'directory' =>  BLUE,
-  'link'      =>  "\e[01;36m",
-  'mi'        =>  "\e[01;31;7m",
-  'or'        =>  "\e[40;31;01m",
-  'ex'        =>  "\e[01;32m"
+  'link' =>  "\e[01;36m",
+  'mi' =>  "\e[01;31;7m",
+  'or' =>  "\e[40;31;01m",
+  'ex' =>  "\e[01;32m"
 }
 ## --------------------------------------------- ##
 
-$patt = nil
-$ignorecase = true
-$quitting = false
-$modified = $writing = false
-$visited_files = []
+@patt = nil
+@ignorecase = true
+@quitting = false
+@modified = @writing = false
+@visited_files = []
 ## dir stack for popping
-$visited_dirs = []
+@visited_dirs = []
 ## dirs where some work has been done, for saving and restoring
-$used_dirs = []
+@used_dirs = []
 # zsh o = order m = modified time
-$default_sort_order = 'Om'
-$sorto = $default_sort_order
-$viewctr = 0
-$history = []
+@default_sort_order = 'Om'
+@sorto = @default_sort_order
+@viewctr = 0
 ## sta is where view (viewport) begins, cursor is current row/file
-$sta = $cursor = 0
-$visual_mode = false
+@sta = @cursor = 0
+@visual_mode = false
 @status_color = 4 # status line, can be 2 3 4 5 6
 @status_color_right = 8 # status line right part
 
@@ -406,20 +446,21 @@ def read_directory
   # -r Ignore the escape conventions of echo.
   # zshglob M = MARK_DIRS
 
-  $filterstr ||= 'M'
-  # $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
-  $files = list_files
-  $files = group_directories_first($files) if @group_dirs
-  return unless $enhanced_mode
+  @filterstr ||= 'M' # XXX can we remove from here
+  # @files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}#{@filterstr})'`.split("\n")
+  # @files = list_files
+  list_files
+  # @files = group_directories_first(@files) if @toggles[:group_directories]
+  group_directories_first
+  return unless cget(:enhanced_mode)
 
   enhance_file_list
-  $files = $files.uniq
+  @files = @files.uniq
 end
 
 # return a list of directory contents sorted as per sort order
 # NOTE: FNM_CASEFOLD does not work with Dir.glob
-def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
-
+def list_files dir='*', sorto=@sorto, hidden=@hidden, _filter=@filterstr
   dir += '/*' if File.directory?(dir)
   dir = dir.gsub('//', '/')
 
@@ -444,7 +485,7 @@ def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
 
   # sort by time and then reverse so latest first.
   sorted_files = if hidden == 'D'
-                   Dir.glob(dir, File::FNM_DOTMATCH)
+                   Dir.glob(dir, File::FNM_DOTMATCH) - %w[. ..]
                  else
                    Dir.glob(dir)
                  end
@@ -461,14 +502,15 @@ def list_files dir='*', sorto=$sorto, hidden=$hidden, filter=$filterstr
     end
   end
 
-  sorted_files.sort! { |w1, w2| w1.casecmp(w2) } if func == :path && $ignorecase
+  sorted_files.sort! { |w1, w2| w1.casecmp(w2) } if func == :path && cget(:ignore_case)
 
   # zsh gives mtime sort with latest first, ruby gives latest last
   sorted_files.reverse! if sorto[0] == 'O'
 
   # add slash to directories
   sorted_files = add_slash sorted_files
-  return sorted_files
+  # return sorted_files
+  @files = sorted_files
 end
 # ------------- end of read_directory --------------------------------#
 
@@ -484,61 +526,61 @@ end
 
 # ------------------- create_viewport ------------------ #
 def create_viewport
-  $view = if $patt
-            if $ignorecase
-              $files.grep(/#{$patt}/i)
+  @view = if @patt
+            if cget(:ignore_case)
+              @files.grep(/#{@patt}/i)
             else
-              $files.grep(/#{$patt}/)
+              @files.grep(/#{@patt}/)
             end
           else
-            $files
+            @files
           end
 
-  fl = $view.size
-  $sta = 0 if $sta >= fl || $sta < 0
-  $cursor = 0 if $cursor >= fl || $cursor < 0
+  fl = @view.size
+  @sta = 0 if @sta >= fl || @sta < 0
+  @cursor = 0 if @cursor >= fl || @cursor < 0
 
   # NOTE if we make cursor zero, then it can be < sta so in the next line
   #  it will be made equal to sta which we may not want
-  $cursor = $sta if $sta > $cursor
+  @cursor = @sta if @sta > @cursor
 
   # viewport are the files that are visible, subset of view
-  $viewport = $view[$sta, $pagesize]
+  @viewport = @view[@sta, @pagesize]
 end
 # ------------- end of create_viewport --------------------------------#
 
 # ------------------- print_title ------------------ #
 def print_title
-
   # print help line and version
   print "#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
 
   # print 1 of n files, sort order, filter etc details
-  $title ||= Dir.pwd.sub(ENV['HOME'], '~')
+  @title ||= Dir.pwd.sub(ENV['HOME'], '~')
 
   # Add bookmark next to name of dir, if exists
-  bm = $bookmarks.key(Dir.pwd)
+  # FIXME This should not happen in other listings like find selected files etc
+  bm = @bookmarks.key(Dir.pwd)
   bm = " ('#{bm})" if bm
 
-  fin = $sta + $viewport.size
-  fl = $view.size
+  fin = @sta + @viewport.size
+  fl = @view.size
 
   # fix count of entries so separator and enhanced entries don't show up
-  if $enhanced_mode
-    ix = $viewport.index SEPARATOR
-    fin = $sta + ix if ix
+  if cget(:enhanced_mode)
+    ix = @viewport.index SEPARATOR
+    fin = @sta + ix if ix
 
-    ix = $view.index SEPARATOR
+    ix = @view.index SEPARATOR
     fl = ix if ix
   end
 
-  t = fl.zero? ? "#{$title}#{bm}  No files." : "#{$title}#{bm}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
+  t = fl.zero? ? "#{@title}#{bm}  No files." : "#{@title}#{bm}  #{@sta + 1} to #{fin} of #{fl}  #{@sorto} F:#{@filterstr}"
 
   # don't exceed columns while printing
-  t = t[t.size - $gcols..-1] if t.size >= $gcols
+  t = t[t.size - @gcols..-1] if t.size >= @gcols
 
   print "#{BOLD}#{t}#{CLEAR}\n"
-  print "EMPTY" if fl.zero?
+  print 'EMPTY' if fl.zero?
 end
 # ------------- end of print_title --------------------------------#
 
@@ -547,42 +589,41 @@ end
 # called when page changes, so we only put directory name)
 # NOTE: called only from draw_directory.
 def status_line
-    # prompt
-    v_mm = $mode ? "[#{$mode}] " : ''
-    cf = current_file
-    $message = ' | No matches. Press ESCAPE' if $patt && !cf
+  # prompt
+  v_mm = @mode ? "[#{@mode}] " : ''
+  cf = current_file
+  @message = ' | No matches. Press ESCAPE' if @patt && !cf
 
-    clear_last_line
+  clear_last_line
 
-    # Print the filename at the right side of the status line
-    # sometimes due to search, there is no file
-    if cf
-      if @debug_flag
-        # XXX this will not work on file basis FIXME
-        print_debug_info cf
-      else
-        # print_on_right "#{Dir.pwd}"
-        print_filename_status_line if @filename_status_line
-      end
-    end
-    # move to beginning of line, reset text mode after printing
-    # patt and message are together, no gap, why not ? 2019-04-08 -
-    if $patt && $patt != ''
-      patt = "[/#{$patt}]"
-      patt[-1] = '/i]' if $ignorecase
+  # Print the filename at the right side of the status line
+  # sometimes due to search, there is no file
+  if cf
+    if cget(:debug_flag)
+      # XXX this will not work on file basis FIXME
+      print_debug_info cf
+    else
+      # print_on_right "#{Dir.pwd}"
+      print_filename_status_line if @filename_status_line
     end
-    # bring cursor to start of line
-    # add background color
-    # print mode
-    # print search pattern if any
-    # print message if any
-    # print "\r#{v_mm}#{patt}#{$message}\e[m"
-    print "\r\e[33;4#{@status_color}m#{v_mm}#{patt}#{$message}\e[m"
-
+  end
+  # move to beginning of line, reset text mode after printing
+  # patt and message are together, no gap, why not ? 2019-04-08 -
+  if @patt && @patt != ''
+    patt = "[/#{@patt}" + ']' # to get unfrozen string
+    patt[-1] = '/i]' if cget(:ignore_case)
+  end
+  # bring cursor to start of line
+  # add background color
+  # print mode
+  # print search pattern if any
+  # print message if any
+  # print "\r#{v_mm}#{patt}#{@message}\e[m"
+  print "\r\e[33;4#{@status_color}m#{v_mm}#{patt}#{@message}\e[m"
 end
 
-def print_debug_info cf=current_file()
-  print_on_right "len:#{cf.length}/#{$temp_wid} = #{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
+def print_debug_info cf=current_file
+  print_on_right "len:#{cf.length}/#{@temp_wid} = #{@sta},#{@cursor},#{@stact},#{@viewport.size},#{@grows} | #{cf}"
 end
 
 def print_filename_status_line cf=current_file
@@ -594,7 +635,7 @@ def print_filename_status_line cf=current_file
          end
 
     mtime = if !File.exist? ff
-              # take care of dead links lstat TODO
+              # take care of dead links lstat
               date_format(File.lstat(ff).mtime) if File.symlink?(ff)
             else
               date_format(File.stat(ff).mtime)
@@ -606,11 +647,11 @@ end
 
 # should we do a read of the dir
 def rescan?
-  $rescan_required
+  @rescan_required
 end
 
 def rescan_required flag=true
-  $rescan_required = flag
+  @rescan_required = flag
   redraw_required if flag
 end
 
@@ -624,7 +665,6 @@ def draw_directory
   # all this seems to be happening for each keystroke even if
   # not really required. FIXME maybe reduce and call when required
 
-
   # view consists of all files (filtered by pattern if necessary)
   # viewport is only that subset of view that is displayed on screen
   create_viewport
@@ -632,11 +672,11 @@ def draw_directory
   print_title
 
   # add hint and format the line
-  buff = format_array $viewport
+  buff = format_array @viewport
 
   # break viewport into as many columns as required
   # This is where directories get their blue color
-  buff = columnate buff, $grows
+  buff = columnate buff, @grows
 
   # starts printing array on line 3
   buff.each { |line| print line, "\n" }
@@ -655,18 +695,18 @@ end
 # FIXME color of original hint lost
 def place_cursor
   # clear_cursor
-  # hint = get_shortcut($cursor)
-  c = $cursor - $sta
-  if c < $grows
+  # hint = get_shortcut(@cursor)
+  c = @cursor - @sta
+  if c < @grows
     # system "tput cup #{c + 2} 0"
     # print "\e[#{c + 3};0H"
     tput_cup c, 0
     # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
     return
   end
-  wid = get_width $viewport.size, $grows
-  rows = c % $grows
-  cols = (c / $grows) * wid
+  wid = get_width @viewport.size, @grows
+  rows = c % @grows
+  cols = (c / @grows) * wid
   # system "tput cup #{rows + 2} #{cols}"
   # print "\e[#{rows + 3};#{cols + 1}H"
   tput_cup rows, cols
@@ -679,7 +719,7 @@ def clear_cursor
   return unless @old_cursor
 
   hint = get_shortcut(@old_cursor)
-  if @old_cursor < $grows
+  if @old_cursor < @grows
     # FIXME: faster way of getting here ? see fff
     # system "tput cup #{@old_cursor + 2} 0"
     tput_cup @old_cursor, 0
@@ -687,9 +727,9 @@ def clear_cursor
     print "#{hint}  "
     return
   end
-  wid = get_width $viewport.size, $grows
-  rows = @old_cursor % $grows
-  cols = (@old_cursor / $grows) * wid
+  wid = get_width @viewport.size, @grows
+  rows = @old_cursor % @grows
+  cols = (@old_cursor / @grows) * wid
   # system "tput cup #{rows + 2} #{cols}"
   tput_cup rows, cols
   # print "#{CURSOR_COLOR}#{hint} >#{CLEAR}"
@@ -702,7 +742,10 @@ def tput_cup row, col
   print "\e[#{row + 3};#{col + 1}H"
 end
 
-def redraw_required(flag=true) $redraw_required = flag; end
+# FIXME flag is unused ???? XXX
+def redraw_required flag=true
+  @redraw_required = flag
+end
 
 def resolve_key key
   ret = true
@@ -710,11 +753,11 @@ def resolve_key key
 
   if key.match?(/^[a-pr-zZ]$/)
     # hint mode
-    ret = select_hint $viewport, key
+    ret = select_hint @viewport, key
   elsif key == 'BACKSPACE'
     # do we really need this TODO
-    $patt = $patt[0..-2] if $patt && !$patt.empty?
-    $message = $patt = nil if $patt == ''
+    @patt = @patt[0..-2] if @patt && !@patt.empty?
+    @message = @patt = nil if @patt == ''
   elsif '0123456789'.include? key
     resolve_numeric_key key
   else
@@ -725,10 +768,10 @@ end
 
 def resolve_binding key
   # fetch binding for key
-  x = $bindings[key]
+  x = @bindings[key]
 
   # remove comment string so only binding is left
-  x, _ = x.split(':') if x
+  x, = x.split(':') if x
 
   # split into binding and args
   x = x.split if x
@@ -738,13 +781,14 @@ def resolve_binding key
     send(binding, *args) if binding
   else
     # perror "No binding for #{key}"
+    @log.debug "No binding for #{key}"
   end
 end
 
 # numbers represent quick bookmarks
 # if bookmark exists, go to else create it.
 def resolve_numeric_key key
-  d = $bookmarks[key]
+  d = @bookmarks[key]
   if d
     change_dir d
     return
@@ -755,7 +799,7 @@ def resolve_numeric_key key
 end
 
 def set_bookmark key, dir=Dir.pwd
-  $bookmarks[key] = dir
+  @bookmarks[key] = dir
 end
 
 ## write current dir to a file so we can ccd to it when exiting
@@ -775,7 +819,7 @@ KILO_SIZE = 1024.0
 
 # Return the file size with a readable style.
 # NOTE format is a kernel method.
-def readable_file_size(size, precision)
+def readable_file_size size, precision
   if size < KILO_SIZE then format('%d B', size)
   elsif size < MEGA_SIZE then format("%.#{precision}f K", (size / KILO_SIZE))
   elsif size < GIGA_SIZE then format("%.#{precision}f M", (size / MEGA_SIZE))
@@ -784,7 +828,7 @@ def readable_file_size(size, precision)
 end
 
 ## format date for file given stat
-def date_format(t)
+def date_format t
   t.strftime '%Y/%m/%d'
 end
 
@@ -802,7 +846,7 @@ def columnate ary, siz
   # if less than sz then 1 col and full width
   #
   wid = get_width ary.size, siz
-  $temp_wid = wid
+  @temp_wid = wid
 
   # ix refers to the index in the complete file list, wherease we only show 60 at a time
   ix = 0
@@ -812,19 +856,18 @@ def columnate ary, siz
     ctr = 0
     while ctr < siz
 
-      f = ary[ix]
+      f = ary[ix].dup # 2019-04-14 - frozen_string_literal
       # f is not just filename but marker and hint
 
       # check to see if we need to truncate
       # 2019-03-18 - truncate from middle of string.
       # 2019-03-24 - truncate and size to take care of color codes
       # fsz = f.size
-      unformatted_len, _ = filename_len(f)
+      unformatted_len, = filename_len(f)
       if unformatted_len > wid
         # take the excess out from the center on both sides
         f = truncate_formatted_filename(f, unformatted_len, wid)
 
-
       elsif unformatted_len < wid
 
         # f = f.ljust(wid)
@@ -885,10 +928,10 @@ def truncate_formatted_filename f, unformatted_len, wid
         # there could be escape codes of varying length
         sindex = f.index ' '
         # if f[0] == "\e"
-          # mindex = f.index('m')
-          # hintsize = sindex - mindex - 1
+        # mindex = f.index('m')
+        # hintsize = sindex - mindex - 1
         # else
-          # hintsize = sindex - 1
+        # hintsize = sindex - 1
         # end
         # f[0..sindex + 1] + '<' + f[-wid + hintsize..-1] + ' '
         # @log.debug "XXX #{excess}: #{f} / #{wid}"
@@ -901,12 +944,12 @@ def truncate_formatted_filename f, unformatted_len, wid
 end
 
 def get_width arysz, siz
-  ars = [$pagesize, arysz].min
+  ars = [@pagesize, arysz].min
   d = 0
-  return $gcols - d if ars <= siz
+  return @gcols - d if ars <= siz
 
   tmp = (ars * 1.000 / siz).ceil
-  wid = $gcols / tmp - d
+  wid = @gcols / tmp - d
   wid
 end
 
@@ -923,7 +966,7 @@ def filename_len name
 end
 
 ## formats the data with number, mark and details
-def format_array(ary)
+def format_array ary
   # buff = Array.new
   buff = Array.new(ary.size)
   return buff if ary.nil? || ary.empty?
@@ -941,15 +984,12 @@ def format_array(ary)
     cur = SPACE
     ind = get_shortcut(ix)
 
-
     # Handle separator before enhanced file list.
     # We do lost a shortcut
-    if f == SEPARATOR
-      ind = cur = mark = '-'
-    end
+    ind = cur = mark = '-' if f == SEPARATOR
 
     mark = '+' if visited? f
-    # cur = CURMARK if ix + $sta == $cursor # 2019-03-29 - removed reduced calls
+    # cur = CURMARK if ix + @sta == @cursor # 2019-03-29 - removed reduced calls
     # NOTE seems like f and ary[ix] are the same
     mark = GMARK if selected?(ary[ix])
 
@@ -957,37 +997,14 @@ def format_array(ary)
     fullname = f[0] == '~' ? File.expand_path(f) : f
     color = color_for fullname
 
-    if $long_listing
-      begin
-        if File.exist? f
-          stat = File.stat(f)
-        else
-          # dead link
-          if File.symlink?(f)
-            stat = File.lstat(f)
-          else
-            # remove last character and get stat
-            last = f[-1]
-            stat = File.stat(f.chop) if last == ' ' || last == '@' || last == '*'
-          end
-        end
-        # this is for saved directories etc which are shortened
-        stat ||= File.stat(File.expand_path(f))
-        f = format('%10s  %s  %s', readable_file_size(stat.size, 1),
-                   date_format(stat.mtime), f)
-      rescue StandardError => e
-        @log.warn "WARN::#{e}: FILE:: #{f}"
-        f = format('%10s  %s  %s', '?', '??????????', f)
-      end
-    end
+    f = format_long_listing(f) if @long_listing
 
     # 2019-03-31 - replace unprintable chars with ?
     f = f.gsub(/[^[:print:]]/, '?')
 
+    # FIXME do in one operation. otherwise creating string 2 times
     s = "#{ind}#{mark}#{cur}#{f}"
-    if color
-      s = "#{color}#{s}#{CLEAR}"
-    end
+    s = "#{color}#{s}#{CLEAR}" if color
 
     buff[ctr] = s
 
@@ -997,22 +1014,53 @@ def format_array(ary)
   buff
 end
 
+def format_long_listing f
+  return unless @long_listing
+  return format('%10s  %s  %s', '-', '----------', f) if f == SEPARATOR
+
+  begin
+    if File.exist? f
+      stat = File.stat(f)
+    elsif f[0] == '~'
+      stat = File.stat(File.expand_path(f))
+    elsif File.symlink?(f)
+      # dead link
+      stat = File.lstat(f)
+    else
+      # remove last character and get stat
+      last = f[-1]
+      stat = File.stat(f.chop) if last == ' ' || last == '@' || last == '*'
+    end
+
+    f = format('%10s  %s  %s',
+               readable_file_size(stat.size, 1),
+               date_format(stat.mtime),
+               f)
+
+  rescue StandardError => e
+    @log.warn "WARN::#{e}: FILE:: #{f}"
+    f = format('%10s  %s  %s', '?', '??????????', f)
+  end
+
+  return f
+end
+
 # determine color for a filename based on extension, then pattern, then filetype
 def color_for fname
   return nil if fname == SEPARATOR
 
   extension = File.extname(fname)
-  color = $ls_color[extension]
+  color = @ls_color[extension]
   return color if color
 
   # check file against patterns
   if File.file?(fname)
-    $ls_pattern.each_pair do |k, v|
+    @ls_pattern.each_pair do |k, v|
       # if fname.match?(/k/)
-      if fname =~ /#{k}/
+      if /#{k}/.match?(fname)
         # @log.debug "#{fname} matched #{k}. color is #{v[1..-2]}"
         return v
-      # else
+        # else
         # @log.debug "#{fname} di not match #{k}. color is #{v[1..-2]}"
       end
     end
@@ -1022,34 +1070,33 @@ def color_for fname
   if File.exist? fname
     # @log.debug "Filetype:#{File.ftype(fname)}"
 
-    return $ls_ftype[File.ftype(fname)] if $ls_ftype.key? File.ftype(fname)
-    return $ls_ftype['ex'] if File.executable?(fname)
+    return @ls_ftype[File.ftype(fname)] if @ls_ftype.key? File.ftype(fname)
+    return @ls_ftype['ex'] if File.executable?(fname)
   else
     # orphan file, but fff uses mi
-    return $ls_ftype['mi'] if File.symlink?(fname)
+    return @ls_ftype['mi'] if File.symlink?(fname)
 
     @log.warn "FILE WRONG: #{fname}"
-    return $ls_ftype['or']
+    return @ls_ftype['or']
   end
 
   nil
 end
 
 def parse_ls_colors
-
   colorvar = ENV['LS_COLORS']
   if colorvar.nil?
-    $ls_colors_found = nil
+    @ls_colors_found = nil
     return
   end
-  $ls_colors_found = true
+  @ls_colors_found = true
   ls = colorvar.split(':')
   ls.each do |e|
     patt, colr = e.split '='
     colr = "\e[" + colr + 'm'
     if e.start_with? '*.'
       # extension, avoid '*' and use the rest as key
-      $ls_color[patt[1..-1]] = colr
+      @ls_color[patt[1..-1]] = colr
       # @log.debug "COLOR: Writing extension (#{patt})."
     elsif e[0] == '*'
       # file pattern, this would be a glob pattern not regex
@@ -1057,11 +1104,11 @@ def parse_ls_colors
       patt = patt.gsub('.', '\.')
       patt = patt.sub('+', '\\\+') # if i put a plus it does not go at all
       patt = patt.gsub('-', '\-')
-      patt = patt.gsub('?', '.')
+      patt = patt.tr('?', '.')
       patt = patt.gsub('*', '.*')
       patt = "^#{patt}" if patt[0] != '.'
       patt = "#{patt}$" if patt[-1] != '*'
-      $ls_pattern[patt] = colr
+      @ls_pattern[patt] = colr
       # @log.debug "COLOR: Writing file (#{patt})."
     elsif patt.length == 2
       # file type, needs to be mapped to what ruby will return
@@ -1078,19 +1125,19 @@ def parse_ls_colors
       # ex = file which is executable (ie. has 'x' set in permissions).
       case patt
       when 'di'
-        $ls_ftype['directory'] = colr
+        @ls_ftype['directory'] = colr
       when 'cd'
-        $ls_ftype['characterSpecial'] = colr
+        @ls_ftype['characterSpecial'] = colr
       when 'bd'
-        $ls_ftype['blockSpecial'] = colr
+        @ls_ftype['blockSpecial'] = colr
       when 'pi'
-        $ls_ftype['fifo'] = colr
+        @ls_ftype['fifo'] = colr
       when 'ln'
-        $ls_ftype['link'] = colr
+        @ls_ftype['link'] = colr
       when 'so'
-        $ls_ftype['socket'] = colr
+        @ls_ftype['socket'] = colr
       else
-        $ls_ftype[patt] = colr
+        @ls_ftype[patt] = colr
       end
       # @log.debug "COLOR: ftype #{patt}"
     end
@@ -1099,7 +1146,6 @@ end
 
 ## select file based on key pressed
 def select_hint view, key
-
   ix = get_index(key, view.size)
   return nil unless ix
 
@@ -1107,11 +1153,11 @@ def select_hint view, key
   return nil unless f
   return nil if f == SEPARATOR
 
-  $cursor = $sta + ix
+  @cursor = @sta + ix
 
-  if $mode == 'SEL'
+  if @mode == 'SEL'
     toggle_select f
-  elsif $mode == 'COM'
+  elsif @mode == 'COM'
     # not being called any longer I think
     run_command f
   else
@@ -1125,16 +1171,22 @@ def toggle_select f=current_file
   if selected? f
     remove_from_selection f
   else
-    $selected_files.clear if $selection_mode == 1
+    @selected_files.clear unless @multiple_selection
     add_to_selection f
   end
-  message "#{$selected_files.count} files selected.   "
+  message "#{@selected_files.count} files selected.   "
   # XXX is it possible to just redraw this line
   redraw_required
 end
 
+# allow single or multiple selection with C-s key
+def toggle_multiple_selection
+  # @multiple_selection = !@multiple_selection
+  toggle_value :multiple_selection
+end
+
 ## open file or directory
-def open_file(f)
+def open_file f
   return unless f
 
   f = File.expand_path(f) if f[0] == '~'
@@ -1149,9 +1201,8 @@ def open_file(f)
   f, _nextpos = f.split(':') if f.index(':')
   if File.directory? f
     save_dir_pos
-    change_dir f #, nextpos
+    change_dir f # , nextpos
   elsif File.readable? f
-    # TODO: looks complex pls simplify !! XXX
     comm = opener_for f
     # '%%' will be substituted with the filename. See zip
     comm = if comm.index('%%')
@@ -1165,7 +1216,7 @@ def open_file(f)
     setup_terminal
     # XXX maybe use absolute_path instead of hardcoding
     f = Dir.pwd + '/' + f if f[0] != '/'
-    $visited_files.insert(0, f)
+    @visited_files.insert(0, f)
     push_used_dirs Dir.pwd
   else
     perror "open_file: (#{f}) not found"
@@ -1184,22 +1235,24 @@ end
 def edit_current
   command = ENV['EDITOR'] || ENV['VISUAL'] || 'vim'
   run_on_current command
-  $visited_files.insert(0, current_file)
+  @visited_files.insert(0, current_file)
 end
 
 def open_current
-  opener = /darwin/ =~ RUBY_PLATFORM ? 'open' : 'xdg-open'
+  opener = /darwin/.match?(RUBY_PLATFORM) ? 'open' : 'xdg-open'
   run_on_current opener
-  $visited_files.insert(0, current_file)
+  @visited_files.insert(0, current_file)
 end
 
 # run given command on current file
-def run_on_current(command)
+def run_on_current command
   f = current_file
   return unless f
+
   f = File.expand_path(f)
   return unless File.readable?(f)
 
+  f = Shellwords.escape(f)
   clear_screen
   reset_terminal
   comm = "#{command} #{f}"
@@ -1213,7 +1266,7 @@ end
 #   After putting readline in place of gets, pressing a C-c has a delayed effect.
 #   It goes into exception block after executing other commands and still
 #   does not do the return !
-def run_command(f)
+def run_command f
   files = Shellwords.join(f)
   count = f.count
   text = if count > 1
@@ -1234,7 +1287,7 @@ def run_command(f)
     setup_terminal
   rescue StandardError => ex
     perror "Canceled or failed command, (#{ex}) press a key."
-    @log.warn "RUNCOMMAND: #{ex.to_s}"
+    @log.warn "RUNCOMMAND: #{ex}"
     return
   end
 
@@ -1252,7 +1305,7 @@ def change_dir f
 
   # before leaving a dir we save it in the list, as well as the cursor
   # position, so we can restore that position when we return
-  $visited_dirs.insert(0, Dir.pwd)
+  @visited_dirs.insert(0, Dir.pwd)
   save_dir_pos
 
   f = File.expand_path(f)
@@ -1264,24 +1317,25 @@ def change_dir f
 end
 
 def goto_previous_dir
-  prev_dir = $visited_dirs.first
+  prev_dir = @visited_dirs.first
   return unless prev_dir
+
   change_dir prev_dir
 end
 
 def index_of dir
-  $files.index(dir)
+  @files.index(dir)
 end
 
 ## clear sort order and refresh listing, used typically if you are in some view
 #  such as visited dirs or files
 def escape
-  $sorto = nil
-  $sorto = $default_sort_order
-  $viewctr = 0
-  $title = nil
-  $filterstr = 'M'
-  $message = nil
+  @sorto = nil
+  @sorto = @default_sort_order
+  @viewctr = 0
+  @title = nil
+  @filterstr = 'M'
+  @message = nil
   visual_block_clear
   refresh
 end
@@ -1289,29 +1343,37 @@ end
 ## refresh listing after some change like option change, or toggle
 # Should we check selected_files array also for deleted/renamed files
 def refresh
-  $patt = nil
-  $title = nil
+  @patt = nil
+  @title = nil
   rescan_required
 end
 
 # put directories first, then files
-def group_directories_first files
+def group_directories_first
+  return if cget(:group_directories) == :none
+
+  files = @files
   dirs = files.select { |f| File.directory?(f) }
   # earlier I had File? which removed links, esp dead ones
-  fi   = files.select { |f| !File.directory?(f) }
-  dirs + fi
+  fi   = files.reject { |f| File.directory?(f) }
+  @files = if cget(:group_directories) == :first
+             dirs + fi
+           else
+             fi + dirs
+           end
 end
 
 ## unselect all files
 def unselect_all
-  $selected_files = []
-  $visual_mode = nil
+  @selected_files = []
+  @toggles[:visual_mode] = @visual_mode = false
 end
 
 ## select all entries (files and directories)
 def select_all
   dir = Dir.pwd
-  $selected_files = $view.map { |file| File.join(dir, file) }
+  @selected_files = @view.map { |file| File.join(dir, file) }
+  message "#{@selected_files.count} files selected."
 end
 
 ## accept dir to goto and change to that ( can be a file too)
@@ -1354,14 +1416,12 @@ end
 #  (or deselecting).
 #
 def toggle_selection_mode
-  if $mode == 'SEL'
-    $selection_mode = 1
+  if @mode == 'SEL'
     unselect_all
-    $mode = nil
+    @mode = nil
     message 'Selection mode is single.   '
   else
-    $selection_mode = 2
-    $mode = 'SEL'
+    @mode = 'SEL'
     message 'Typing a hint selects the file. Typing again will clear   .  '
   end
 end
@@ -1379,16 +1439,15 @@ def goto_parent_dir
   return if curr == Dir.pwd
 
   # get index of child dir in this dir, and set cursor to it.
-  index = $files.index(curr + '/')
+  index = @files.index(curr + '/')
   pause "WARNING: Could not find #{curr} in this directory." unless index
-  $cursor = index if index
+  @cursor = index if index
 end
 
 def goto_home_dir
   change_dir ENV['HOME']
 end
 
-
 # Goes to directory bookmarked with number or upper case char.
 # If lower case character given, then go to first file starting with char.
 def goto_bookmark key=nil
@@ -1397,7 +1456,7 @@ def goto_bookmark key=nil
     print 'Enter bookmark char: '
     key = get_char
   end
-  d = $bookmarks[key]
+  d = @bookmarks[key]
   if d
     change_dir d
   else
@@ -1410,27 +1469,39 @@ def enter_regex
   # print 'Enter (regex) pattern: '
   # move to beginning of line, and clear till EOL
   # print "\r\e[K"
-  $patt = readline '/'
+  @patt = readline '/'
 end
 
 # page/scroll down.
 def next_page
-  $sta += $pagesize
-  $cursor += $pagesize
-  $sta = $cursor if $sta > $cursor
-  $stact = 0
+  @sta += @pagesize
+  @cursor += @pagesize
+  @sta = @cursor if @sta > @cursor
+  @stact = 0
   @old_cursor = nil
   redraw_required
 end
 
 def prev_page
-  $sta -= $pagesize
-  $cursor -= $pagesize
+  @sta -= @pagesize
+  @cursor -= @pagesize
   @old_cursor = nil
   # FIXME: check cursor sanity and if not changed then no redraw
   redraw_required
 end
 
+def goto_top
+  @sta = @cursor = 0
+  @old_cursor = nil
+end
+
+# goto end / bottom
+def goto_end
+  @cursor = @view.size - 1
+  @sta = @view.size - @pagesize
+  @old_cursor = nil
+end
+
 def print_help
   page_with_tempfile do |file|
     file.puts '    HELP'
@@ -1445,26 +1516,25 @@ def print_help
     file.puts
     ary = []
     # 2019-03-19 -  if : then show text after colon
-    $bindings.each_pair { |k, v|
+    @bindings.each_pair do |k, v|
       vv = v.tr('_', ' ')
       vv = vv.split(':')[1].strip if vv.include?(':')
       ary.push "#{k.ljust(7)}  =>  #{vv}"
-    }
-    # FIXME this works but not properly when long_listing is true.
+    end
+    # FIXME: this works but not properly when long_listing is true.
     # We should avoid using columnate as there are several file related things.
-    ary = columnate ary, (ary.size/2)+1
+    ary = columnate ary, (ary.size / 2) + 1
     ary.each { |line| file.puts line }
   end
 end
 
 def page_stat_for_file
-  stat = %x[ stat #{current_file} ]
+  stat = `stat #{current_file}`
   return unless stat
 
   page_with_tempfile do |file|
     file.puts stat
   end
-
 end
 
 def page_with_tempfile
@@ -1485,20 +1555,20 @@ def debug_vars
   page_with_tempfile do |file|
     file.puts "DEBUG VARIABLES for #{current_file}:"
     file.puts
-    file.puts "sta    #{$sta}"
-    file.puts "cursor #{$cursor}"
-    file.puts "stact  #{$stact}"
-    file.puts "viewport.size  #{$viewport.size}"
-    file.puts "pagesize       #{$pagesize}"
-    file.puts "view.size      #{$view.size}"
-    file.puts "grows          #{$grows}"
+    file.puts "sta    #{@sta}"
+    file.puts "cursor #{@cursor}"
+    file.puts "stact  #{@stact}"
+    file.puts "viewport.size  #{@viewport.size}"
+    file.puts "pagesize       #{@pagesize}"
+    file.puts "view.size      #{@view.size}"
+    file.puts "grows          #{@grows}"
     file.puts "File: #{current_file}"
     file.puts
     file.puts "Opener: #{opener_for(current_file)}"
     file.puts
     file.puts `file "#{current_file}"`
     file.puts
-    file.puts %x[stat   "#{current_file}"]
+    file.puts `stat   "#{current_file}"`
   end
   redraw_required
 end
@@ -1506,7 +1576,7 @@ end
 def view_bookmarks
   clear_last_line
   puts 'Bookmarks: '
-  $bookmarks.each_pair { |k, v| puts "#{k.ljust(7)}  =>  #{v}" }
+  @bookmarks.each_pair { |k, v| puts "#{k.ljust(7)}  =>  #{v}" }
   puts
   print 'Enter bookmark to goto: '
   key = get_char
@@ -1517,16 +1587,17 @@ end
 def main_menu
   h = {
     :a => :ag,
-    '/' => :ffind,
+   '/' => :ffind,
     :l => :locate,
     :v => :vidir,
     :z => :z_interface,
     :d => :child_dirs,
     :r => :recent_files,
-    '1' => :select_from_visited_files,
-    '2' => :select_from_used_dirs,
+   '1' => :select_from_visited_files,
+   '2' => :select_from_used_dirs,
+   '3' => :list_selected_files,
     :t => :dirtree,
-    '4' => :tree,
+   '4' => :tree,
     :o => :order_menu,
     :F => :filter_menu,
     :c => :create_menu,
@@ -1537,13 +1608,15 @@ def main_menu
   menu 'Main Menu', h
 end
 
+# copy and move here ?
 def selection_menu
   h = {
     :a => :select_all,
     :u => :unselect_all,
     :s => :toggle_select,
-    '*' => 'toggle_selection_mode',
-    'x' => 'visual_mode_toggle',
+    '*' => 'toggle_multiple_selection',
+    'x' => 'toggle_visual_mode',
+    'm' => 'toggle_selection_mode',
     :v => :view_selected_files
   }
   menu 'Selection Menu', h
@@ -1568,18 +1641,17 @@ def menu title, h
   # 2019-03-09 - trying out using `column` to print in cols
   ary = []
 
-  # 2019-04-07 - check $bindings for shortcut and get key, add global
+  # 2019-04-07 - check @bindings for shortcut and get key, add global
   #  binding in brackets
   h.each_pair do |k, v|
-
     # get global binding
-    scut = $bindings.key(v.to_s)
+    scut = @bindings.key(v.to_s)
     scut = " (#{scut})" if scut
 
     ary << " #{k}: #{v} #{scut}"
   end
   x = ary.join("\n")
-  puts %x{echo "#{x}" | column}
+  puts `echo "#{x}" | column`
 
   key = get_char
   binding = h[key]
@@ -1587,109 +1659,154 @@ def menu title, h
   # TODO: 2019-03-21 - menu's do not have comments, they are symbols
   # binding, _ = binding.split(':')
   if binding
+    # 2019-04-18 - true removed, else 'open' binds to ruby open not OS open
+    # without true, many methods here don't get triggered
     send(binding) if respond_to?(binding, true)
+    # send(binding) if respond_to?(binding)
   end
   redraw_required
   [key, binding]
 end
 
+# some toggles can be invoked directly on a key, or through another menu.
+# Some go to methods like multiple_selection from a key
+# WARNING: method and toggle should not have same name, else flag will toggle twice.
 def toggle_menu
-  h = { h: :toggle_hidden,
-        c: :toggle_case,
-        l: :toggle_long_list,
+  h = { h: :show_hidden,
+        c: :ignore_case,
+        l: :long_listing,
         '1' => :toggle_columns,
-        d: :toggle_group_dirs,
-        :p => :toggle_pager_mode,
-        :D => :toggle_debug_flag,
-        '8' => :toggle_selection_mode,
-        '*' => :toggle_selection_mode,
-        v: :visual_mode_toggle,
-        t: :toggle_truncate_from,
-        e: :toggle_enhanced_list
-  }
+        d: :group_directories,
+        :e => :editor_mode,
+        :D => :debug_flag,
+        '8' => :multiple_selection,
+        '*' => :multiple_selection,
+        'S' => :selection_mode,
+        v: :visual_mode,
+        t: :truncate_from,
+        n: :enhanced_mode }
+  # TODO: add other values at end, what key ?
 
   _, menu_text = menu 'Toggle Menu', h
   return unless menu_text
 
-  case menu_text
-  when :toggle_hidden
-    # NOTE: now that I am shifting queries to ruby not sure this will continue
-    # FNM_DOTMATCH
-    #  working everywhere
-    # zsh D - dot files should show
-    $hidden = $hidden ? nil : 'D'
-    message "Show hidden is now #{!$hidden.nil?}"
-    rescan_required
-  when :toggle_case
-    $ignorecase = !$ignorecase
-    message "Ignore Case is now #{$ignorecase}"
-    rescan_required
-  when :toggle_group_dirs
-    @group_dirs = !@group_dirs
-    message "Group Dirs First is now #{@group_dirs}"
-    rescan_required
-  when :toggle_columns
-    if $gviscols == 1
-      $gviscols = 3
-    else
-      $gviscols = 1
-    end
-    # $long_listing = false if $gviscols > 1
-    x = $grows * $gviscols
-    $pagesize = $pagesize == x ? $grows : x
-    message "Visible columns now set to #{$gviscols}"
-    rescan_required
-  when :toggle_pager_mode
-    $editor_mode = !$editor_mode
-    $default_command = if $editor_mode
-                         ENV['EDITOR'] # earlier nil # 2019-03-10 -
-                         # it was nil so we could set a default command
-                       else
-                         ENV['MANPAGER'] || ENV['PAGER']
-                       end
-    message "Default command is #{$default_command}"
-  when :toggle_enhanced_list
-    $enhanced_mode = !$enhanced_mode
-    message "Enhanced mode is #{$enhanced_mode}"
-    rescan_required
+  # menu would have called if symbol only responds so return.
+  return if respond_to?(menu_text, true) # already handled
 
-  when :toggle_long_list
-    $long_listing = !$long_listing
-    if $long_listing
-      $saved_gviscols = $gviscols
-      $gviscols = 1
-      $pagesize = $grows
-    else
-      $gviscols = $saved_gviscols || 3
-      x = $grows * $gviscols
-      $pagesize = $pagesize == x ? $grows : x
-    end
-    if $stact > 0
-      $sta = $stact
-      $stact = 0 # in case user was panned 2019-03-20 -
-    end
-    message "Long listing is #{$long_listing}, vis cols is #{$gviscols}"
-    rescan_required
-  when :toggle_debug_flag
-    @debug_flag = !@debug_flag
-    message "Debug flag is #{@debug_flag}"
-
-  when :toggle_truncate_from
-    # if filename exceeds width cut from which direction
-    @truncate_from = case @truncate_from
-                     when :center
-                       :left
-                     when :left
-                       :right
-                     when :right
-                       :center
+  # for visual and selection mode
+  # check if respond_to? symbol or toggle + symbol then call and return.
+  symb = "toggle_#{menu_text}".to_sym
+  @log.debug "trying #{symb}."
+  if respond_to?(symb, true)
+    @log.debug "calling #{symb}."
+    send(symb)
+    return
+  end
+
+  cset menu_text
+end
+
+def toggle_columns
+  @gviscols = if @gviscols == 1
+                3
+              else
+                1
+              end
+  x = @grows * @gviscols
+  @pagesize = @pagesize == x ? @grows : x
+  message "Visible columns now set to #{@gviscols}"
+  rescan_required
+
+end
+
+def toggle_editor_mode
+  toggle_value :editor_mode
+  @default_command = if @editor_mode
+                       ENV['EDITOR'] # earlier nil # 2019-03-10 -
+                       # it was nil so we could set a default command
                      else
-                       :center
+                       ENV['MANPAGER'] || ENV['PAGER']
                      end
-    message "Truncate long filenames from: #{@truncate_from}"
+  message "Default command is #{@default_command}"
+end
+
+def toggle_long_listing
+  toggle_value :long_listing
+  @long_listing = cget(:long_listing)
+  if @long_listing
+    @saved_gviscols = @gviscols
+    @gviscols = 1
+    @pagesize = @grows
+  else
+    @gviscols = @saved_gviscols || 3
+    x = @grows * @gviscols
+    @pagesize = @pagesize == x ? @grows : x
+  end
+  if @stact > 0
+    @sta = @stact
+    @stact = 0 # in case user was panned 2019-03-20 -
   end
+  message "Long listing is #{@long_listing}, visible columns is #{@gviscols}."
+  rescan_required
 end
 
+# ----------------- flag related functions -----------------------------------#
+# toggles the value of a toggle flag, also setting the variable if defined
+# WARN: be careful of variable being set directly. Replace such vars one by one.
+# NOTE: please use cset
+def toggle_value flag
+  @toggles[flag] = !@toggles[flag]
+  #  TODO: 2019-04-16 - can we set a variable so we don't have to check
+  #   against a hash everywhere. variable name can be in hash too
+  if instance_variable_defined? "@#{flag}"
+    instance_variable_set "@#{flag}", @toggles[flag]
+    @log.debug "instance_variable_set #{flag}, #{@toggles[flag]}"
+  end
+  message "#{flag} is set to #{@toggles[flag]}"
+end
+
+# rotates the value of an option that has multiple values
+# NOTE: please use cset
+def rotate_value symb
+  curr = cget(symb) # get current value
+  index = @options[symb][:values].index(curr) || 0
+  index += 1
+  index = 0 if index >= @options[symb][:values].count
+  x = @options[symb][:current] = @options[symb][:values][index]
+  var = @options[symb][:var]
+  instance_variable_set "@#{var}", x if var
+  message "#{symb} is set to #{@options[symb][:current]}. "
+end
+
+# get the value of a flag given the symbol.
+# NOTE: use this rather than access the hashes directly, since changes in structure
+#  may happen
+def cget symb
+  return @toggles[symb] if @toggles.key? symb
+  return @options[symb][:current] if @options.key? symb
+
+  @log.warn "CGET: #{symb} does not exist. Please check code."
+  raise ArgumentError, "CGET: #{symb} does not exist. Please check code."
+end
+
+# toggles or rotates the value of a flag
+def cset symb
+  if @toggles.key? symb
+    toggle_value symb
+    rescan_required
+    return true
+  end
+  if @options.key? symb
+    rotate_value symb
+    rescan_required
+    return true
+  end
+
+  @log.warn "CSET: #{symb} does not exist. Please check code."
+  raise ArgumentError, "CSET: #{symb} does not exist. Please check code."
+end
+# ----------------- end of flag related functions ----------------------------#
+
 def order_menu
   # zsh o = order, O = reverse order
   # ruby mtime/atime/ctime come reversed so we have to change o to O
@@ -1726,16 +1843,17 @@ def order_menu
     lo = ''
   end
   ## This needs to persist and be a part of all listings, put in change_dir.
-  $sorto = lo
+  @sorto = lo
   message "Sorted on #{menu_text}"
   rescan_required
 end
 
+# TODO: create a link
 def create_menu
   h = { f: :create_a_file,
         d: :create_a_dir,
-        b: :create_bookmark
-  }
+        s: :create_dir_with_selection,
+        b: :create_bookmark }
   _, menu_text = menu 'Create Menu', h
 end
 
@@ -1751,7 +1869,7 @@ def command_menu
   #
   h = { t: :today, D: :default_command, R: :remove_from_list,
         v: :view_selected_files }
-  h[:e] = if $editor_mode
+  h[:e] = if @editor_mode
             :pager_mode
           else
             :editor_mode
@@ -1759,11 +1877,11 @@ def command_menu
   _, menu_text = menu 'Command Menu', h
   case menu_text
   when :pager_mode
-    $editor_mode = false
-    $default_command = ENV['MANPAGER'] || ENV['PAGER']
+    @editor_mode = false
+    @default_command = ENV['MANPAGER'] || ENV['PAGER']
   when :editor_mode
-    $editor_mode = true
-    $default_command = nil
+    @editor_mode = true
+    @default_command = nil
   when :ffind
     ffind
   when :locate
@@ -1771,20 +1889,20 @@ def command_menu
   when :today
     # zshglob: M = MARK_DIRS with slash
     # zshglob: 'm0' 'm' = modified time, '0' = 0 days ago
-    $files = `zsh -c 'print -rl -- *(#{$hidden}Mm0)'`.split("\n")
-    $title = "Today's files"
+    @files = `zsh -c 'print -rl -- *(#{@hidden}Mm0)'`.split("\n")
+    @title = "Today's files"
   when :default_command
     puts ' This no longer works'
     puts 'Selecting a file usually invokes $EDITOR'
     puts 'What command do you want to use repeatedly on selected files: '
-    $default_command = gets.chomp
-    if $default_command != ''
+    @default_command = gets.chomp
+    if @default_command != ''
       print 'Second part of command (maybe blank): '
-      $default_command2 = gets.chomp
+      @default_command2 = gets.chomp
     else
       print 'Cleared default command, will default to $EDITOR'
-      $default_command2 = nil
-      $default_command = nil
+      @default_command2 = nil
+      @default_command = nil
     end
   end
   # redraw
@@ -1799,65 +1917,64 @@ def extras
         g: :generators,
         :B => :bindkey_ext_command,
         :r => :config_read,
-        :w => :config_write
-  }
+        :w => :config_write }
   key, menu_text = menu 'Extras Menu', h
   case menu_text
   when :one_column
-    $pagesize = $grows
+    @pagesize = @grows
   when :multi_column
-    # $pagesize = 60
-    $pagesize = $grows * $gviscols
+    # @pagesize = 60
+    @pagesize = @grows * @gviscols
   when :columns
-    print "How many columns to show: 1-6 [current #{$gviscols}]? "
+    print "How many columns to show: 1-6 [current #{@gviscols}]? "
     key = get_char
     key = key.to_i
     if key > 0 && key < 7
-      $gviscols = key.to_i
-      $pagesize = $grows * $gviscols
+      @gviscols = key.to_i
+      @pagesize = @grows * @gviscols
     end
   end
 end
 
 def filter_menu
   h = { :d => :dirs, :f => :files, :e => :emptydirs, '0' => :emptyfiles,
-  :r => :reduce_list, :x => :extension}
+        :r => :reduce_list, :x => :extension }
   _, menu_text = menu 'Filter Menu', h
   files = nil
   case menu_text
   when :dirs
-    $filterstr = '/M'
+    @filterstr = '/M'
     # zsh /M MARK_DIRS appends trailing '/' to directories
-    files = `zsh -c 'print -rl -- *(#{$sorto}/M)'`.split("\n")
-    $title = 'Filter: directories only'
+    files = `zsh -c 'print -rl -- *(#{@sorto}/M)'`.split("\n")
+    @title = 'Filter: directories only'
   when :files
-    $filterstr = '.'
+    @filterstr = '.'
     # zsh '.' for files, '/' for dirs
-    files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}.)'`.split("\n")
-    $title = 'Filter: files only'
+    files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}.)'`.split("\n")
+    @title = 'Filter: files only'
   when :emptydirs
-    $filterstr = '/D^F'
+    @filterstr = '/D^F'
     # zsh F = full dirs, ^F empty dirs
-    files = `zsh -c 'print -rl -- *(#{$sorto}/D^F)'`.split("\n")
-    $title = 'Filter: empty directories'
+    files = `zsh -c 'print -rl -- *(#{@sorto}/D^F)'`.split("\n")
+    @title = 'Filter: empty directories'
   when :emptyfiles
-    $filterstr = '.L0'
+    @filterstr = '.L0'
     # zsh .L size in bytes
-    files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}.L0)'`.split("\n")
-    $title = 'Filter: empty files'
+    files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}.L0)'`.split("\n")
+    @title = 'Filter: empty files'
   when :reduce_list
     files = reduce
   when :extension
     files = filter_for_current_extension
   end
   if files && files.count > 0
-    $files = files
-    $stact = 0
-    $message = "Filtered on #{menu_text}. Press ESC to return."
+    @files = files
+    @stact = 0
+    @message = "Filtered on #{menu_text}. Press ESC to return."
     # redraw
   else
     perror 'Sorry, No files. '
-    $title = nil
+    @title = nil
   end
 end
 
@@ -1866,47 +1983,47 @@ def reduce pattern=nil
     last_line 'Enter a pattern to reduce current list: '
     pattern = gets.chomp
   end
-  $title = "Filter: pattern #{pattern}"
-  $files = $files.select { |f| f.match(pattern) }
+  @title = "Filter: pattern #{pattern}"
+  @files = @files.select { |f| f.match(pattern) }
 end
 
 def filter_for_current_extension
   extn = File.extname(current_file)
   return unless extn
 
-  $files = $files.select { |f| !File.directory?(f) && extn == File.extname(f) }
+  @files = @files.select { |f| !File.directory?(f) && extn == File.extname(f) }
 end
 
 def select_from_used_dirs
-  $title = 'Used Directories'
+  @title = 'Used Directories'
   home = File.expand_path '~'
-  $files = $used_dirs.uniq.map { |path| path.sub("#{home}", '~') }
+  @files = @used_dirs.uniq.map { |path| path.sub(home.to_s, '~') }
   # redraw
 end
 
 def select_from_visited_files
   # not yet a unique list, needs to be unique and have latest pushed to top
-  $title = 'Visited Files'
+  @title = 'Visited Files'
   home = File.expand_path '~'
-  $files = $visited_files.uniq.map { |path| path.sub("#{home}", '~') }
+  @files = @visited_files.uniq.map { |path| path.sub(home.to_s, '~') }
   # redraw
 end
 
 # maybe unused ??? XXX
 def select_bookmarks
-  $title = 'Bookmarks'
-  $files = $bookmarks.values
+  @title = 'Bookmarks'
+  @files = @bookmarks.values
 end
 
 ## part copied and changed from change_dir since we don't dir going back on top
 #  or we'll be stuck in a cycle
 def pop_dir
   # the first time we pop, we need to put the current on stack
-  $visited_dirs.push Dir.pwd unless $visited_dirs.index(Dir.pwd)
+  @visited_dirs.push Dir.pwd unless @visited_dirs.index(Dir.pwd)
   ## XXX make sure thre is something to pop
-  d = $visited_dirs.delete_at 0
+  d = @visited_dirs.delete_at 0
   ## XXX make sure the dir exists, cuold have been deleted. can be an error or crash otherwise
-  $visited_dirs.push d
+  @visited_dirs.push d
   Dir.chdir d
   post_cd
   rescan_required
@@ -1914,10 +2031,10 @@ end
 
 # after changing directory
 def post_cd
-  $title = $patt = $message = nil
-  $sta = $cursor = $stact = 0
-  $visual_block_start = nil
-  $current_dir = Dir.pwd
+  @title = @patt = @message = nil
+  @sta = @cursor = @stact = 0
+  @visual_block_start = nil
+  @current_dir = Dir.pwd
   screen_settings
 
   # goto last position cursor was in this dir
@@ -1930,10 +2047,10 @@ def config_read
   return unless File.readable? f
 
   hash = loadYML(f)
-  $used_dirs = hash['DIRS']
-  $visited_files = hash['FILES']
-  $bookmarks = hash['BOOKMARKS']
-  $used_dirs.concat get_env_paths
+  @used_dirs = hash['DIRS']
+  @visited_files = hash['FILES']
+  @bookmarks = hash['BOOKMARKS']
+  @used_dirs.concat get_env_paths
 end
 
 def get_env_paths
@@ -1955,44 +2072,40 @@ def config_write
   # Putting it in a format that zfm can also read and write
   f1 = File.expand_path(CONFIG_FILE)
   hash = {}
-  hash['DIRS'] = $used_dirs.select {|dir| File.exist? dir}
-  hash['FILES'] = $visited_files.select {|file| File.exist? file}
+  hash['DIRS'] = @used_dirs.select { |dir| File.exist? dir }
+  hash['FILES'] = @visited_files.select { |file| File.exist? file }
   # NOTE bookmarks is a hash and contains FILE:cursor_pos
-  hash['BOOKMARKS'] = $bookmarks #.select {|file| File.exist? file}
+  hash['BOOKMARKS'] = @bookmarks # .select {|file| File.exist? file}
   writeYML hash, f1
-  $writing = $modified = false
+  @writing = @modified = false
   message "Saved #{f1}"
 end
 
 # {{{ YML
 require 'yaml'
-def loadYML( filename)
-  hash = YAML::load( File.open( filename ) )
-  if $opt_debug
-    $stderr.puts hash.keys.size
-  end
+def loadYML filename
+  hash = YAML.safe_load(File.open(filename))
+  warn hash.keys.size if @opt_debug
   return hash
 end
+
 def writeYML obj, filename
-  File.open(filename, 'w') {|f| f.write obj.to_yaml }
-  if $opt_debug
-    $stderr.puts "Written to file #{filename}"
-  end
+  File.open(filename, 'w') { |f| f.write obj.to_yaml }
+  warn "Written to file #{filename}" if @opt_debug
 end
 # }}}
 
 ## accept a character to save this dir as a bookmark
 def create_bookmark
-
   clear_last_line
   print 'Enter A-Z, a-z or 0-9 to create a bookmark: '
   # print "\e[?25h" # unhide cursor
   key = get_char
   # print "\e[?25l" # hide cursor
-  if key =~ /^[0-9A-Za-z]$/
-    # $bookmarks[key] = "#{Dir.pwd}:#{$cursor}"
+  if /^[0-9A-Za-z]$/.match?(key)
+    # @bookmarks[key] = "#{Dir.pwd}:#{@cursor}"
     set_bookmark key
-    $modified = true
+    @modified = true
     message "Created bookmark #{key} for #{File.basename(Dir.pwd)}."
   else
     perror 'Bookmark must be alpha character or number.'
@@ -2014,35 +2127,35 @@ def subcommand
   end
   if command == 'q'
     # FIXME: 2019-03-22 - should this not call quit_command ?
-    if $modified
+    if @modified
       last_line
       print 'Do you want to save bookmarks? (y/n): '
       key = get_char
       if key == 'y'
-        $writing = true
-        $quitting = true
+        @writing = true
+        @quitting = true
       elsif key == 'n'
-        $quitting = true
+        @quitting = true
         print 'Quitting without saving bookmarks'
       else
         perror 'No action taken.'
       end
     else
-      $quitting = true
+      @quitting = true
     end
   elsif command == 'wq'
-    $quitting = true
-    $writing = true
+    @quitting = true
+    @writing = true
   elsif command == 'w'
     config_write
   elsif command == 'x'
-    $quitting = true
-    $writing = true if $modified
+    @quitting = true
+    @writing = true if @modified
   elsif command == 'e'
     edit_current
   elsif command == 'o'
     open_current
-  elsif command == 'h' or command == 'help' or command == '?'
+  elsif (command == 'h') || (command == 'help') || (command == '?')
     print_help
   elsif command == 'p'
     system 'echo $PWD | pbcopy'
@@ -2054,41 +2167,41 @@ def subcommand
 end
 
 def quit_command
-  if $modified
+  if @modified
     last_line
-    puts 'Press y to save bookmarks before quitting ' if $modified
+    puts 'Press y to save bookmarks before quitting ' if @modified
     print 'Press n to quit without saving'
     key = get_char
   else
-    $quitting = true
+    @quitting = true
   end
-  $quitting = true if key == 'n'
-  $quitting = $writing = true if key == 'y'
+  @quitting = true if key == 'n'
+  @quitting = @writing = true if key == 'y'
 end
 
 def views
   views = %w[/ om oa Om OL oL On on]
   viewlabels = %w[Dirs Newest Accessed Oldest Largest Smallest Reverse Name]
-  $sorto = views[$viewctr]
-  $title = viewlabels[$viewctr]
-  $viewctr += 1
-  $viewctr = 0 if $viewctr > views.size
+  @sorto = views[@viewctr]
+  @title = viewlabels[@viewctr]
+  @viewctr += 1
+  @viewctr = 0 if @viewctr > views.size
 
-  $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}M)'`.split("\n")
+  @files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}M)'`.split("\n")
   # redraw
 end
 
 def child_dirs
-  $title = 'Directories in current directory'
+  @title = 'Directories in current directory'
   # M is MARK_DIRS option for putting trailing slash after dir
-  # $files = `zsh -c 'print -rl -- *(/#{$sorto}#{$hidden}M)'`.split("\n")
-  $files = dirs
-  message "#{$files.size} directories."
+  # @files = `zsh -c 'print -rl -- *(/#{@sorto}#{@hidden}M)'`.split("\n")
+  @files = dirs
+  message "#{@files.size} directories."
   # redraw
 end
 
 def dirs dir='*'
-  files = Dir.glob(dir, File::FNM_DOTMATCH).select {|f| File.directory?(f)} - %w[ . ..]
+  files = Dir.glob(dir, File::FNM_DOTMATCH).select { |f| File.directory?(f) } - %w[. ..]
   files = add_slash files
   files
 end
@@ -2100,12 +2213,11 @@ def add_slash files
 end
 
 def dirtree
-  $title = 'Child directories recursive'
+  @title = 'Child directories recursive'
   # zsh **/ is recursive
-  files1 = `zsh -c 'print -rl -- **/*(/#{$sorto}#{$hidden}M)'`.split("\n")
-  $files = Dir['**/']
-  @log.debug "zsh #{files1} != rb #{$files}" if files1 != $files
-  message "#{$files.size} files."
+  # files1 = `zsh -c 'print -rl -- **/*(/#{@sorto}#{@hidden}M)'`.split("\n")
+  @files = Dir['**/']
+  message "#{@files.size} files."
   # redraw
 end
 
@@ -2114,10 +2226,10 @@ end
 # structure than files.
 def tree
   # Caution: use only for small projects, don't use in root.
-  $title = 'Full Tree'
-  # $files = `zsh -c 'print -rl -- **/*(#{$sorto}#{$hidden}M)'`.split("\n")
-  $files = Dir['**/*']
-  message "#{$files.size} files."
+  @title = 'Full Tree'
+  # @files = `zsh -c 'print -rl -- **/*(#{@sorto}#{@hidden}M)'`.split("\n")
+  @files = Dir['**/*']
+  message "#{@files.size} files."
   # redraw
 end
 
@@ -2125,25 +2237,26 @@ end
 # In some cases it shows mostly .git files, we need to prune those
 def recent_files
   # print -rl -- **/*(Dom[1,10])
-  $title = 'Recent files'
+  @title = 'Recent files'
   # zsh D DOT_GLOB, show dot files
   # zsh om order on modification time
-  $files = `zsh -c 'print -rl -- **/*(Dom[1,15])'`.split("\n").reject {|f| f[0] == '.'}
+  @files = `zsh -c 'print -rl -- **/*(Dom[1,15])'`.split("\n").reject { |f| f[0] == '.' }
   # redraw
 end
 
 def select_current
-  ## vp is local there, so i can do $vp[0]
-  # open_file $view[$sta] if $view[$sta]
-  open_file $view[$cursor] if $view[$cursor]
+  ## vp is local there, so i can do @vp[0]
+  # open_file @view[@sta] if @view[@sta]
+  open_file @view[@cursor] if @view[@cursor]
 end
 
 ## create a list of dirs in which some action has happened, for saving
-def push_used_dirs(d = Dir.pwd)
-  # $used_dirs.index(d) || $used_dirs.push(d)
-  return if $used_dirs[0] == d
-  $used_dirs.delete(d) if $used_dirs.index(d)
-  $used_dirs.insert(0, d)
+def push_used_dirs d=Dir.pwd
+  # @used_dirs.index(d) || @used_dirs.push(d)
+  return if @used_dirs[0] == d
+
+  @used_dirs.delete(d) if @used_dirs.index(d)
+  @used_dirs.insert(0, d)
 end
 
 def pbold text
@@ -2167,22 +2280,21 @@ end
 ## return shortcut/hint for an index (offset in file array)
 # ix is the index of a file in the complete array (view)
 def get_shortcut index
-
   # Case where user has panned to the right columns:
   # Earlier, we showed '<' in left columns, if user has panned right.
   # Now we show unused shortcuts after exhausting them.
-  # return '<' if index < $stact
-  if index < $stact
-    index = $viewport.size - $stact + index
-    i = $IDX[index]
+  # return '<' if index < @stact
+  if index < @stact
+    index = @viewport.size - @stact + index
+    i = IDX[index]
     return i if i
 
     return '['
   end
 
   # Normal case (user has not panned columns)
-  index -= $stact
-  i = $IDX[index]
+  index -= @stact
+  i = IDX[index]
   return i if i
 
   '->'
@@ -2192,7 +2304,7 @@ end
 # Called when user types a key
 #  should we even ask for a second key if there are not enough rows
 #  What if we want to also trap z with numbers for other purposes
-def get_index(key, vsz = 999)
+def get_index key, vsz=999
   # @log.debug "Etners get_index with #{key}"
   i = convert_key_to_index key
   return i if i
@@ -2206,8 +2318,8 @@ def get_index(key, vsz = 999)
       i = convert_key_to_index("#{key}#{zch}")
       # @log.debug "convert returned #{i} for #{key}#{zch}"
       return i if i
-      # i = $IDX.index
-      # return i + $stact if i
+      # i = IDX.index
+      # return i + @stact if i
     end
   end
   nil
@@ -2217,72 +2329,272 @@ end
 # Earlier this was simple, but now that we put hints/shortcuts
 #  in rows on the left after panning, we need to account for cycled hints.
 def convert_key_to_index key
-  i = $IDX.index(key)
-  if i
-    # @log.debug "get_index with #{key}: #{i}. #{$stact}. #{$viewport.size}"
-    vps = $viewport.size
-    # TODO: if very high key given, consider going to last file ?
-    #  that way one can press zz or ZZ to go to last file.
-    # 2019-04-11 - XXX actually this doesnt place the cursor on last file
-    #  it opens it, which may not be what we want
-    retnil = nil # vps - 1 # nil
-    return retnil if $stact == 0 && i + $stact >= vps
-    # return nil if $stact > 0 && i + $stact >= vps && i + $stact - vps >= $stact
-    return retnil if $stact > 0 && i + $stact >= vps && i - vps >= 0
-
-    if i + $stact >= vps
-      # panning case, hints are recycled
-      return (i + $stact) - vps
+  i = IDX.index(key)
+  return nil unless i
+
+  # @log.debug "get_index with #{key}: #{i}. #{@stact}. #{@viewport.size}"
+  vps = @viewport.size
+  # TODO: if very high key given, consider going to last file ?
+  #  that way one can press zz or ZZ to go to last file.
+  # 2019-04-11 - XXX actually this doesnt place the cursor on last file
+  #  it opens it, which may not be what we want
+  retnil = nil # vps - 1 # nil
+  # user has entered a key that is outside of range, return nil
+  return retnil if @stact == 0 && i + @stact >= vps
+
+  # again, key out of range
+  # return nil if @stact > 0 && i + @stact >= vps && i + @stact - vps >= @stact
+  return retnil if @stact > 0 && i + @stact >= vps && i - vps >= 0
+
+  # panning case, hints are recycled
+  return (i + @stact) - vps if i + @stact >= vps
+
+  # regular hint
+  return i + @stact # if i
+
+end
+
+def delete_file
+  # file_actions :delete
+  rbfiles = current_or_selected_files
+  return if rbfiles.nil? || rbfiles.empty?
+
+  count = rbfiles.count
+  first = rbfiles.first
+  text = count == 1 ? File.basename(first) : "#{count} files"
+  shfiles = Shellwords.join(rbfiles)
+
+  delcommand = 'rmtrash'
+  clear_last_line
+  print "#{delcommand} #{text[0..40]} ? [yn?]: "
+  key = get_char
+  view_selected_files if key == '?'
+  return if key != 'y'
+
+  clear_last_line
+  print "\r deleting ..."
+  system "#{delcommand} #{shfiles}"
+  @log.info "trashed #{shfiles}."
+  message "Deleted #{text[0..40]}."
+  refresh
+end
+
+def move_file
+  rbfiles = current_or_selected_files
+  return if rbfiles.nil? || rbfiles.empty?
+
+  count = rbfiles.count
+  first = rbfiles.first
+  text = count == 1 ? File.basename(first) : "#{count} files"
+
+  # multiple files can only be moved to a directory
+  default = @move_target.nil? ? '.' : @move_target
+  target = readline "Move #{text[0..40]} to (#{default}): "
+  return unless target
+
+  target = default if target == ''
+  target = File.expand_path(target)
+  return if target == ''
+
+  if count > 1 && !File.directory?(target)
+    perror 'Move target must be a directory for multiple files.'
+    return
+  end
+
+  if count == 1 && !File.directory?(target) && File.exist?(target)
+    perror "Target #{target} exists."
+    return
+  end
+
+  begin
+    FileUtils.mv rbfiles, target
+    message "Moved #{text} to #{target}."
+  rescue StandardError => exc
+    @log.warn "move_file: #{exc}."
+    @log.warn "MOVE: files: #{rbfiles}, target:#{target}"
+    perror exc.to_s
+  end
+  refresh
+end
+
+def copy_file
+  rbfiles = current_or_selected_files
+  return if rbfiles.nil? || rbfiles.empty?
+
+  count = rbfiles.count
+  first = rbfiles.first
+  text = "#{count} files"
+
+  # Target must be directory for multiple files.
+  # NOTE: target should not be same as source dir but there can be files
+  #  from multiple directories
+  if count == 1
+    if File.exist? File.basename(first)
+      default = get_unique_file_name File.basename(first)
+      Readline::HISTORY.push default
     else
-      # regular hint
-      return i + $stact #if i
+      default = '.'
     end
+    # default : if file exists here, then add suffix
+    # if no file here, then directory is default.
+  else
+    default = if File.exist? File.basename(first)
+                ''
+              else
+                '.'
+              end
+    # current directory is default if first file does not exist
+    # if first file exists here, then no default
+  end
+  target = readline "Copy to (#{default}): "
+  return unless target # C-c
+
+  target = default if target == ''
+  target = File.expand_path(target)
+  return if target == ''
+
+  if count > 1 && !File.directory?(target)
+    perror 'Copy target must be a directory for multiple files.'
+    return
   end
-  nil
+
+  if count == 1 && !File.directory?(target) && File.exist?(target)
+    perror "Target #{target} exists."
+    return
+  end
+
+  # if rbfiles is array, then dest must be a directory.
+  rbfiles = rbfiles.first if rbfiles.count == 1
+
+  begin
+    FileUtils.cp rbfiles, target
+    message "Copied #{text} to #{target}."
+  rescue StandardError => exc
+    @log.warn exc.to_s
+    @log.warn "Target: #{target}, files:#{rbfiles}"
+    perror exc.to_s
+  end
+  refresh
 end
 
-def delete_file
-  file_actions :delete
+# generate a unique filename by adding a zero padded number prior to the extension.
+# This is used only during copy operation.
+def get_unique_file_name fname
+  100.times do |i|
+    suffix = "%03d" % i
+    extn = File.extname(fname)
+    base = File.basename(fname, extn)
+    # f = fname + '.' + suffix
+    f = base + suffix + extn
+    return f unless File.exist?(f)
+  end
+
+  timestamp = Time.now.strftime("%Y%m%d-%H%M%S")
+  return fname + '.' + timestamp
 end
 
-def move_instant
-  # FIXME: cannot be in target directory and do auto update
+def rename_file
+  rbfiles = current_or_selected_files
+  return if rbfiles.nil? || rbfiles.empty?
 
-  if $selected_files.empty?
-    target = readline "Enter target directory for moving files (#{@move_target}):"
-    return unless target
-    return if target == '' && @move_target.nil?
+  count = rbfiles.count
+  first = rbfiles.first
+  text = count == 1 ? File.basename(first) : "#{count} files"
 
-    # take default value if user presses Enter
-    target = @move_target if target == ''
-    return unless target
+  if count > 1
+    perror 'Select only one file for rename.'
+    return
+  end
 
-    # current dir if dot pressed FIXME you cannot move to current dir !!!
+  Readline::HISTORY.push File.basename(first)
+  target = readline "Rename #{text[0..40]} to : "
+  return if target == '' || target == '.' || target == '..'
+
+  if File.exist? target
+    perror "Target (#{target}) exists."
+    return
+  end
+
+  begin
+    FileUtils.mv first, target
+    message "Renamed to #{target}."
+    @log.info "Renamed #{first} to #{target}."
+  rescue StandardError => exc
+    @log.warn exc.to_s
+    @log.warn "RENAME: files: #{first}, target:#{target}"
+    pause exc.to_s
+  end
+  refresh
+end
+
+# remove spaces and brackets from file name
+# replace space with underscore, removes square and round brackets
+def remove_spaces_from_name
+  execute_script 'remove_brackets'
+end
+
+def zip_file
+  rbfiles = current_or_selected_files
+  return if rbfiles.nil? || rbfiles.empty?
+
+  # count = rbfiles.count
+  # first = rbfiles.first
+  # text = count == 1 ? File.basename(first) : "#{count} files"
+
+  extn = '.tgz'
+  default = "archive#{extn}"
+  Readline::HISTORY.push default # check for exist before pushing
+  target = readline "Archive name (#{default}): "
+  return unless target
+  return if target == ''
+
+  if target && target.size < 4
+    perror 'Use target of more than 4 characters.'
+    return
+  end
+  target += extn if File.extname(target) == ''
+
+  if File.exist? target
+    perror "Target (#{target}) exists."
+    return
+  end
+
+  # convert absolute paths to relative ones in this zip
+  # the problem with zip is that we have full paths
+  # so the zip file has full paths and extraction sucks
+  require 'pathname'
+  base = Pathname.new Dir.pwd
+  relfiles = rbfiles.map { |f| p = Pathname.new(f); p.relative_path_from(base) }
+  zfiles = Shellwords.join relfiles
+
+  system "tar zcvf #{target} #{zfiles}"
+  message "Created #{target} with #{relfiles.count} files."
+  setup_terminal
+  refresh
+end
+
+# instantly move to move target. Use during bulk operations so you don't have to
+# enter or goto target dir and come back.
+def move_instant
+  # FIXME: cannot be in target directory and do auto update
+  # should we have a key for specifying move_target ?
+
+  # for the mo, lets not move if nothing selected
+  if @selected_files.empty?
+    target = readline "Set Move target #{@move_target}:"
     target = Dir.pwd if target == '.'
     target = File.expand_path(target)
-    unless File.directory? target
-      perror "#{target} not a directory."
-      return
-    end
-    begin
-      f = current_file
-      FileUtils.mv f, target
-      @move_target = target
-      message "#{f} moved to #{File.basename(target)}. Target set."
-      @log.info "1.#{f} moved to #{target}."
-    rescue StandardError => exc
-      @log.warn "Case 1:"
-      @log.warn "Target is #{target}, file was #{f}"
-      @log.warn exc.to_s
-    end
-    refresh
+    @move_target = target
+    message "Move target is #{@move_target}. Select files and press this key."
     return
   end
 
   # files selected. Use earlier target if there, else ask
+  # XXX how do we change it once set
   target = @move_target
   if target.nil? || target == ''
-    target = readline "Enter directory for moving files #{@move_target}:"
+    count = @selected_files.count
+    target = readline "Move #{count} files to :"
     return unless target
   end
   target = File.expand_path(target)
@@ -2291,15 +2603,14 @@ def move_instant
     return
   end
 
-  files = $selected_files
-  # todo: shellwords
+  files = @selected_files
   ccount = 0
   files.each do |f|
     FileUtils.mv f, target
     @log.info "2.#{f} moved to #{target}."
     ccount += 1
   rescue StandardError => exc
-    @log.warn "Case 2:"
+    @log.warn 'Case 2:'
     @log.warn "Target is #{target}, file was #{f}"
     @log.warn exc.to_s
     perror exc.to_s
@@ -2314,11 +2625,12 @@ end
 #  prompt is the user friendly text of command such as list for ls, or extract for dtrx, page for less
 #  pauseyn is whether to pause after command as in file or ls
 #
-def command_file(prompt, *command)
+def command_file prompt, *command
   pauseyn = command.shift
   command = command.join ' '
-  print "[#{prompt}] Choose a file [#{$view[$cursor]}]: "
-  file = ask_hint $view[$cursor]
+  clear_last_line
+  print "[#{prompt}] Choose a file [#{@view[@cursor]}]: "
+  file = ask_hint @view[@cursor]
   # print "#{prompt} :: Enter file shortcut: "
   # file = ask_hint
   perror 'Command Cancelled' unless file
@@ -2344,8 +2656,8 @@ def ask_hint deflt=nil
   key = get_char
   return deflt if key == 'ENTER'
 
-  ix = get_index(key, $viewport.size)
-  f = $viewport[ix] if ix
+  ix = get_index(key, @viewport.size)
+  f = @viewport[ix] if ix
   f
 end
 
@@ -2353,13 +2665,13 @@ end
 # NOTE: tput is ncurses dependent, so use stty
 #
 def screen_settings
-  $glines, $gcols = `stty size`.split.map{|e| e.to_i}
-  # $glines = `tput lines`.to_i
-  # $gcols = `tput cols`.to_i
-  $grows = $glines - 3
-  # $pagesize = 60
-  # $gviscols = 3
-  $pagesize = $grows * $gviscols
+  @glines, @gcols = `stty size`.split.map(&:to_i)
+  # @glines = `tput lines`.to_i
+  # @gcols = `tput cols`.to_i
+  @grows = @glines - 3
+  # @pagesize = 60
+  # @gviscols = 3
+  @pagesize = @grows * @gviscols
 end
 
 ## Tabs to next column in multi-column displays.
@@ -2371,24 +2683,24 @@ def column_next direction=0
   # right movement or panning cycles back to first column
   # leftward movement stops at first column.
   if direction == 0
-    $stact += $grows
-    $stact = 0 if $stact >= $viewport.size
-    $cursor += $grows
+    @stact += @grows
+    @stact = 0 if @stact >= @viewport.size
+    @cursor += @grows
     # 2019-03-18 - zero loses offset. we need to maintain it
-    # $cursor = 0 if $cursor >= $viewport.size
-    if $cursor - $sta >= $viewport.size
-      $cursor -= $grows while $cursor > $sta
-      $stact -= $grows while $stact > 0
-      $cursor += $grows if $cursor < $sta
-      $stact  += $grows if $stact < 0
+    # @cursor = 0 if @cursor >= @viewport.size
+    if @cursor - @sta >= @viewport.size
+      @cursor -= @grows while @cursor > @sta
+      @stact -= @grows while @stact > 0
+      @cursor += @grows if @cursor < @sta
+      @stact  += @grows if @stact < 0
     end
   else
-    $stact -= $grows
-    $cursor -= $grows
-    $stact = 0 if $stact < 0
+    @stact -= @grows
+    @cursor -= @grows
+    @stact = 0 if @stact < 0
     # setting cursor as zero loses the position or offset
     # We are trying to maintain offset
-    $cursor += $grows if $cursor < 0
+    @cursor += @grows if @cursor < 0
   end
   # redraw
 end
@@ -2397,10 +2709,11 @@ end
 # I should be able to pass in new actions that are external commands
 # 2019-03-08 - TODO when a file name changes or moves it must be removed
 #  from selection
-def file_actions(action = nil)
+def file_actions action=nil
   h = { d: :delete, D: '/bin/rm', m: :move, v: ENV['EDITOR'] || :vim,
         c: :copy, e: :execute,
-        l: :less, p: :most, o: :open }
+        l: :less, p: :most,
+        o: :open_current }
 
   rbfiles = current_or_selected_files # use with ruby FileUtils
   return if rbfiles.nil? || rbfiles.empty?
@@ -2448,7 +2761,7 @@ def file_actions(action = nil)
   if action
     menu_text = action
   else
-    key, menu_text = menu "File Menu for #{text}", h
+    key, menu_text = menu "File Menu for #{text[0..@gcols-20]}", h
     menu_text = :quit if key == 'q'
   end
   return unless menu_text # pressed some wrong key
@@ -2456,150 +2769,32 @@ def file_actions(action = nil)
   case menu_text.to_sym
 
   when :quit
-
+    1
   when :delete
-    delcommand = 'rmtrash'
-    clear_last_line
-    print "#{delcommand} #{text} ? [yn?]: "
-    key = get_char
-    view_selected_files if key == '?'
-    return if key != 'y'
-
-    clear_last_line
-    print "\r deleting ..."
-    system "#{delcommand} #{shfiles}"
-    message "Deleted #{text}."
-    refresh
+    delete_file
 
   when :move
-    # multiple files can only be moved to a directory
-    default = @move_target.nil? ? '.' : @move_target
-    target = readline "Move #{text} to (#{default}): "
-    return unless target
-
-    target = default if target == ''
-    target = File.expand_path(target)
-    return if target == ''
-
-    if count > 1 && !File.directory?(target)
-      perror 'Move target must be a directory for multiple files.'
-      return
-    end
-
-    if count == 1 && !File.directory?(target) && File.exist?(target)
-      perror "Target #{target} exists."
-      return
-    end
-
-    begin
-      FileUtils.mv rbfiles, target
-      message "Moved #{text} to #{target}."
-    rescue StandardError => exc
-      @log.warn "C-x move: #{exc.to_s}."
-      @log.warn "MOVE: files: #{rbfiles}, target:#{target}"
-      perror exc.to_s
-    end
-    # 2019-03-08 - TODO if success remove from selection
-    refresh
+    move_file
 
   when :copy
-    # Target must be directory for multiple files.
-    # NOTE: target should not be same as source dir but there can be files
-    #  from multiple directories
-    default = @move_target.nil? ? '.' : @move_target
-    target = readline "Copy #{text} to (#{default}): "
-    return unless target # C-c
-
-    target = default if target == ''
-    target = File.expand_path(target)
-    return if target == ''
-
-    if count > 1 && !File.directory?(target)
-      perror 'Copy target must be a directory for multiple files.'
-      return
-    end
+    copy_file
 
-    if count == 1 && !File.directory?(target) && File.exist?(target)
-      perror "Target #{target} exists."
-      return
-    end
+  when :zip
+    zip_file
 
-    begin
-      FileUtils.cp rbfiles, target
-      message "Copied #{text} to #{target}."
-    rescue StandardError => exc
-      perror exc.to_s
-    end
-    refresh
+  when :rename
+    rename_file
 
   when :chdir
     # will only work if one selected. Check this out
     # This works if you have searched for files and got a list
     #  with different paths.
     #  This should not be shown in regular listings XXX
-    if count == 1
-      change_dir File.dirname(File.expand_path(rbfiles.first))
-    end
+    change_dir File.dirname(File.expand_path(rbfiles.first)) if count == 1
 
   when :set_move_target
     set_move_target current_file
 
-  when :zip
-
-    target = readline 'Archive name: '
-    return unless target
-    return if target == ''
-
-    if File.exist? target
-      perror "Target (#{target}) exists"
-      return
-    end
-    if target && target.size < 4
-      perror 'Use target of more than 4 characters.'
-      return
-    end
-
-    # convert absolute paths to relative ones in this zip
-    require 'pathname'
-    base = Pathname.new Dir.pwd
-    relfiles = rbfiles.map {|f| p = Pathname.new(f); p.relative_path_from(base) }
-    zfiles = Shellwords.join relfiles
-
-    # the problem with zip is that we have full paths
-    # so the zip file has full paths and extraction sucks
-
-    # pause "(#{target}).zipping #{relfiles.count}: #{zfiles}"
-    system "tar zcvf #{target} #{zfiles}"
-    message "Created #{target} with #{relfiles.count} files."
-    setup_terminal
-    refresh
-
-  when :rename
-    if count > 1
-      perror 'Select only one file for rename.'
-      return
-    end
-
-    target = readline "Rename #{text} to : "
-    return if target == '' || target == '.' || target == '..'
-
-    # file = File.expand_path(files)
-    # target = File.basename(file) if target == '.'
-    if File.exist? target
-      perror "Target (#{target}) exists."
-      return
-    end
-
-    begin
-      FileUtils.mv first, target
-      message "Renamed #{first} to #{target}."
-    rescue StandardError => exc
-      @log.warn exc.to_s
-      @log.warn "RENAME: files: #{first}, target:#{target}"
-      pause exc.to_s
-    end
-    refresh
-
   when :most, :less, :vim
 
     system "#{menu_text} #{shfiles}"
@@ -2607,32 +2802,7 @@ def file_actions(action = nil)
     # should we remove from selection ?
 
   when :remspace
-    # replace space with underscore in filename
-    # Issue. in many cases directory may have spaces,
-    #  so we are using basename only. So use in one directory.
-    #  TODO: move to script
-    clear_last_line
-    pause "Remove spaces from #{text}."
-
-    ccount = 0
-    rbfiles.each do |name|
-      f = File.basename(name)
-      next unless File.exist?(f)
-      next unless f.index ' '
-
-      target = f.tr(' ', '_')
-      next if File.exist? target
-
-      begin
-        FileUtils.mv f, target
-        ccount += 1
-      rescue StandardError => exc
-        @log.warn "REMSPACE: #{exc.to_s}"
-        perror exc.to_s
-      end
-    end
-    message "Renamed #{ccount} files."
-    refresh
+    remove_spaces_from_name
 
   when :execute
     execute
@@ -2649,6 +2819,7 @@ def file_actions(action = nil)
     system "#{menu_text} #{shfiles}"
     pause # putting this back 2019-04-13 - file doesn't show anything
     message "Ran #{menu_text}."
+    @log.info "#{menu_text} #{shfiles}"
     setup_terminal
     refresh
   end
@@ -2656,13 +2827,13 @@ def file_actions(action = nil)
   return if count == 0
 
   clean_selected_files
-
+  visual_block_clear # 2019-04-15 - get out of mode after operation over.
 end
 
 # remove non-existent files from select list due to move or delete
 #  or rename or whatever
 def clean_selected_files
-  $selected_files.select! { |x| x = File.expand_path(x); File.exist?(x) }
+  @selected_files.select! { |x| x = File.expand_path(x); File.exist?(x) }
 end
 
 # set the default target for further moves
@@ -2675,13 +2846,12 @@ def set_move_target cf=current_file
   message "Move target set to #{cf}."
 end
 
-
 # increase or decrease column
-def columns_incdec(howmany)
-  $gviscols += howmany.to_i
-  $gviscols = 1 if $gviscols < 1
-  $gviscols = 6 if $gviscols > 6
-  $pagesize = $grows * $gviscols
+def columns_incdec howmany
+  @gviscols += howmany.to_i
+  @gviscols = 1 if @gviscols < 1
+  @gviscols = 6 if @gviscols > 6
+  @pagesize = @grows * @gviscols
 end
 
 # bind a key to an external command wich can be then be used for files
@@ -2692,7 +2862,7 @@ def bindkey_ext_command
   key = get_char
   return if key == 'Q'
 
-  if key =~ /^[A-Z]$/
+  if /^[A-Z]$/.match?(key)
     print "Enter an external command to bind to #{key}: "
     com = gets.chomp
     if com != ''
@@ -2702,7 +2872,7 @@ def bindkey_ext_command
     end
     print 'Pause after output [y/n]: '
     yn = get_char
-    $bindings[key] = "command_file #{pro} #{yn} #{com}"
+    @bindings[key] = "command_file #{pro} #{yn} #{com}"
   end
 end
 
@@ -2715,22 +2885,22 @@ def ag
   pattern = readline 'Enter a pattern to search (ag): '
   return if pattern == ''
 
-  $title = "Files found using 'ag -t: ' #{pattern}"
+  @title = "Files found using 'ag -t: ' #{pattern}"
 
   ## ag options :
   #     -t : all text files
   #     -l : print only file names
   #     -a : print all files, even ignored
-  system %[ag -t "#{pattern}"]
+  system %(ag -t "#{pattern}" | less)
 
   pause
   files = `ag -lt "#{pattern}"`.split("\n")
   if files.empty?
     perror "No files found for #{pattern}."
-    $title = nil
+    @title = nil
     return
   end
-  $files = files
+  @files = files
   # redraw
 end
 
@@ -2740,12 +2910,12 @@ def ffind
   pattern = readline '! find . -iname :'
   return if pattern == ''
 
-  $title = "Files found using 'find' #{pattern}"
+  @title = "Files found using 'find' #{pattern}"
   files = `find . -iname "#{pattern}"`.split("\n")
   if files.empty?
     perror 'No files found. Try adding *'
   else
-    $files = files
+    @files = files
   end
   # redraw
 end
@@ -2755,13 +2925,13 @@ def locate
   pattern = readline
   return if pattern == ''
 
-  $title = "Files found using 'locate' #{pattern}"
+  @title = "Files found using 'locate' #{pattern}"
   files = `locate #{pattern}`.split("\n")
   files.select! { |x| x = File.expand_path(x); File.exist?(x) }
   if files.empty?
     perror 'No files found.'
   else
-    $files = files
+    @files = files
   end
   # redraw
 end
@@ -2773,11 +2943,11 @@ def z_interface
   file = File.expand_path('~/.z')
   return unless File.exist? file
 
-  $title = 'Directories from ~/.z'
-  $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
+  @title = 'Directories from ~/.z'
+  @files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
   home = ENV['HOME']
   # shorten file names
-  $files.collect! do |f|
+  @files.collect! do |f|
     f.sub(/#{home}/, '~')
   end
   # redraw
@@ -2785,6 +2955,7 @@ end
 
 def vidir
   system 'vidir'
+  refresh
   setup_terminal
 end
 
@@ -2804,140 +2975,142 @@ end
 # move cursor down a line
 def cursor_dn
   @movement = :down
-  @old_cursor = $cursor
+  @old_cursor = @cursor
   moveto(pos + 1)
 end
 
 def cursor_up
-  @old_cursor = $cursor
+  @old_cursor = @cursor
   @movement = :up
   moveto(pos - 1)
 end
 
 # return cursor position
 def pos
-  $cursor
+  @cursor
 end
 
 # move cursor to given position/line
 def moveto position
-  orig = $cursor
-  $cursor = position
-  $cursor = [$cursor, $view.size - 1].min
-  $cursor = [$cursor, 0].max
+  orig = @cursor
+  @cursor = position
+  @cursor = [@cursor, @view.size - 1].min
+  @cursor = [@cursor, 0].max
 
   # try to stop it from landing on separator
   if current_file == SEPARATOR
-    $cursor += 1 if @movement == :down
-    $cursor -= 1 if @movement == :up
+    @cursor += 1 if @movement == :down
+    @cursor -= 1 if @movement == :up
     return
   end
 
   # 2019-03-18 - adding sta
-  # $sta = position - only when page flips and file not visible
+  # @sta = position - only when page flips and file not visible
   # FIXME not correct, it must stop at end or correctly cycle
   # sta goes to 0 but cursor remains at 70
   # viewport.size may be wrong here, maybe should be pagesize only
-  oldsta = $sta
-  if $cursor - $sta >= $pagesize
-    $sta += $pagesize
-  # elsif $sta - $cursor >= $viewport.size
+  oldsta = @sta
+  if @cursor - @sta >= @pagesize
+    @sta += @pagesize
+    # elsif @sta - @cursor >= @viewport.size
   end
-  if $sta > $cursor
-    $sta -= $pagesize
-    # $sta = $cursor
+  if @sta > @cursor
+    @sta -= @pagesize
+    # @sta = @cursor
   end
 
-  @movement = nil if oldsta != $sta # we need to redraw
+  @movement = nil if oldsta != @sta # we need to redraw
 
-  star = [orig, $cursor].min
-  fin = [orig, $cursor].max
-  return unless $visual_mode
+  star = [orig, @cursor].min
+  fin = [orig, @cursor].max
+  return unless @visual_mode
 
   @movement = nil # visual mode needs to redraw page
 
   # PWD has to be there in selction
   if selected? current_file
     # this depends on the direction
-    # $selected_files = $selected_files - $view[star..fin]
-    remove_from_selection $view[star..fin]
+    # @selected_files = @selected_files - @view[star..fin]
+    remove_from_selection @view[star..fin]
     ## current row remains in selection always.
     add_to_selection current_file
   else
-    # $selected_files.concat $view[star..fin]
-    add_to_selection $view[star..fin]
+    # @selected_files.concat @view[star..fin]
+    add_to_selection @view[star..fin]
   end
-  message "#{$selected_files.count} files selected.   "
-# ensure
+  message "#{@selected_files.count} files selected.   "
+  # ensure
   # redraw
 end
 # --
 
 # is given file in selected array
-def visited?(file)
-  $current_dir ||= Dir.pwd
-  file = File.join($current_dir, file)
-  return $visited_files.index file
+def visited? file
+  @current_dir ||= Dir.pwd
+  file = File.join(@current_dir, file)
+  return @visited_files.index file
 end
 
 # ------------- selection related methods --------------------------------#
 
 # is given file in selected array
-def selected?(file)
-  $current_dir ||= Dir.pwd
-  file = File.join($current_dir, file)
-  return $selected_files.index file
+def selected? file
+  @current_dir ||= Dir.pwd
+  file = File.join(@current_dir, file)
+  return @selected_files.index file
 end
 
 # add given file/s to selected file list
-def add_to_selection(file)
+def add_to_selection file
   ff = file
   case file
   when String
     ff = [file]
   end
-  $current_dir ||= Dir.pwd
+  @current_dir ||= Dir.pwd
   ff.each do |f|
-    full = File.join($current_dir, f)
-    $selected_files.push(full) unless $selected_files.include?(full)
+    full = File.join(@current_dir, f)
+    @selected_files.push(full) unless @selected_files.include?(full)
   end
 end
 
-def remove_from_selection(file)
+def remove_from_selection file
   ff = file
   case file
   when String
     ff = [file]
   end
-  $current_dir ||= Dir.pwd
+  @current_dir ||= Dir.pwd
   ff.each do |f|
-    full = File.join($current_dir, f)
-    $selected_files.delete full
+    full = File.join(@current_dir, f)
+    @selected_files.delete full
   end
 end
 
 # ------------- visual mode methods --------------------------------#
-def visual_mode_toggle
-  $mode = nil
-  $visual_mode = !$visual_mode
-  if $visual_mode
-    $mode = 'VIS'
-    $visual_block_start = $cursor
-    add_to_selection current_file
-  end
-  message "Visual mode is #{$visual_mode}."
+def toggle_visual_mode
+  @mode = nil
+  # @visual_mode = !@visual_mode
+  toggle_value :visual_mode
+  return unless @visual_mode
+
+  @mode = 'VIS'
+  @visual_block_start = @cursor
+  add_to_selection current_file
 end
 
-# Called from Escape key only. Clears selection.
+# Called from Escape key and scripts and file actions. Clears selection.
 def visual_block_clear
-  if $visual_block_start
-    star = [$visual_block_start, $cursor].min
-    fin = [$visual_block_start, $cursor].max
-    remove_from_selection $view[star..fin]
-  end
-  $visual_block_start = nil
-  $visual_mode = nil
-  $mode = nil if $mode == 'VIS'
+  if @visual_block_start
+    star = [@visual_block_start, @cursor].min
+    fin = [@visual_block_start, @cursor].max
+    remove_from_selection @view[star..fin]
+  end
+  @visual_block_start = nil
+  @toggles[:visual_mode] = @visual_mode = false
+  @mode = nil if @mode == 'VIS'
+  # is this the right place to put this ??? 2019-04-16 -
+  clean_selected_files
 end
 
 # ------------- file matching methods --------------------------------#
@@ -2951,19 +3124,19 @@ def file_starting_with first_char=nil
   goto_line ix if ix
 end
 
-def file_matching?(file, patt)
+def file_matching? file, patt
   file =~ /#{patt}/
 end
 
 ## generic method to take cursor to next position for a given condition
-def return_next_match(binding, *args)
+def return_next_match binding, *args
   first = nil
   ix = 0
-  $view.each_with_index do |elem, ii|
+  @view.each_with_index do |elem, ii|
     next unless binding.call(elem, *args)
 
     first ||= ii
-    if ii > $cursor
+    if ii > @cursor
       ix = ii
       break
     end
@@ -2977,10 +3150,10 @@ end
 # position cursor on a specific line which could be on a nother page
 # therefore calculate the correct start offset of the display also.
 def goto_line pos
-  pages = ((pos * 1.00) / $pagesize).ceil
+  pages = ((pos * 1.00) / @pagesize).ceil
   pages -= 1
-  $sta = pages * $pagesize + 1
-  $cursor = pos
+  @sta = pages * @pagesize + 1
+  @cursor = pos
 end
 
 # return filetype of file using `file` external command.
@@ -3002,10 +3175,10 @@ end
 
 def opener_for f
   # by default, default command is nil. Changed in toggle_pager_mode
-  $default_command ||= '$PAGER'
+  @default_command ||= '$PAGER'
   # by default mode, is false, changed in toggle_pager_mode
   # Get filetype, and check for command for type, else extn else unknown
-  if !$editor_mode
+  if !@editor_mode
     ft = filetype f
     comm = PAGER_COMMAND[ft] if ft
     comm ||= PAGER_COMMAND[File.extname(f)]
@@ -3015,30 +3188,30 @@ def opener_for f
     # opens everything? what of images etc
     # TODO use editor only for text, otherwise use filetype or another hash
     # like editor_command
-    comm = $default_command
+    comm = @default_command
   end
-  comm ||= $default_command
+  comm ||= @default_command
   comm
 end
 
 # save offset in directory so we can revert to it when we return
 def save_dir_pos
   # the next line meant that it would not save first directory.
-  # return if $sta == 0 && $cursor == 0
+  # return if @sta == 0 && @cursor == 0
 
-  $dir_position[Dir.pwd] = [$sta, $cursor]
+  @dir_position[Dir.pwd] = [@sta, @cursor]
 end
 
 # revert to the position we were at in this directory
 def revert_dir_pos
-  $sta = 0
-  $cursor = 0
-  a = $dir_position[Dir.pwd]
+  @sta = 0
+  @cursor = 0
+  a = @dir_position[Dir.pwd]
   if a
-    $sta = a.first
-    $cursor = a[1]
-    raise "sta is nil for #{Dir.pwd} : #{$dir_position[Dir.pwd]}" unless $sta
-    raise 'cursor is nil' unless $cursor
+    @sta = a.first
+    @cursor = a[1]
+    raise "sta is nil for #{Dir.pwd} : #{@dir_position[Dir.pwd]}" unless @sta
+    raise 'cursor is nil' unless @cursor
   end
 end
 
@@ -3052,7 +3225,7 @@ def create_a_dir
   end
   begin
     FileUtils.mkdir str
-    $used_dirs.insert(0, str) if File.exist?(str)
+    @used_dirs.insert(0, str) if File.exist?(str)
     refresh
   rescue StandardError => ex
     perror "Error in newdir: #{ex}"
@@ -3065,32 +3238,38 @@ def create_a_file
 
   system %($EDITOR "#{str}")
   setup_terminal
-  $visited_files.insert(0, str) if File.exist?(str)
+  @visited_files.insert(0, str) if File.exist?(str)
   refresh
 end
 
 # convenience method to return file under cursor
 def current_file
-  $view[$cursor]
+  @view[@cursor]
 end
 
 def current_or_selected_files
-  return $selected_files if !$selected_files.empty?
+  return @selected_files unless @selected_files.empty?
 
   return [current_file]
 end
 
 # ------------------- scripts ------------------ #
 # prompt for scripts to execute, giving file name under cursor
-def scripts
+def scripts binding=nil
   # some scripts may work with the selected_files and not want to be called
   #  with filenames.
   write_selected_files
 
-  title = 'Select a script'
-  script_path = '~/.config/cetus/scripts'
-  binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
-  return if binding.nil? || binding == ''
+  unless binding
+    title = 'Select a script'
+    script_path = '~/.config/cetus/scripts'
+    binding = `find #{script_path} -type f | fzf --prompt="#{title} :"`.chomp
+    return if binding.nil? || binding == ''
+  end
+  unless File.exist? binding
+    @log.warn "Unable to find #{binding}"
+    return
+  end
 
   # TODO: check if binding is a file and executable
   # xargs only seems to take the first file
@@ -3098,20 +3277,38 @@ def scripts
   # cf = Shellwords.join(current_or_selected_files)
   # This was getting called repeatedly even if script used selected_files
   # current_or_selected_files.each do |file|
-    # system %( #{binding} "#{file}" )
+  # system %( #{binding} "#{file}" )
   # end
 
   # 2019-04-08 - to avoid confusion, we pass name of file under cursor
   # script may ignore this and use selected_files
+
+  # reset clears the screen, we don't want that. just unhide cursor and echo keys TODO
   reset_terminal
   system %( #{binding} "#{current_file}" )
 
   # system %(echo "#{cf}" | xargs #{binding})
   pause
   setup_terminal
+  visual_block_clear
   refresh
 end
 
+# this is quite important and should not be left to a script
+# example of calling a script from somewhere directly without selection
+def execute_script filename
+  script_path = '~/.config/cetus/scripts'
+  script = File.expand_path(File.join(script_path, 'filename'))
+  return unless File.exist? script
+
+  scripts script
+end
+
+# maybe do this internally
+def create_dir_with_selection
+  execute_script 'create_dir_with_selection'
+end
+
 # allow user to select a script that generates filenames which
 #  will be displayed for selection or action.
 def generators
@@ -3123,9 +3320,8 @@ def generators
   return if binding.nil? || binding == ''
 
   # call generator and accept list of files
-  $title = "Files from #{File.basename(binding)}"
-  $files = `#{binding} "#{current_file}"`.split("\n")
-
+  @title = "Files from #{File.basename(binding)}"
+  @files = `#{binding} "#{current_file}"`.split("\n")
 end
 # ------------- end of scripts --------------------------------#
 
@@ -3134,7 +3330,7 @@ def view_selected_files
   fname = write_selected_files
 
   unless fname
-    message "No file selected.    "
+    message 'No file selected.    '
     return
   end
 
@@ -3143,11 +3339,15 @@ def view_selected_files
 end
 # ------------- end of view_selected_files --------------------------------#
 
+def list_selected_files
+  @title = 'Selected Files'
+  @files = @selected_files
+end
+
 # write selected files to a file and return path
 # if no selected files then blank out the file, or else
 # script could use old selection again.
 def write_selected_files
-
   require 'pathname'
   # fname = File.join(File.dirname(CONFIG_FILE), 'selected_files')
   # 2019-04-10 - changed to ~/tmp otherwise confusion about location
@@ -3155,7 +3355,7 @@ def write_selected_files
   fname = File.expand_path(fname)
 
   # remove file if no selection
-  if $selected_files.empty?
+  if @selected_files.empty?
     File.unlink(fname) if File.exist?(fname)
     return nil
   end
@@ -3164,8 +3364,7 @@ def write_selected_files
   # TODO: what if unix commands need escaped files ?
   base = Pathname.new Dir.pwd
   File.open(fname, 'w') do |file|
-    $selected_files.each do |row|
-
+    @selected_files.each do |row|
       # use relative filename. Otherwise things like zip and tar run into issues
       unless @selected_files_fullpath_flag
         p = Pathname.new(row)
@@ -3178,23 +3377,24 @@ def write_selected_files
 
   return fname
 end
+
 ##
 # Editing of the User Dir List.
 # remove current entry from used dirs list, since we may not want some entries being there
 #
 def remove_from_list
-  unless $selected_files.empty?
-    sz = $selected_files.size
+  unless @selected_files.empty?
+    sz = @selected_files.size
     print "Remove #{sz} files from used list (y)?: "
     key = get_char
     return if key != 'y'
 
-    arr = $selected_files.map { |path| File.expand_path(path) }
+    arr = @selected_files.map { |path| File.expand_path(path) }
 
-    $used_dirs = $used_dirs - arr
-    $visited_files = $visited_files - arr
+    @used_dirs = @used_dirs - arr
+    @visited_files = @visited_files - arr
     unselect_all
-    $modified = true
+    @modified = true
     refresh
     return
   end
@@ -3202,19 +3402,19 @@ def remove_from_list
   # no file selected, use file under cursor
   print
   ## what if selected some rows
-  file = $view[$cursor]
+  file = @view[@cursor]
   print "Remove #{file} from used list (y)?: "
   key = get_char
   return if key != 'y'
 
   file = File.expand_path(file)
   if File.directory? file
-    $used_dirs.delete(file)
+    @used_dirs.delete(file)
   else
-    $visited_files.delete(file)
+    @visited_files.delete(file)
   end
   refresh
-  $modified = true
+  @modified = true
 end
 
 #
@@ -3224,158 +3424,152 @@ end
 # latest source, but in some cases even this can be misleading since running a program accesses
 # include files.
 def enhance_file_list
-  return unless $enhanced_mode
+  return unless cget(:enhanced_mode)
+
   begin
-    actr = $files.size
-
-  # zshglob: M = MARK_DIRS with slash
-  # zshglob: N = NULL_GLOB no error if no result, this is causing space to split
-  #  file sometimes for single file.
-
-  # FIXME: append only if we are adding.
-  # FIXME: this makes it possible to select this row,
-  # FIXME: and count it as a file !!
-  # $files.append SEPARATOR
-
-  # if only one entry and its a dir
-  # get its children and maybe the recent mod files a few
-  # FIXME: simplify condition into one
-  if $files.size == 1
-    # its a dir, let give the next level at least
-    return unless $files.first[-1] == '/'
-
-    d = $files.first
-    # zshglob: 'om' = ordered on modification time
-    # f1 = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
-    f = get_files_by_mtime(d)
-
-    # @log.warn "f1:#{f1} != f:#{f} in #{d}" if f1 != f
-    # order returned by zsh and ruby are different since the time is the same
-
-    # TODO: use ruby this throws errors if not files
-    if f && !f.empty?
-      # @log.debug "CONCAT: #{f}" if @debug_flag
-      $files.concat f
-      $files.concat get_important_files(d)
-    end
-    return
-  end
-  #
-  # check if a ruby project dir, although it could be a backup file too,
-  # if so , expand lib and maybe bin, put a couple recent files
-  # FIXME: gemspec file will be same as current folder
-  if $files.index('Gemfile') || !$files.grep(/\.gemspec/).empty?
-    # usually the lib dir has only one file and one dir
-    flg = false
-    $files.concat get_important_files(Dir.pwd)
-    if $files.index('lib/')
-      # get first five entries by modification time
-      # f1 = `zsh -c 'print -rl -- lib/*(om[1,5]MN)'`.split("\n")
-      f = get_files_by_mtime('lib')&.first(5)
-      # @log.warn "f1 #{f1} != #{f} in lib" if f1 != f
+    actr = @files.size
+
+    # zshglob: M = MARK_DIRS with slash
+    # zshglob: N = NULL_GLOB no error if no result, this is causing space to split
+    #  file sometimes for single file.
+
+    # FIXME: append only if we are adding.
+    # FIXME: this makes it possible to select this row,
+    # FIXME: and count it as a file !!
+    # @files.append SEPARATOR
+
+    # if only one entry and its a dir
+    # get its children and maybe the recent mod files a few
+    # FIXME: simplify condition into one
+    if @files.size == 1
+      # its a dir, let give the next level at least
+      return unless @files.first[-1] == '/'
+
+      d = @files.first
+      # zshglob: 'om' = ordered on modification time
+      # f1 = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
+      f = get_files_by_mtime(d)
+
       if f && !f.empty?
-        insert_into_list('lib/', f)
-        flg = true
+        @files.concat f
+        @files.concat get_important_files(d)
       end
-
-      # look into lib file for that project
-      dd = File.basename(Dir.pwd)
-      if f.index("lib/#{dd}/")
-        # f1 = `zsh -c 'print -rl -- lib/#{dd}/*(om[1,5]MN)'`.split("\n")
-        f = get_files_by_mtime("lib/#{dd}")&.first(5)
-        # @log.warn "2756 f1 #{f1} != #{f} in lib/#{dd}" if f1 != f
+      return
+    end
+    #
+    # check if a ruby project dir, although it could be a backup file too,
+    # if so , expand lib and maybe bin, put a couple recent files
+    # FIXME: gemspec file will be same as current folder
+    if @files.index('Gemfile') || !@files.grep(/\.gemspec/).empty?
+      # usually the lib dir has only one file and one dir
+      flg = false
+      @files.concat get_important_files(Dir.pwd)
+      if @files.index('lib/')
+        # get first five entries by modification time
+        # f1 = `zsh -c 'print -rl -- lib/*(om[1,5]MN)'`.split("\n")
+        f = get_files_by_mtime('lib')&.first(5)
+        # @log.warn "f1 #{f1} != #{f} in lib" if f1 != f
         if f && !f.empty?
-          insert_into_list("lib/#{dd}/", f)
+          insert_into_list('lib/', f)
           flg = true
         end
-      end
-    end
-
-    # look into bin directory and get first five modified files
-    if $files.index('bin/')
-      # f1 = `zsh -c 'print -rl -- bin/*(om[1,5]MN)'`.split("\n")
-      f = get_files_by_mtime("bin")&.first(5)
-      # @log.warn "2768 f1 #{f1} != #{f} in bin/" if f1 != f
-      insert_into_list('bin/', f) if f && !f.empty?
-      flg = true
-    end
-    return if flg
-
-    # lib has a dir in it with the gem name
-
-  end
-  return if $files.size > 15
 
-  # Get most recently accessed directory
-  ## NOTE: first check accessed else modified will change accessed
-  # 2019-03-28 - adding NULL_GLOB breaks file name on spaces
-  # print -n : don't add newline
-  # zzmoda = `zsh -c 'print -rn -- *(/oa[1]MN)'`
-  # zzmoda = nil if zzmoda == ''
-  moda = get_most_recently_accessed_dir
-  # @log.warn "Error 2663 #{zzmoda} != #{moda}" if zzmoda != moda
-  if moda && moda != ''
+        # look into lib file for that project
+        dd = File.basename(Dir.pwd)
+        if f.index("lib/#{dd}/")
+          # f1 = `zsh -c 'print -rl -- lib/#{dd}/*(om[1,5]MN)'`.split("\n")
+          f = get_files_by_mtime("lib/#{dd}")&.first(5)
+          # @log.warn "2756 f1 #{f1} != #{f} in lib/#{dd}" if f1 != f
+          if f && !f.empty?
+            insert_into_list("lib/#{dd}/", f)
+            flg = true
+          end
+        end
+      end
 
-    # get most recently accessed file in that directory
-    # NOTE: adding NULL_GLOB splits files on spaces
-    # FIXME: this zsh one gave a dir instead of file.
-    # zzmodf = `zsh -c 'print -rl -- #{moda}*(oa[1]M)'`.chomp
-    # zzmodf = nil if zzmodf == ''
-    modf = get_most_recently_accessed_file moda
-    # @log.warn "Error 2670 (#{zzmodf}) != (#{modf}) gmra in #{moda} #{zzmodf.class}, #{modf.class} : Loc: #{Dir.pwd}" if zzmodf != modf
+      # look into bin directory and get first five modified files
+      if @files.index('bin/')
+        # f1 = `zsh -c 'print -rl -- bin/*(om[1,5]MN)'`.split("\n")
+        f = get_files_by_mtime('bin')&.first(5)
+        # @log.warn "2768 f1 #{f1} != #{f} in bin/" if f1 != f
+        insert_into_list('bin/', f) if f && !f.empty?
+        flg = true
+      end
+      return if flg
 
-    raise "2784: #{modf}" if modf && !File.exist?(modf)
+      # lib has a dir in it with the gem name
 
-    insert_into_list moda, modf if modf && modf != ''
+    end
+    return if @files.size > 15
+
+    # Get most recently accessed directory
+    ## NOTE: first check accessed else modified will change accessed
+    # 2019-03-28 - adding NULL_GLOB breaks file name on spaces
+    # print -n : don't add newline
+    # zzmoda = `zsh -c 'print -rn -- *(/oa[1]MN)'`
+    # zzmoda = nil if zzmoda == ''
+    moda = get_most_recently_accessed_dir
+    # @log.warn "Error 2663 #{zzmoda} != #{moda}" if zzmoda != moda
+    if moda && moda != ''
+
+      # get most recently accessed file in that directory
+      # NOTE: adding NULL_GLOB splits files on spaces
+      # FIXME: this zsh one gave a dir instead of file.
+      # zzmodf = `zsh -c 'print -rl -- #{moda}*(oa[1]M)'`.chomp
+      # zzmodf = nil if zzmodf == ''
+      modf = get_most_recently_accessed_file moda
+      # @log.warn "Error 2670 (#{zzmodf}) != (#{modf}) gmra in #{moda} #{zzmodf.class}, #{modf.class} : Loc: #{Dir.pwd}" if zzmodf != modf
+
+      raise "2784: #{modf}" if modf && !File.exist?(modf)
+
+      insert_into_list moda, modf if modf && modf != ''
+
+      # get most recently modified file in that directory
+      # zzmodm = `zsh -c 'print -rn -- #{moda}*(om[1]M)'`.chomp
+      modm = get_most_recently_modified_file moda
+      # zzmodm = nil if zzmodm == ''
+      # @log.debug "Error 2678 (gmrmf) #{zzmodm} != #{modm} in #{moda}" if zzmodm != modm
+      raise "2792: #{modm}" if modm && !File.exist?(modm)
+
+      insert_into_list moda, modm if modm && modm != '' && modm != modf
+    end
 
-    # get most recently modified file in that directory
-    # zzmodm = `zsh -c 'print -rn -- #{moda}*(om[1]M)'`.chomp
-    modm = get_most_recently_modified_file moda
+    ## get most recently modified dir
+    # zzmodm = `zsh -c 'print -rn -- *(/om[1]M)'`
     # zzmodm = nil if zzmodm == ''
-    # @log.debug "Error 2678 (gmrmf) #{zzmodm} != #{modm} in #{moda}" if zzmodm != modm
-    raise "2792: #{modm}" if modm && !File.exist?(modm)
-
-    insert_into_list moda, modm if modm && modm != '' && modm != modf
-  end
-
-  ## get most recently modified dir
-  # zzmodm = `zsh -c 'print -rn -- *(/om[1]M)'`
-  # zzmodm = nil if zzmodm == ''
-  modm = get_most_recently_modified_dir
-  # @log.debug "Error 2686 rmd #{zzmodm} != #{modm}" if zzmodm != modm
+    modm = get_most_recently_modified_dir
+    # @log.debug "Error 2686 rmd #{zzmodm} != #{modm}" if zzmodm != modm
 
-  if modm != moda
+    if modm != moda
 
-    # get most recently accessed file in that directory
-    # modmf = `zsh -c 'print -rn -- #{modm}*(oa[1]M)'`
-    modmf = get_most_recently_accessed_file modm
-    raise "2806: #{modmf}" if modmf && !File.exist?(modmf)
+      # get most recently accessed file in that directory
+      # modmf = `zsh -c 'print -rn -- #{modm}*(oa[1]M)'`
+      modmf = get_most_recently_accessed_file modm
+      raise "2806: #{modmf}" if modmf && !File.exist?(modmf)
 
-    insert_into_list modm, modmf
+      insert_into_list modm, modmf
 
-    # get most recently modified file in that directory
-    # modmf11 = `zsh -c 'print -rn -- #{modm}*(om[1]M)'`
-    modmf1 = get_most_recently_modified_file modm
-    raise "2812: #{modmf1}" if modmf1 && !File.exist?(modmf1)
+      # get most recently modified file in that directory
+      # modmf11 = `zsh -c 'print -rn -- #{modm}*(om[1]M)'`
+      modmf1 = get_most_recently_modified_file modm
+      raise "2812: #{modmf1}" if modmf1 && !File.exist?(modmf1)
 
-    insert_into_list(modm, modmf1) if modmf1 != modmf
-  else
-    # if both are same then our options get reduced so we need to get something more
-    # If you access the latest mod dir, then come back you get only one, since mod and accessed
-    # are the same dir, so we need to find the second modified dir
-  end
+      insert_into_list(modm, modmf1) if modmf1 != modmf
+    else
+      # if both are same then our options get reduced so we need to get something more
+      # If you access the latest mod dir, then come back you get only one, since mod and accessed
+      # are the same dir, so we need to find the second modified dir
+    end
   ensure
     # if any files were added, then add a separator
-    bctr = $files.size
-    if actr < bctr
-      $files.insert actr, SEPARATOR
-    end
+    bctr = @files.size
+    @files.insert actr, SEPARATOR if actr < bctr
   end
 end
 
-# insert important files to end of $files
+# insert important files to end of @files
 def insert_into_list _dir, file
-  $files.push(*file)
+  @files.push(*file)
 end
 
 # Get visited files and bookmarks that are inside this directory
@@ -3383,7 +3577,6 @@ end
 # 2019-03-23 - not exactly clear what is happening XXX
 # this gets a directory (containing '/' at end)
 def get_important_files dir
-
   # checks various lists like visited_files and bookmarks
   # to see if files from this dir or below are in it.
   # More to be used in a dir with few files.
@@ -3392,14 +3585,14 @@ def get_important_files dir
 
   # 2019-03-23 - i think we are getting the basename of the file
   #  if it is present in the given directory XXX
-  $visited_files.each do |e|
+  @visited_files.each do |e|
     list << e[l..-1] if e.index(dir) == 0
   end
 
   # bookmarks if it starts with this directory then add it
   # FIXME it puts same directory cetus into the list with full path
   # We need to remove the base until this dir. get relative part
-  list1 = $bookmarks.values.select do |e|
+  list1 = @bookmarks.values.select do |e|
     e.index(dir) == 0 && e != dir
   end
 
@@ -3429,8 +3622,8 @@ end
 # func can be :mtime or :atime or :ctime or :birthtime
 def gmr dir, type, func
   file = Dir.glob(dir + '/*')
-            .select { |f| File.send(type, f) }
-            .max_by { |f| File.send(func, f) }
+    .select { |f| File.send(type, f) }
+    .max_by { |f| File.send(func, f) }
   file = File.basename(file) + '/' if file && type == :directory?
   return file.gsub('//', '/') if file
 
@@ -3465,14 +3658,14 @@ end
 # set message which will be displayed in status line
 # TODO: maybe we should pad it 2019-04-08 -
 def message mess
-  $message = mess
+  @message = mess
   @keys_to_clear = 2 if mess
 end
 
 def last_line
-  # system "tput cup #{$glines} 0"
-  # print "\e[#{$glines};0H"
-  tput_cup $glines, 0
+  # system "tput cup #{@glines} 0"
+  # print "\e[#{@glines};0H"
+  tput_cup @glines, 0
 end
 
 def clear_last_line
@@ -3482,7 +3675,7 @@ def clear_last_line
   # %*s        - set blank spaces for entire line
   # \e[m       - reset text mode
   # \r         - bring to start of line since callers will print.
-  print "\e[33;4%sm%*s\e[m\r" % [@status_color || '1', $gcols, ' ']
+  print format("\e[33;4%sm%*s\e[m\r", @status_color || '1', @gcols, ' ')
 end
 
 # print right aligned
@@ -3491,14 +3684,12 @@ end
 # should clear and reprint mode, message, patt and right text
 def print_on_right text
   sz = text.size
-  col = $gcols - sz - 1
+  col = @gcols - sz - 1
   col = 2 if col < 2
-  if sz > $gcols - 2
-    text = text[0..$gcols-3]
-  end
-  # system "tput cup #{$glines} #{$gcols - sz - 1}"
-  system "tput cup #{$glines} #{col}"
-  # tput_cup $glines, $gcols - sz - 1
+  text = text[0..@gcols - 3] if sz > @gcols - 2
+  # system "tput cup #{@glines} #{@gcols - sz - 1}"
+  system "tput cup #{@glines} #{col}"
+  # tput_cup @glines, @gcols - sz - 1
   # print text
   print "\e[33;4#{@status_color_right}m#{text}\e[m"
 end
@@ -3519,9 +3710,34 @@ def clear_message
     end
   end
 end
+
+# returns true if only cursor moved and redrawing not required
+def only_cursor_moved?
+  # only movement has happened within this page, don't redraw
+  return unless @movement && @old_cursor
+
+  # if cursor has not moved (first or last item on screen)
+  # keep testing this out 2019-04-14 -
+  if @old_cursor == @cursor
+    @movement = false
+    return true # next in the loop
+  end
+
+  # we may want to print debug info if flag is on
+  if cget(:debug_flag)
+    clear_last_line
+    print_debug_info
+  else
+    status_line
+  end
+
+  place_cursor
+  @movement = false
+  return true # next in the loop
+end
+
 # main loop which calls all other programs
 def run
-
   Signal.trap('EXIT') do
     reset_terminal
     exit
@@ -3536,44 +3752,28 @@ def run
   place_cursor
 
   # do we need this, have they changed after redraw
-  $patt = nil
-  $sta = 0
+  @patt = nil
+  @sta = 0
 
   # forever loop that prints dir and takes a key
   loop do
-
     key = get_char
 
-
     unless resolve_key key # key did not map to file name, so don't redraw
       place_cursor
       next
     end
 
-    # only movement has happened within this page, don't redraw
-    if @movement && @old_cursor
-
-      # we may want to print debug info if flag is on
-      if @debug_flag
-        clear_last_line
-        print_debug_info
-      else
-        status_line
-      end
-
-      place_cursor
-      @movement = false
-      next
-    end
+    next if only_cursor_moved?
 
     redraw rescan?
     place_cursor
 
-    break if $quitting
+    break if @quitting
   end
   write_curdir
   puts 'bye'
-  config_write if $writing
+  config_write if @writing
   @log&.close
 end