cetus 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354100c7054b31bc96f5bcc0a34056b68dcb061181467f0555443e340eac7922
-  data.tar.gz: 66f325607b440d2ebc476246b136f8c8e7d7e70a76cd27822c4abb56ff26f44f
+  metadata.gz: e62bb94776477721739341ff4f03ac93390501da588709f3115a2a4c4ee3ca0f
+  data.tar.gz: 496df10e6710d503de9d4aa2334ac932286b1cb7c23ccc4ef57af02bb310496d
 SHA512:
-  metadata.gz: c497713cbae448bdac329afa7f030046ad889f1a7053ce5e0c6debd55d60649107fca9b7d697193f6e7bbcbc2f028902c29c512cfc04008c75ed77450e73a6f9
-  data.tar.gz: d811607e119d64186c1c49b38e6d23c0e643c20a0fe9cafe95c83ab8144157a2e6f152e3039fbc441c3e4bca956d44fc445d5ea59eedd1cfdc38ddf6fd4d43cf
+  metadata.gz: a3fc6945a92dde16f2c4dbb6dac0b2e1ffd93968caca6cfaadba473ab183b612d88c6916792fbdeffd1d5c5cbcd561c794c4588f6a76c35a9fe6dc1221a2d747
+  data.tar.gz: 62f47e97a020a759d14f31c6eb3c6cdefaccea57fb1a14997f535e53b6e6fd914b67b72ce0027cb4d8bf82fb652650654aa09c1742d44a70d60dc92981990b08

data/bin/cetus

@@ -8,7 +8,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-04-24 13:56
+#  Last update: 2019-05-14 10:21
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -21,6 +21,7 @@
 # 2019-03-22 - refactoring the code, esp run()
 # 2019-04-21 - search_as_you_type
 # 2019-04-22 - new search_as_you_type
+# 2019-05-13 - add "\r" so WINCH can work
 #  == TODO
 
 require 'readline'
@@ -40,82 +41,82 @@ now = Time.now.strftime("%Y-%m-%d %H:%M:%S")
 # alias c=~/bin/cetus.rb
 # c
 
-VERSION = '0.2.0.0'
+VERSION = '0.3.0.0'
 CONFIG_PATH = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
 CONFIG_FILE = "#{CONFIG_PATH}/cetus/conf.yml"
 
+# NOTE: if changing binding to symbol, there are many places where searched as
+#  string.
 @bindings = {
-  '`' => 'main_menu',
-  '=' => 'toggle_menu',
-  'M-s' => 'selection_menu',
-  'M-o' => 'order_menu',
-  'ENTER' => 'select_current',
-  'C-p' => 'page_current',
-  'C-e' => 'edit_current',
-  'C-o' => 'open_current',
-  'C-s' => 'toggle_select',
-  'C-r' => 'reduce',
-  'C-g' => 'debug_vars',
-  '*' => '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
-  '.' => 'pop_dir',
-  ':' => 'subcommand',
-  "'" => 'goto_bookmark',
-  '"' => 'file_starting_with',
-  '/' => 'ask_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',
-  'M-b' => 'bookmark_menu',
-  'M-m' => 'create_bookmark',
-  'M-M' => 'view_bookmarks',
-  'C-c' => 'escape',
-  'ESCAPE' => 'escape',
-  'TAB' => 'views',
-  'C-i' => 'views',
+        '`' => 'main_menu',
+        '=' => 'toggle_menu',
+        '%' => 'filter_menu',
+      'M-s' => 'selection_menu',
+      'M-o' => 'order_menu',
+    'ENTER' => 'select_current',
+      'C-p' => 'page_current',
+      'C-e' => 'edit_current',
+      'C-o' => 'open_current',
+      'C-s' => 'toggle_select',
+      'C-r' => 'reduce',
+      'C-g' => 'debug_vars',
+        '*' => '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
+        '.' => 'pop_dir',
+        ':' => 'subcommand',
+        "'" => 'goto_bookmark',
+        '"' => 'file_starting_with',
+        '/' => 'filter_files_by_pattern',
+      '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',
+      'M-b' => 'bookmark_menu',
+      'M-m' => 'create_bookmark',
+      'M-M' => 'view_bookmarks',
+      'C-c' => 'escape',
+   'ESCAPE' => 'escape',
+      'TAB' => 'views',
+      'C-i' => 'views',
   # '?' => 'dirtree',
-  'D' => 'delete_file',
+        'D' => 'delete_file',
   # 'M' => 'file_actions most',
-  'M' => 'move_instant',
-  'q' => 'quit_command', # was Q now q 2019-03-04 -
+        'M' => 'move_instant',
+        'q' => 'quit_command', # was Q now q 2019-03-04 -
   # "RIGHT"   => "column_next",
-  'RIGHT' => 'select_current', # changed 2018-03-12 - for faster navigation
-  'LEFT' => 'goto_parent_dir', # changed on 2018-03-12 - earlier column_next 1
-  ']' => 'column_next: goto next column',
-  '[' => 'column_next 1: goto previous column',
-  'C-x' => 'file_actions',
-  'M--' => 'columns_incdec -1: reduce column width',
-  'M-+' => 'columns_incdec 1: increase column width',
-  'S' => 'command_file list y ls -lh',
-  'L' => 'command_file Page n less',
-  'C-d' => 'cursor_scroll_dn',
-  'C-b' => 'cursor_scroll_up',
-  'UP' => 'cursor_up',
-  'DOWN' => 'cursor_dn',
+    'RIGHT' => 'select_current', # changed 2018-03-12 - for faster navigation
+     'LEFT' => 'goto_parent_dir', # changed on 2018-03-12 - earlier column_next 1
+        ']' => 'column_next: goto next column',
+        '[' => 'column_next 1: goto previous column',
+      'C-x' => 'file_actions',
+  # 'M--' => 'columns_incdec -1: reduce column width',
+  # 'M-+' => 'columns_incdec 1: increase column width',
+  # 'L' => 'command_file Page n less: Page current file',
+      'C-d' => 'cursor_scroll_dn',
+      'C-b' => 'cursor_scroll_up',
+       'UP' => 'cursor_up',
+     'DOWN' => 'cursor_dn',
   'C-SPACE' => 'toggle_visual_mode',
-  '@' => 'scripts',
-  '#' => 'generators',
-
-  '?' => 'print_help',
-  'F1' => 'print_help',
-  'F2' => 'child_dirs',
-  'F3' => 'dirtree',
-  'F4' => 'tree',
-  'S-F1' => 'dirtree',
-  'S-F2' => 'tree'
-
+        '@' => 'scripts',
+        '#' => 'generators',
+        '?' => 'print_help',
+       'F1' => 'print_help',
+       'F2' => 'child_dirs',
+       'F3' => 'dirtree',
+       'F4' => 'tree',
+     'S-F1' => 'dirtree',
+     'S-F2' => 'tree'
 }
 
 ## clean this up a bit, copied from shell program and macro'd
@@ -327,7 +328,6 @@ IDX.freeze
 @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',
@@ -338,7 +338,11 @@ PAGER_COMMAND = {
 }.freeze
 @dir_position = {}
 @cursor_movement = @old_cursor = nil # cursor movement has happened only, don't repaint
+@keys_to_clear = nil # in how many strokes should message be cleared, set later.
+# ---------------------------------------------
 ## FLAGS
+@visual_mode = false
+@enhanced_mode = true
 @multiple_selection = true # single select
 @group_directories = :first
 # truncate long filenames from :right, :left or :center.
@@ -347,39 +351,41 @@ PAGER_COMMAND = {
 @display_file_stats = true
 @selected_files_fullpath_flag = false
 @selected_files_escaped_flag = false
-@keys_to_clear = nil
 @ignore_case = true
 @highlight_row_flag = true # false
 @debug_flag = false
+@date_func = :mtime # which date to display in long listing.
 
 # 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,
+  selected_files_fullpath_flag: false,
+  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,
+  filename_status_line: true,
   instant_search: true,
   highlight_row_flag: @highlight_row_flag
 }
+# These are flags that have multiple values.
 # 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], var: :group_directories },
-  show_hidden: { current: nil, values: [nil, 'D'], var: :hidden }
+  show_hidden: { current: nil, values: [nil, 'D'], var: :hidden },
+  date_func: { current: :mtime, values: [:mtime, :atime, :ctime], var: :date_func }
 }
 
 ## ----------------- CONSTANTS ----------------- ##
 GMARK = '*'
+VMARK = '+'
 CURMARK = '>'
 MSCROLL = 10
 SPACE = ' '
@@ -436,7 +442,6 @@ CURSOR_COLOR = REVERSE
 ## --------------------------------------------- ##
 
 @patt = nil
-@ignorecase = true
 @quitting = false
 @modified = @writing = false
 @visited_files = []
@@ -450,22 +455,20 @@ CURSOR_COLOR = REVERSE
 @viewctr = 0
 ## sta is where view (viewport) begins, cursor is current row/file
 @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
 
 # Menubar on top of screen
 @help = "#{BOLD}?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Execute   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}C-x#{BOLD_OFF} File Actions  #{BOLD}q#{BOLD_OFF} Quit "
 
-# ------------------- read_directory ------------------ #
 def read_directory
   rescan_required false
 
   @filterstr ||= 'M' # XXX can we remove from here
+  @current_dir ||= Dir.pwd
   list_files
 
   group_directories_first
-  # return unless cget(:enhanced_mode)
   return unless @enhanced_mode
 
   enhance_file_list
@@ -505,8 +508,7 @@ def list_files dir='*', sorto=@sorto, hidden=@hidden, _filter=@filterstr
                    Dir.glob(dir)
                  end
 
-  # WARN: crashes on a dead link since no mtime
-  # HACK: use first files return value for bad link
+  # WARN: crashes on a deadlink since no mtime
   if func
     sorted_files = sorted_files.sort_by do |f|
       if File.exist? f
@@ -520,16 +522,16 @@ def list_files dir='*', sorto=@sorto, hidden=@hidden, _filter=@filterstr
   sorted_files.sort! { |w1, w2| w1.casecmp(w2) } if func == :path && @ignore_case
 
   # zsh gives mtime sort with latest first, ruby gives latest last
-  sorted_files.reverse! if sorto[0] == 'O'
+  sorted_files.reverse! if sorto && sorto[0] == 'O'
 
   # add slash to directories
   sorted_files = add_slash sorted_files
   # return sorted_files
   @files = sorted_files
+  calculate_bookmarks_for_dir # we don't want to override those set by others
 end
-# ------------- end of read_directory --------------------------------#
 
-# Deal with dead links.
+# Deal with deadlinks.
 def sys_stat func, file
   return unless File.symlink? file
 
@@ -542,7 +544,6 @@ end
 # ------------------- create_viewport ------------------ #
 def create_viewport
   @view = if @patt
-            # if cget(:ignore_case)
             if @ignore_case
               @files.grep(/#{@patt}/i)
             else
@@ -562,13 +563,21 @@ def create_viewport
 
   # viewport are the files that are visible, subset of view
   @viewport = @view[@sta, @pagesize]
+  @vps = @viewport.size
 end
 # ------------- end of create_viewport --------------------------------#
 
+# FIXME: need to update when bookmark created or deleted
+def calculate_bookmarks_for_dir
+
+  bm = @bookmarks.select { |k, v| v == @current_dir }.keys.join(',')
+  bm = " ('#{bm})" if bm && bm != ''
+  @bm = bm
+end
 # ------------------- print_title ------------------ #
 def print_title
   # print help line and version
-  print "#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
+  print "\r#{GREEN}#{@help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
   @current_dir ||= Dir.pwd
 
   # print 1 of n files, sort order, filter etc details
@@ -576,16 +585,11 @@ def print_title
 
   # Add bookmark next to name of dir, if exists
   # FIXME This should not happen in other listings like find selected files etc
-  # bm = @bookmarks.key(Dir.pwd)
-  # Display multiple bookmarks. Can be calculated on changing directory ?
-  bm = @bookmarks.select { |k, v| v == @current_dir }.keys.join(',')
-  bm = " ('#{bm})" if bm && bm != ''
 
-  fin = @sta + @viewport.size
+  fin = @sta + @vps
   fl = @view.size
 
   # fix count of entries so separator and enhanced entries don't show up
-  # if cget(:enhanced_mode)
   if @enhanced_mode
     ix = @viewport.index SEPARATOR
     fin = @sta + ix if ix
@@ -594,15 +598,16 @@ def print_title
     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
 
-  print "#{BOLD}#{t}#{CLEAR}"
+  print "\r#{BOLD}#{t}#{CLEAR}"
 
   tput_cup(-1, @gcols - @hk.length - 2)
   puts '[' + @hk + ']'
+  print "\r"
 
   print "#{CURSOR_COLOR}EMPTY#{CLEAR}" if fl == 0
 end
@@ -623,7 +628,6 @@ def status_line
   # 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)
     if @debug_flag
       print_debug_info cf
     else
@@ -635,7 +639,6 @@ def status_line
   # 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)
     patt[-1] = '/i]' if @ignore_case
   end
   # bring cursor to start of line
@@ -648,12 +651,12 @@ def status_line
 end
 
 def print_debug_info cf=current_file
-  print_on_right "len:#{cf.length}/#{@temp_wid} = #{@sta},#{@cursor},#{@stact},#{@viewport.size},#{@grows} | #{cf}"
+  print_on_right "len:#{cf.length}/#{@temp_wid} = #{@sta},#{@cursor},#{@stact},#{@vps},#{@grows} | #{cf}"
 end
 
 def print_filename_status_line cf=current_file
   if @display_file_stats
-    ff = if cf[0] == '~'
+    ff = if cf.start_with?("~/")
            File.expand_path(cf)
          else
            cf
@@ -666,8 +669,9 @@ def print_filename_status_line cf=current_file
               date_format(File.stat(ff).mtime)
             end
   end
+  mtime = "| #{mtime} |" if mtime
   # print size and mtime only if more data requested.
-  print_on_right "| #{mtime} | #{cf}".rjust(40)
+  print_on_right "#{mtime}  #{cf}".rjust(40)
 end
 
 # should we do a read of the dir
@@ -698,7 +702,7 @@ def draw_directory
   buff = columnate @viewport, @grows
 
   # starts printing array on line 3
-  buff.each { |line| print line, "\n" }
+  buff.each { |line| print "\r", line, "\n" }
   print
 
   status_line
@@ -717,16 +721,14 @@ end
 # if CLEAR then we use original colors from get_formatted_filename.
 # Otherwise we need to use CURSOR_COLOR in place of current color
 def place_cursor color=CURSOR_COLOR
-  vps = @viewport.size
-
   # empty directory
-  if vps == 0
+  if @vps == 0
     tput_cup 0, 0
     return
   end
 
   c = @cursor - @sta
-  wid = get_width vps, @grows
+  wid = get_width @vps, @grows
   if c < @grows
     rows = c
     cols = 0
@@ -790,6 +792,7 @@ def resolve_binding key
   # split into binding and args
   x = x.split if x
   if x
+    redraw_required # trying here so default 2019-04-26 -
     binding = x.shift
     args = x
     send(binding, *args) if binding
@@ -849,6 +852,10 @@ end
 
 def set_bookmark key, dir=Dir.pwd
   @bookmarks[key] = dir
+  calculate_numeric_hotkeys
+end
+
+def calculate_numeric_hotkeys
   @hk = @bookmarks.select { |k, _| k.match?(/[0-9]/)  }.keys.sort.join('')
 end
 
@@ -878,8 +885,9 @@ def readable_file_size size, precision
 end
 
 ## format date for file given stat
-def date_format t
-  t.strftime '%Y/%m/%d %H:%M:%S'
+def date_format tim
+  # tim.strftime '%Y/%m/%d %H:%M:%S'
+  tim.strftime '%Y/%m/%d %H:%M'
 end
 
 ##
@@ -936,7 +944,7 @@ def truncate_formatted_filename f, unformatted_len, wid
 
       when :right
         # FIXME: 2019-04-23 - do we need the control code at end ??
-        f[0..wid - 3] + "$ "
+        f[0..wid - 3] + '$ '
 
       when :center
 
@@ -957,8 +965,6 @@ def truncate_formatted_filename f, unformatted_len, wid
         sindex = f.index ' '
         # 4 = 2 for literals, 2 to get ahead of sindex+1
         f[0..sindex + 1] + '<' + f[sindex + 4 + excess..-1] + ' '
-        # in some cases 29/32 we are actually overlapping 2 parts above
-        #  same for 34/32
       end
   return f
 end
@@ -971,13 +977,15 @@ def get_formatted_filename ix, wid
 
   ind = get_shortcut(ix)
   mark = get_mark(f)
+  # make visited files bold
+  bcolor = BOLD if mark == VMARK
   # Handle separator before enhanced file list.
   # We do lose a shortcut
   ind = cur = mark = '-' if f == SEPARATOR
   prefix = "#{ind}#{mark}#{cur}"
 
-  # fullname = f[0] == '~' ? File.expand_path(f) : f
-  color ||= color_for(f)
+  color = color_for(f)
+  color = "#{bcolor}#{color}"
 
   f = format_long_listing(f) if @long_listing
 
@@ -989,9 +997,9 @@ def get_formatted_filename ix, wid
   unformatted_len = f.length
   if unformatted_len > wid
     # take the excess out from the center on both sides
-    # TODO clear this up since no color info here
+
     f = truncate_formatted_filename(f, unformatted_len, wid)
-    f = "#{color}#{f}#{CLEAR}" if color
+    f = "#{color}#{f}#{CLEAR}" if color # NOTE clear not added if not color
 
   elsif unformatted_len < wid
 
@@ -1016,14 +1024,22 @@ def get_mark file
   return SPACE if @selected_files.empty? && @visited_files.empty?
 
   @current_dir ||= Dir.pwd
-  fullname = File.join(@current_dir, file)
+  # this crashes on filename that starts with a ~. 2019-05-04 -
+  fullname = if file.start_with?("~/")
+               File.expand_path(file)
+             else
+               File.join(@current_dir, file)
+             end
 
   return GMARK if selected?(fullname)
-  return '+' if visited? fullname
+  return VMARK if visited? fullname
+
+  # 2019-04-27 - this boldfaces visited files, but should only be done if color
+  #  otherwise it will overflow.
+  #  This was nice but it messes with width in multiple columns truncate
+  # return "#{BOLD}+" if visited? fullname
 
   SPACE
-  # cur = CURMARK if ix + @sta == @cursor # 2019-03-29 - removed reduced calls
-  # NOTE seems like f and ary[ix] are the same
 end
 
 def format_long_listing f
@@ -1034,7 +1050,7 @@ def format_long_listing f
     if File.exist? f
       stat = File.stat(f)
     elsif f[0] == '~'
-      stat = File.stat(File.expand_path(f))
+      stat = File.stat(expand_path(f))
     elsif File.symlink?(f)
       # dead link
       stat = File.lstat(f)
@@ -1043,10 +1059,11 @@ def format_long_listing f
       last = f[-1]
       stat = File.stat(f.chop) if last == ' ' || last == '@' || last == '*'
     end
+    # TODO select date_func from toggles
 
     f = format('%10s  %s  %s',
                readable_file_size(stat.size, 1),
-               date_format(stat.mtime),
+               date_format(stat.send(@date_func)),
                f)
 
   rescue StandardError => e
@@ -1060,7 +1077,8 @@ end
 # determine color for a filename based on extension, then pattern, then filetype
 def color_for f
   return nil if f == SEPARATOR
-  fname = f[0] == '~' ? File.expand_path(f) : f
+
+  fname = f.start_with?("~/") ? File.expand_path(f) : f
 
   extension = File.extname(fname)
   color = @ls_color[extension]
@@ -1155,6 +1173,7 @@ def parse_ls_colors
       # @log.debug "COLOR: ftype #{patt}"
     end
   end
+  # @log.debug "LSP: #{@ls_pattern.values}"
 end
 
 ## select file based on key pressed
@@ -1181,20 +1200,27 @@ end
 
 ## toggle selection state of file
 def toggle_select f=current_file
-  if selected? f
+  # if selected? File.join(@current_dir, current_file)
+  if selected? expand_path(current_file)
     remove_from_selection f
   else
     @selected_files.clear unless @multiple_selection
     add_to_selection f
   end
   message "#{@selected_files.count} files selected.   "
-  # XXX is it possible to just redraw this line
-  redraw_required
+
+  # 2019-04-24 - trying to avoid redrawing entire screen.
+  # If multiple_selection then current selection is either added or removed,
+  #  nothing else changes, so we redraw only if not multi. Also place cursor
+  #  i.e. redraw current row if mutliple selection
+  if @multiple_selection
+    redraw_required false
+    place_cursor
+  end
 end
 
 # allow single or multiple selection with C-s key
 def toggle_multiple_selection
-  # @multiple_selection = !@multiple_selection
   toggle_value :multiple_selection
 end
 
@@ -1202,7 +1228,7 @@ end
 def open_file f
   return unless f
 
-  f = File.expand_path(f) if f[0] == '~'
+  f = File.expand_path(f) if f.start_with?("~/")
   unless File.exist? f
     # this happens if we use (T) in place of (M)
     # it places a space after normal files and @ and * which borks commands
@@ -1228,7 +1254,7 @@ def open_file f
     system(comm.to_s)
     setup_terminal
     # XXX maybe use absolute_path instead of hardcoding
-    f = @current_dir + '/' + f if f[0] != '/'
+    f = expand_path(f)
     @visited_files.insert(0, f)
     push_used_dirs @current_dir
   else
@@ -1248,13 +1274,13 @@ end
 def edit_current
   command = ENV['EDITOR'] || ENV['VISUAL'] || 'vim'
   run_on_current command
-  @visited_files.insert(0, current_file)
+  @visited_files.insert(0, expand_path(current_file))
 end
 
 def open_current
   opener = /darwin/.match?(RUBY_PLATFORM) ? 'open' : 'xdg-open'
   run_on_current opener
-  @visited_files.insert(0, current_file)
+  @visited_files.insert(0, expand_path(current_file))
 end
 
 # run given command on current file
@@ -1262,7 +1288,7 @@ def run_on_current command
   f = current_file
   return unless f
 
-  f = File.expand_path(f)
+  f = expand_path(f)
   return unless File.readable?(f)
 
   f = Shellwords.escape(f)
@@ -1272,6 +1298,7 @@ def run_on_current command
   system(comm.to_s)
   push_used_dirs
   setup_terminal
+  redraw_required
 end
 
 ## run system command on given file/s
@@ -1321,7 +1348,7 @@ def change_dir f
   @visited_dirs.insert(0, Dir.pwd)
   save_dir_pos
 
-  f = File.expand_path(f)
+  f = expand_path(f)
   Dir.chdir f
   @current_dir = Dir.pwd # 2019-04-24 - earlier was in post_cd but too late
   read_directory
@@ -1344,7 +1371,6 @@ 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
@@ -1365,7 +1391,6 @@ end
 
 # put directories first, then files
 def group_directories_first
-  # return if cget(:group_directories) == :none
   return if @group_directories == :none
 
   files = @files
@@ -1388,6 +1413,7 @@ end
 ## select all entries (files and directories)
 def select_all
   dir = Dir.pwd
+  # check this out with visited_files TODO FIXME
   @selected_files = @view.map { |file| File.join(dir, file) }
   message "#{@selected_files.count} files selected."
 end
@@ -1411,7 +1437,7 @@ def goto_dir
   ensure
     # print "\e[?25l"
   end
-  f = File.expand_path(path)
+  f = expand_path(path)
   unless File.directory? f
     ## check for env variable
     tmp = ENV[path]
@@ -1464,14 +1490,18 @@ 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.
+# Goes to directory bookmarked with number or char.
 def goto_bookmark key=nil
   unless key
     clear_last_line
-    print 'Enter bookmark char: '
+    print 'Enter bookmark char (? to view): '
     key = get_char
   end
+  if key == '?'
+    view_bookmarks
+    return
+  end
+
   d = @bookmarks[key]
   if d
     change_dir d
@@ -1481,10 +1511,10 @@ def goto_bookmark key=nil
 end
 
 ## take regex from user, to run on files on screen, user can filter file names
-def ask_regex
-  @title = 'Search Results: (Press Escape to cancel)'
+def filter_files_by_pattern
+  @title = 'Search Results: (Press Esc to cancel)'
   @mode = 'SEARCH'
-  if cget(:instant_search)
+  if @toggles[:instant_search]
     search_as_you_type
   else
     @patt = readline '/'
@@ -1512,6 +1542,7 @@ end
 def goto_top
   @sta = @cursor = 0
   @old_cursor = nil
+  redraw_required
 end
 
 # goto end / bottom
@@ -1519,32 +1550,40 @@ def goto_end
   @cursor = @view.size - 1
   @sta = @view.size - @pagesize
   @old_cursor = nil
+  redraw_required
 end
 
 def print_help
   page_with_tempfile do |file|
-    file.puts '    HELP'
+    file.puts %(
+    #{REVERSE}             HELP                           #{CLEAR}
 
-    file.puts
-    file.puts 'To open a file or dir, press a-z A-Z (shortcut on left of file)'
-    file.puts 'Ctrl-s to select file under cursor. * for multiple select.'
-    file.puts 'Ctrl-Space: Enter and exit Visual Selection mode'
-    file.puts 'Ctrl-x: file actions for selected files, or file under cursor'
-    file.puts '1-9: bookmark a dir, and go to it.'
+    Tilde (`) is the main menu key. Many important operations are
+    available through it, or through its sub-menus.
 
-    file.puts 'Use left and right arrows to move through directories'
-    file.puts
+    To open a file or dir, press a-z A-Z (shortcut on left of file)
+    Ctrl-s to select file under cursor. * for multiple select.
+    Ctrl-Space: Enter and exit Visual Selection mode
+    Ctrl-x: file actions for selected files, or file under cursor
+    1-9: bookmark a dir, and go to it.
+
+    Use left and right arrows to move through directories
+
+    )
     ary = []
     # 2019-03-19 -  if : then show text after colon
     @bindings.each_pair do |k, v|
       vv = v.tr('_', ' ')
       vv = vv.split(':')[1].strip if vv.include?(':')
-      ary.push "#{k.ljust(7)}  =>  #{vv}"
+      ary.push "   #{k.ljust(7)}  =>  #{vv}"
     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
+    # next line no longer working.
+    # ary = columnate ary, (ary.size / 2) + 1
     ary.each { |line| file.puts line }
+    # TODO: 2019-04-26 - add other hashes for other menus here ?
+    # but those hashes are not available
   end
 end # print_help
 
@@ -1601,7 +1640,7 @@ def debug_vars
     file.puts "sta    #{@sta}"
     file.puts "cursor #{@cursor}"
     file.puts "stact  #{@stact}"
-    file.puts "viewport.size  #{@viewport.size}"
+    file.puts "viewport.size  #{@vps}"
     file.puts "pagesize       #{@pagesize}"
     file.puts "view.size      #{@view.size}"
     file.puts "grows          #{@grows}"
@@ -1627,40 +1666,51 @@ def view_bookmarks
 end
 
 # MENU MAIN
+# maybe a list menu - options for date format, size format, age, truncate_from, inode etc
 def main_menu
   h = {
-    :a => :ag,
-   '/' => :ffind,
-    :l => :locate,
-    :v => :vidir,
-    :z => :z_interface,
-    :d => :child_dirs,
-    :r => :recent_files,
-   '1' => :select_from_visited_files,
-   '2' => :select_from_used_dirs,
-   '3' => :list_selected_files,
-    :t => :dirtree,
-   '4' => :tree,
-    :o => :order_menu,
-    :F => :filter_menu,
-    :c => :create_menu,
-    :b => :bookmark_menu,
-    :s => :selection_menu,
-    :x => :extras
-  }
+    a: :ag,
+    z: :z_interface,
+    # f: :file_actions,
+    b: :bookmark_menu,
+    c: :create_menu,
+    f: :filter_menu,
+    o: :order_menu,
+    s: :selection_menu,
+    t: :toggle_menu,
+    v: :view_menu,
+    '`' => :goto_parent_dir,
+    x: :extras
+   }
   menu 'Main Menu', h
 end
 
+# if menu options returns a hash, then treat as another level menu and process
+#  rather than having to create more of these. but these can be called directly too.
+def view_menu
+  h = {
+    f: :select_from_visited_files,
+    d: :select_from_used_dirs,
+    b: :view_bookmarks,
+    s: :list_selected_files,
+    c: :child_dirs,
+    r: :recent_files,
+    t: :tree,
+    e: :dirtree
+  }
+  menu 'View Menu', h
+end
+
 # copy and move here ?
 def selection_menu
   h = {
-    :a => :select_all,
-    :u => :unselect_all,
-    :s => :toggle_select,
-    '*' => 'toggle_multiple_selection',
-    'x' => 'toggle_visual_mode',
-    'm' => 'toggle_selection_mode',
-    :v => :view_selected_files
+    a: :select_all,
+    u: :unselect_all,
+    s: :toggle_select,
+   '*' => 'toggle_multiple_selection',
+   'x' => 'toggle_visual_mode',
+   'm' => 'toggle_selection_mode',
+    v: :view_selected_files
   }
   menu 'Selection Menu', h
 end
@@ -1689,13 +1739,22 @@ def menu title, h
   #  binding in brackets
   h.each_pair do |k, v|
     # get global binding
-    scut = @bindings.key(v.to_s)
+    vs = v.to_s
+    scut = @bindings.key(vs)
     scut = " (#{scut})" if scut
 
-    ary << " #{k}: #{v} #{scut}"
+    # ary << " #{k}: #{v} #{scut}"
+    vs = vs.sub('_menu', '...') if vs.end_with?('_menu')
+    vs = vs.tr('_', ' ')
+    ary << " [#{k}] #{vs} #{scut}"
   end
   x = ary.join("\n")
-  puts `echo "#{x}" | column`
+  # echo column line bombs when x contains a single quote.
+  # If i double quote it then it bombs with double quote or backtick
+  #  and prints the entire main menu two times.
+  x = x.gsub("'", 'single quote')
+  # x = x.gsub("`", "back-tick")
+  puts `echo '#{x}' | column`
 
   key = get_char
   binding = h[key]
@@ -1712,46 +1771,6 @@ def menu title, h
   [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: :show_hidden,
-        c: :ignore_case,
-        l: :long_listing,
-        '1' => :toggle_columns,
-        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,
-        i: :instant_search,
-        H: :highlight_row_flag }
-  # TODO: add other values at end, what key ?
-
-  _, menu_text = menu 'Toggle Menu', h
-  return unless menu_text
-
-  # menu would have called if symbol only responds so return.
-  return if respond_to?(menu_text, true) # already handled
-
-  # 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
@@ -1778,7 +1797,7 @@ end
 
 def toggle_long_listing
   toggle_value :long_listing
-  @long_listing = cget(:long_listing)
+  @long_listing = @toggles[:long_listing]
   if @long_listing
     @saved_gviscols = @gviscols
     @gviscols = 1
@@ -1792,64 +1811,48 @@ def toggle_long_listing
     @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
+  message "Long listing is #{@long_listing}, date_func is #{@date_func}. 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
+  x = @toggles[flag] = !@toggles[flag]
   if instance_variable_defined? "@#{flag}"
-    instance_variable_set "@#{flag}", @toggles[flag]
-    @log.debug "instance_variable_set #{flag}, #{@toggles[flag]}"
+    instance_variable_set "@#{flag}", x
+    @log.debug "instance_variable_set #{flag}, #{x}"
   end
-  message "#{flag} is set to #{@toggles[flag]}"
+  message "#{flag} is set to #{x}"
 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
+  hash = @options[symb]
+  curr = hash[:current]
+  index = hash[: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]
+  index = 0 if index >= hash[:values].count
+  x = hash[:current] = hash[:values][index]
+  var = hash[:var]
   instance_variable_set "@#{var}", x if var
-  message "#{symb} is set to #{@options[symb][:current]}. "
+  message "#{symb} is set to #{x}. "
 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
+  return if symb.nil? || symb == :''
+
   if @toggles.key? symb
     toggle_value symb
-    rescan_required
-    return true
-  end
-  if @options.key? symb
+  elsif @options.key? symb
     rotate_value symb
-    rescan_required
-    return true
+  else
+    @log.warn "CSET: #{symb} does not exist. Please check code."
+    raise ArgumentError, "CSET: (#{symb}) does not exist. Please check code."
   end
-
-  @log.warn "CSET: #{symb} does not exist. Please check code."
-  raise ArgumentError, "CSET: #{symb} does not exist. Please check code."
+  rescan_required
+  return true
 end
 # ----------------- end of flag related functions ----------------------------#
 
@@ -1887,6 +1890,8 @@ def order_menu
     lo = '/'
   when :clear
     lo = ''
+  else
+    return
   end
   ## This needs to persist and be a part of all listings, put in change_dir.
   @sorto = lo
@@ -1903,74 +1908,26 @@ def create_menu
   _, menu_text = menu 'Create Menu', h
 end
 
-# thse need to be placed in correct position, some do nothing
-#  and some like ffind have no menu item
-# TODO FIXME uncalled now. look into this
-def command_menu
-  #  since these involve full paths, we need more space, like only one column
-  ## in these cases, getting back to the earlier dir, back to earlier listing
-  # since we've basically overlaid the old listing
-  # should be able to sort THIS listing and not rerun command. But for that I'd need to use
-  # xargs ls -t etc rather than the zsh sort order. But we can run a filter using |.
-  #
-  h = { t: :today, D: :default_command, R: :remove_from_list,
-        v: :view_selected_files }
-  h[:e] = if @editor_mode
-            :pager_mode
-          else
-            :editor_mode
-          end
-  _, menu_text = menu 'Command Menu', h
-  case menu_text
-  when :pager_mode
-    @editor_mode = false
-    @default_command = ENV['MANPAGER'] || ENV['PAGER']
-  when :editor_mode
-    @editor_mode = true
-    @default_command = nil
-  when :ffind
-    ffind
-  when :locate
-    locate
-  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"
-  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 != ''
-      print 'Second part of command (maybe blank): '
-      @default_command2 = gets.chomp
-    else
-      print 'Cleared default command, will default to $EDITOR'
-      @default_command2 = nil
-      @default_command = nil
-    end
-  end
-  # redraw
-end
-
 # This is quite badly placed and named. Maybe these should go elsewhere
 def extras
-  h = { '1' => :one_column,
-        '2' => :multi_column,
-        c: :columns,
-        s: :scripts,
-        g: :generators,
-        B: :bindkey_ext_command,
-        f: :page_flags,
-        r: :config_read,
-        w: :config_write }
+  h = {
+    '1' => :one_column,
+    '2' => :multi_column,
+    c: :columns,
+    s: :scripts,
+    g: :generators,
+    B: :bindkey_ext_command,
+    f: :page_flags,
+    R: :remove_from_list,
+    v: :vidir,
+    r: :config_read,
+    w: :config_write
+  }
   key, menu_text = menu 'Extras Menu', h
   case menu_text
   when :one_column
     @pagesize = @grows
   when :multi_column
-    # @pagesize = 60
     @pagesize = @grows * @gviscols
   when :columns
     print "How many columns to show: 1-6 [current #{@gviscols}]? "
@@ -1984,8 +1941,11 @@ def extras
 end
 
 def filter_menu
-  h = { :d => :dirs, :f => :files, :e => :emptydirs, '0' => :emptyfiles,
-        :r => :reduce_list, :x => :extension }
+  h = { d: :dirs, f: :files,
+        e: :emptydirs, '0' => :emptyfiles,
+        r: :recent_files,
+        a: :reduce_list,   # key ??? XXX
+        x: :extension }
   _, menu_text = menu 'Filter Menu', h
   files = nil
   case menu_text
@@ -2013,11 +1973,18 @@ def filter_menu
     files = reduce
   when :extension
     files = filter_for_current_extension
+  when :recent_files
+    # files = recent_files
+    @title = 'Filter: files by mtime'
+    files = get_files_by_mtime.first(10)
+  else
+    return
   end
   if files && files.count > 0
     @files = files
     @stact = 0
     @message = "Filtered on #{menu_text}. Press ESC to return."
+    @bm = ' (' + @bindings.key('filter_menu') + ') '
   else
     perror 'Sorry, No files. '
     @title = nil
@@ -2026,11 +1993,11 @@ end
 
 def reduce pattern=nil
   unless pattern
-    last_line 'Enter a pattern to reduce current list: '
-    pattern = gets.chomp
+    pattern = readline 'Enter a pattern to reduce current list: '
   end
   @title = "Filter: pattern #{pattern}"
-  @files = @files.select { |f| f.match(pattern) }
+  @bm = "(%r)"
+  @files = @files.select { |f| f.match?(pattern) }
 end
 
 def filter_for_current_extension
@@ -2044,19 +2011,18 @@ def select_from_used_dirs
   @title = 'Used Directories'
   home = File.expand_path '~'
   @files = @used_dirs.uniq.map { |path| path.sub(home.to_s, '~') }
+  @bm =  @bindings.key('select_from_used_dirs')
+  @bm = ' (' + @bm + ')' if @bm
+  # redraw_required
 end
 
 def select_from_visited_files
-  # not yet a unique list, needs to be unique and have latest pushed to top
   @title = 'Visited Files'
   home = File.expand_path '~'
   @files = @visited_files.uniq.map { |path| path.sub(home.to_s, '~') }
-end
-
-# maybe unused ??? XXX
-def select_bookmarks
-  @title = 'Bookmarks'
-  @files = @bookmarks.values
+  @bm = @bindings.key('select_from_visited_files')
+  @bm = ' (' + @bm + ')' if @bm
+  # redraw_required
 end
 
 ## part copied and changed from change_dir since we don't dir going back on top
@@ -2069,6 +2035,7 @@ def pop_dir
   ## XXX make sure the dir exists, cuold have been deleted. can be an error or crash otherwise
   @visited_dirs.push d
   Dir.chdir d
+  @current_dir = Dir.pwd # 2019-04-24 - earlier was in post_cd but too late
   post_cd
   rescan_required
 end
@@ -2079,6 +2046,7 @@ def post_cd
   @sta = @cursor = @stact = 0
   @visual_block_start = nil
   screen_settings
+  calculate_bookmarks_for_dir
 
   # goto last position cursor was in this dir
   revert_dir_pos
@@ -2172,37 +2140,31 @@ end
 # Was this supposed to be augmented, or just remain limited like this
 # We should be able to do everything in the menus from here. TODO
 def subcommand
-  last_line
-  print 'Enter command: q x wq p w e r h '
+  # clear_last_line
+  # pbold 'Subcommand:'
   begin
-    command = readline
+    prompt = %(
+    [q]  quit                              [w]   config write              [d] delete
+    [x]  update config + quit              [r]   config read               [r] rename
+    [wq] write config + quit               [e]   edit file under cursor    [m] move
+    [P]  copy PWD to clipboard             [o]   open file under cursor    [c] copy
+    [p]  copy filename to clipboard        [h]   help                      [t] toggle flags
+    )
+    # command = readline 'Enter command: q x wq P p w e r h :'
+    command = readline prompt
     return if command == ''
   rescue StandardError
     return
   end
   if command == 'q'
-    # FIXME: 2019-03-22 - should this not call quit_command ?
-    if @modified
-      last_line
-      print 'Do you want to save bookmarks? (y/n): '
-      key = get_char
-      if key == 'y'
-        @writing = true
-        @quitting = true
-      elsif key == 'n'
-        @quitting = true
-        print 'Quitting without saving bookmarks'
-      else
-        perror 'No action taken.'
-      end
-    else
-      @quitting = true
-    end
+    quit_command
   elsif command == 'wq'
     @quitting = true
     @writing = true
   elsif command == 'w'
     config_write
+  elsif command == 'r'
+    config_read
   elsif command == 'x'
     @quitting = true
     @writing = true if @modified
@@ -2210,16 +2172,66 @@ def subcommand
     edit_current
   elsif command == 'o'
     open_current
-  elsif (command == 'h') || (command == 'help') || (command == '?')
+  elsif command == 'd'
+    delete_file
+  elsif command == 'c'
+    copy_file
+  elsif command == 'r'
+    rename_file
+  elsif command == 'm'
+    move_file
+  elsif command == 'h' || command == 'help' || command == '?'
     print_help
-  elsif command == 'p'
+  elsif command == 'P'
+    # or should be put current file in clip ?
     system 'echo $PWD | pbcopy'
-    puts 'Stored PWD in clipboard (using pbcopy)'
+    message 'Stored PWD in clipboard (using pbcopy)'
+  elsif command == 'p'
+    system "echo #{current_file} | pbcopy"
+    message "Stored #{current_file} in clipboard (using pbcopy)"
+  elsif command == 't' || command == 'toggle'
+    toggle_menu
   else
     perror "Don't know about command #{command}. Try :h or :help"
   end
 end
 
+# 2019-03-08 - 23:46
+# FIXME returns a String not symbol, so some callers can fail
+def fzfmenu(title, h)
+  return unless h
+
+  pbold title.to_s
+  # XXX using keys not values since toggle hash being used
+  values = h.keys.join("\n")
+  binding = `echo "#{values}" | fzf --prompt="#{title.to_s} :"`
+  if binding
+    binding = binding.chomp
+    send(binding) if respond_to?(binding, true)
+  end
+  binding
+end
+
+def toggle_menu
+  binding = fzfmenu 'Toggles', @toggles.merge(@options)
+  return if binding.nil? || binding == ''
+
+  menu_text = binding.to_sym
+  return if respond_to?(menu_text, true) # already handled
+
+  # 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 quit_command
   # if we are in some mode, like search results then 'q' should come out.
   if @mode
@@ -2248,6 +2260,7 @@ def views
   @viewctr = 0 if @viewctr > views.size
 
   @files = `zsh -c 'print -rl -- *(#{@sorto}#{@hidden}M)'`.split("\n")
+  redraw_required
 end
 
 def child_dirs
@@ -2340,7 +2353,7 @@ def get_shortcut index
   # Now we show unused shortcuts after exhausting them.
   # return '<' if index < @stact
   if index < @stact
-    index = @viewport.size - @stact + index
+    index = @vps - @stact + index
     i = IDX[index]
     return i if i
 
@@ -2387,22 +2400,21 @@ def convert_key_to_index key
   i = IDX.index(key)
   return nil unless i
 
-  # @log.debug "get_index with #{key}: #{i}. #{@stact}. #{@viewport.size}"
-  vps = @viewport.size
+  # @log.debug "get_index with #{key}: #{i}. #{@stact}. #{@vps}"
   # 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
+  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
+  # 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
+  return (i + @stact) - @vps if i + @stact >= @vps
 
   # regular hint
   return i + @stact # if i
@@ -2544,7 +2556,7 @@ def get_unique_file_name fname
     return f unless File.exist?(f)
   end
 
-  timestamp = Time.now.strftime("%Y%m%d-%H%M%S")
+  timestamp = Time.now.strftime('%Y%m%d-%H%M%S')
   return fname + '.' + timestamp
 end
 
@@ -2630,6 +2642,7 @@ end
 
 # instantly move to move target. Use during bulk operations so you don't have to
 # enter or goto target dir and come back.
+# XXX try removing this, making things complex.
 def move_instant
   # FIXME: cannot be in target directory and do auto update
   # should we have a key for specifying move_target ?
@@ -2691,7 +2704,7 @@ def command_file prompt, *command
   perror 'Command Cancelled' unless file
   return unless file
 
-  file = File.expand_path(file)
+  file = expand_path(file)
   if File.exist? file
     file = Shellwords.escape(file)
     pbold "#{command} #{file} (#{pauseyn})"
@@ -2711,7 +2724,7 @@ def ask_hint deflt=nil
   key = get_char
   return deflt if key == 'ENTER'
 
-  ix = get_index(key, @viewport.size)
+  ix = get_index(key, @vps)
   f = @viewport[ix] if ix
   f
 end
@@ -2739,11 +2752,11 @@ def column_next direction=0
   # leftward movement stops at first column.
   if direction == 0
     @stact += @grows
-    @stact = 0 if @stact >= @viewport.size
+    @stact = 0 if @stact >= @vps
     @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 = 0 if @cursor >= @vps
+    if @cursor - @sta >= @vps
       @cursor -= @grows while @cursor > @sta
       @stact -= @grows while @stact > 0
       @cursor += @grows if @cursor < @sta
@@ -2764,18 +2777,27 @@ end
 # 2019-03-08 - TODO when a file name changes or moves it must be removed
 #  from selection
 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_current }
+  h = {
+    d: :delete,
+    D: '/bin/rm',
+    m: :move,
+    c: :copy,
+    r: :rename,
+    e: :execute,
+    v: ENV['EDITOR'] || :vim,
+    o: :open_current,
+    p: :most
+  }
 
   rbfiles = current_or_selected_files # use with ruby FileUtils
   return if rbfiles.nil? || rbfiles.empty?
 
   count = rbfiles.count
   first = rbfiles.first
+
+  h.delete(:r) if count > 1
+
   if count == 1
-    h[:r] = :rename
 
     # add chdir if dir of file under cursor is not same as current dir
     h[:C] = :chdir if File.dirname(File.expand_path(first)) != Dir.pwd
@@ -2795,6 +2817,8 @@ def file_actions action=nil
   end
   h[:M] = :set_move_target if File.directory?(current_file)
   h[:z] = :zip unless filetype(first) == :zip
+  h['/'] = :ffind
+  h[:l] = :locate
 
   # if first file has spaces then add remspace method
   # TODO: put this in scripts
@@ -2840,10 +2864,6 @@ def file_actions action=nil
     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
     change_dir File.dirname(File.expand_path(rbfiles.first)) if count == 1
 
   when :set_move_target
@@ -2865,6 +2885,8 @@ def file_actions action=nil
     1
     # already been executed by menu
     # We could have just put 'stat' in the menu but that doesn't look so nice
+  when :locate
+    1
   else
     return unless menu_text
 
@@ -2887,13 +2909,13 @@ 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 = expand_path(x); File.exist?(x) }
 end
 
 # set the default target for further moves
 # We need to also be able to set it to current dir in which user is. TODO
 def set_move_target cf=current_file
-  ff = File.expand_path(cf)
+  ff = expand_path(cf)
   return unless File.directory? ff
 
   @move_target = ff
@@ -2973,18 +2995,19 @@ def ffind
 end
 
 def locate
-  print 'Enter a file name pattern to locate: '
-  pattern = readline
+  @locate_command ||= /darwin/.match?(RUBY_PLATFORM) ? 'mdfind -name' : 'locate'
+  pattern = readline "Enter a file name pattern to #{@locate_command}: "
   return if pattern == ''
 
-  @title = "Files found using 'locate' #{pattern}"
-  files = `locate #{pattern}`.split("\n")
-  files.select! { |x| x = File.expand_path(x); File.exist?(x) }
+  @title = "Files found using: (#{@locate_command} #{pattern})"
+  files = `#{@locate_command} #{pattern}`.split("\n")
+  files.select! { |x| x = expand_path(x); File.exist?(x) }
   if files.empty?
     perror 'No files found.'
-  else
-    @files = files
+    return
   end
+  @files = files
+  @bm = nil
 end
 
 ##  takes directories from the z program, if you use autojump you can
@@ -3065,7 +3088,7 @@ def move_to position
   oldsta = @sta
   if @cursor - @sta >= @pagesize
     @sta += @pagesize
-    # elsif @sta - @cursor >= @viewport.size
+    # elsif @sta - @cursor >= @vps
   end
   if @sta > @cursor
     @sta -= @pagesize
@@ -3082,7 +3105,8 @@ def move_to position
   @cursor_movement = nil # visual mode needs to redraw page
 
   # PWD has to be there in selction
-  if selected? current_file
+  # FIXME with visited_files
+  if selected? File.join(@current_dir, current_file)
     # this depends on the direction
     # @selected_files = @selected_files - @view[star..fin]
     remove_from_selection @view[star..fin]
@@ -3104,6 +3128,8 @@ end
 # ------------- selection related methods --------------------------------#
 
 # is given file in selected array
+# 2019-04-24 - now takes fullname so path addition does not keep happening in
+#  a loop in draw directory.
 def selected? fullname
   return @selected_files.index fullname
 end
@@ -3117,7 +3143,9 @@ def add_to_selection file
   end
   @current_dir ||= Dir.pwd
   ff.each do |f|
-    full = File.join(@current_dir, f)
+    # this is wrong if the file is a dir listing or visited files listing.
+    # full = File.join(@current_dir, f)
+    full = expand_path(f)
     @selected_files.push(full) unless @selected_files.include?(full)
   end
 end
@@ -3130,7 +3158,8 @@ def remove_from_selection file
   end
   @current_dir ||= Dir.pwd
   ff.each do |f|
-    full = File.join(@current_dir, f)
+    # full = File.join(@current_dir, f)
+    full = expand_path(f)
     @selected_files.delete full
   end
 end
@@ -3290,7 +3319,7 @@ def create_a_file
 
   system %($EDITOR "#{str}")
   setup_terminal
-  @visited_files.insert(0, str) if File.exist?(str)
+  @visited_files.insert(0, expand_path(str)) if File.exist?(str)
   refresh
 end
 
@@ -3338,6 +3367,7 @@ def scripts binding=nil
 
   # reset clears the screen, we don't want that. just unhide cursor and echo keys TODO
   partial_reset_terminal
+  @log.info "Calling #{binding}."
   system %( #{binding} "#{current_file}" )
 
   # system %(echo "#{cf}" | xargs #{binding})
@@ -3400,6 +3430,9 @@ end
 def list_selected_files
   @title = 'Selected Files'
   @files = @selected_files
+
+  @bm =  @bindings.key('list_selected_files')
+  @bm = ' (' + @bm + ')' if @bm
 end
 
 # write selected files to a file and return path
@@ -3410,7 +3443,7 @@ def write_selected_files
   # fname = File.join(File.dirname(CONFIG_FILE), 'selected_files')
   # 2019-04-10 - changed to ~/tmp otherwise confusion about location
   fname = File.join('~/tmp/', 'selected_files')
-  fname = File.expand_path(fname)
+  fname = expand_path(fname)
 
   # remove file if no selection
   if @selected_files.empty?
@@ -3439,40 +3472,36 @@ end
 ##
 # Editing of the User Dir List.
 # remove current entry from used dirs list, since we may not want some entries being there
-#
+# Need to call this from somewhere. Test it out again.
+# Usage. Invoke `1` or `2` and select some files and then call remove
 def remove_from_list
-  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) }
 
-    @used_dirs = @used_dirs - arr
-    @visited_files = @visited_files - arr
-    unselect_all
-    @modified = true
-    refresh
-    return
-  end
-
-  # no file selected, use file under cursor
-  print
-  ## what if selected some rows
-  file = @view[@cursor]
-  print "Remove #{file} from used list (y)?: "
+  # XXX key to invoke this is difficult. make it easier
+  selfiles = current_or_selected_files
+  sz = selfiles.size
+  print "Remove #{sz} files from used list (y)?: "
   key = get_char
   return if key != 'y'
 
-  file = File.expand_path(file)
-  if File.directory? file
-    @used_dirs.delete(file)
+  # arr = @selected_files.map { |path| File.expand_path(path) }
+  # @log.debug "BEFORE: Selected files are: #{@selected_files}"
+  arr = selfiles.map { |path|
+    if path[0] != '/'
+      expand_path(path)
+    else
+      path
+    end
+  }
+  if File.directory? arr.first
+    @used_dirs -= arr
+    select_from_used_dirs
   else
-    @visited_files.delete(file)
+    @visited_files -= arr
+    select_from_visited_files
   end
-  refresh
+  unselect_all
   @modified = true
+  # redraw_required
 end
 
 #
@@ -3482,7 +3511,6 @@ 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 cget(:enhanced_mode)
   return unless @enhanced_mode
   @current_dir ||= Dir.pwd
 
@@ -3703,7 +3731,13 @@ def gfb dir, func
   dir = dir.gsub('//', '/')
 
   # sort by time and then reverse so latest first.
-  sorted_files = Dir[dir].sort_by { |f| File.send(func, f) }.reverse
+  sorted_files = Dir[dir].sort_by { |f|
+      if File.exist? f
+        File.send(func, f)
+      else
+        sys_stat(func, f)
+      end
+  }.reverse
 
   # add slash to directories
   sorted_files = add_slash sorted_files
@@ -3789,12 +3823,25 @@ def only_cursor_moved flag=true
   @cursor_movement = flag
 end
 
+# Had to create this since ruby crashes on files start with '~'
+def expand_path file
+  return File.expand_path(file) if file.start_with?("~/")
+  return file if file[0] == '/'
+
+  return File.join(@current_dir, file)
+end
+
 # main loop which calls all other programs
 def run
   Signal.trap('EXIT') do
     reset_terminal
     exit
   end
+  Signal.trap('WINCH') do
+    screen_settings
+    redraw
+    place_cursor
+  end
 
   setup_terminal
   config_read