vimamsa 0.1.6 → 0.1.9

data/lib/vimamsa/easy_jump.rb

@@ -9,7 +9,6 @@ class EasyJump
   end
 
   def initialize()
-    # message "EASY JUMP"
     visible_range = get_visible_area()
     visible_text = buf[visible_range[0]..visible_range[1]]
     wsmarks = scan_word_start_marks(visible_text)
@@ -17,12 +16,24 @@ class EasyJump
     lsh = Hash[line_starts.collect { |x| [x, true] }]
     wsmh = Hash[wsmarks.collect { |x| [x, true] }]
 
+    # Exclude work starts that are too close to start of line
     wsmarks.select! { |x|
       r = true
       r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
       r
     }
 
+    # Exclude those word start positions that are too close to each other
+    wsmarks.sort!
+    wsm2 = [wsmarks[0]]
+    for i in 1..(wsmarks.size - 1)
+      if (wsmarks[i] - wsm2[-1]) >= 4 or visible_text[wsm2[-1]..wsmarks[i]].include?("\n")
+
+        wsm2 << wsmarks[i]
+      end
+    end
+    wsmarks = wsm2
+
     linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
     wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
 
@@ -41,12 +52,12 @@ class EasyJump
   def easy_jump_input_char(c, event_type)
     return true if event_type != :key_press
     # vma.paint_stack = []
-    puts "EASY JUMP: easy_jump_input_char [#{c}]"
+    debug "EASY JUMP: easy_jump_input_char [#{c}]"
     @easy_jump_input << c.upcase
     if @jump_sequence.include?(@easy_jump_input)
       jshash = Hash[@jump_sequence.map.with_index.to_a]
       nthword = jshash[@easy_jump_input]
-      puts "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
+      debug "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
       buf.set_pos(@easy_jump_wsmarks[nthword])
       # @kbd.set_mode(:command)
       vma.kbd.remove_keyhandling_override
@@ -63,25 +74,11 @@ class EasyJump
   end
 
   def easy_jump_draw()
-    # puts @jump_sequence.inspect
-    # puts @easy_jump_wsmarks.inspect
     vma.gui.start_overlay_draw
     for i in 0..(@easy_jump_wsmarks.size - 1)
-      vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i])
+      vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i]) 
     end
     vma.gui.end_overlay_draw
-
-    return
-    return if @jump_sequence.empty?
-    puts "EASY JUMP DRAW"
-    screen_cord = cpp_function_wrapper(0, [@easy_jump_wsmarks])
-    screen_cord = screen_cord[1..@jump_sequence.size]
-    screen_cord.each_with_index { |point, i|
-      mark_str = @jump_sequence[i]
-      #puts "draw #{point[0]}x#{point[1]}"
-      draw_text(mark_str, point[0] + 3, point[1])
-      #break if m > @cpos
-    }
   end
 
   def make_jump_sequence(num_items)
@@ -158,8 +155,6 @@ class EasyJump
       }
     }
 
-    #printf("Size of sequence: %d\n",sequence.size)
-    #puts sequence.inspect
     return sequence
   end
 end

data/lib/vimamsa/editor.rb

@@ -1,16 +1,23 @@
 require "pty"
 
-def exec_in_terminal(cmd)
-  # puts "CMD:#{cmd}"
+def exec_in_terminal(cmd, autoclose = false)
+  # debug "CMD:#{cmd}"
 
   # global to prevent garbage collect unlink
   $initf = Tempfile.new("bashinit")
-  # puts $initf.path
+  # debug $initf.path
   $initf.write(cmd)
-  $initf.write("rm #{$initf.path}\n")
-  $initf.write("\nexec bash\n")
+  if autoclose
+    $initf.write("\nsleep 10; exit;\n")
+    $initf.write("rm #{$initf.path}\n")
+  else
+    $initf.write("rm #{$initf.path}\n")
+    $initf.write("\nexec bash\n")
+  end
   $initf.close
   # PTY.spawn("gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash")
+  # fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
+  # Just another execution
   fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
 end
 
@@ -26,11 +33,11 @@ end
 
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui
-  attr_accessor :converters, :fh, :paint_stack, :kbd 
+  attr_accessor :converters, :fh, :paint_stack, :kbd
   #attr_writer :call_func, :update_highlight
 
   def initialize()
-    # Thread.new{10000.times{|x|sleep(3);10000.times{|y|y+2};puts "FOOTHREAD #{x}"}}
+    # Thread.new{10000.times{|x|sleep(3);10000.times{|y|y+2};debug "FOOTHREAD #{x}"}}
 
     # Search for content inside files (e.g. using ack/grep) in:
     @file_content_search_paths = []
@@ -42,7 +49,6 @@ class Editor
     @converters = {}
     @paint_stack = []
     @_plugins = {}
-
   end
 
   def open_file_listener(added)
@@ -64,13 +70,6 @@ class Editor
   end
 
   def start
-    # $highlight = {}
-
-    # GLib::Idle.add
-    # Ripl.start :binding => binding
-    # GLib::Idle.add(proc{ puts "IDLEFUNC"})
-    # GLib::Idle.add(proc { idle_func })
-
     @gui = $vmag #TODO
 
     $hook = Hook.new
@@ -89,28 +88,39 @@ class Editor
     # build_key_bindings_tree
     @kbd = KeyBindingTree.new()
     $kbd = @kbd
-    $kbd.add_mode("C", :command)
-    $kbd.add_mode("I", :insert)
-    $kbd.add_mode("V", :visual)
-    $kbd.add_mode("M", :minibuffer)
-    $kbd.add_mode("R", :readchar)
-    $kbd.add_mode("B", :browse)
-    $kbd.set_default_mode(:command)
+    @kbd.add_mode("C", :command)
+    @kbd.add_mode("I", :insert)
+    @kbd.add_mode("V", :visual)
+    @kbd.add_mode("M", :minibuffer)
+    @kbd.add_mode("R", :readchar)
+    @kbd.add_mode("B", :browse)
+    @kbd.set_default_mode(:command)
+    @kbd.set_mode(:command)
+    @kbd.show_state_trail
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
 
     FileManager.init
+    BufferManager.init
 
     mkdir_if_not_exists("~/.vimamsa")
     mkdir_if_not_exists("~/.vimamsa/backup")
     mkdir_if_not_exists("~/.vimamsa/listen")
     listen_dir = File.expand_path "~/.vimamsa/listen"
     listener = Listen.to(listen_dir) do |modified, added, removed|
-      puts(modified: modified, added: added, removed: removed)
+      debug([modified: modified, added: added, removed: removed])
       open_file_listener(added)
     end
     listener.start
 
+    custom_fn = File.expand_path("~/.vimamsa/custom.rb")
+    if !File.exist?(custom_fn)
+      example_custom = IO.read(ppath("custom_example.rb"))
+      IO.write(custom_fn, example_custom)
+    end
+
+    mkdir_if_not_exists("~/.vimamsa/custom.rb")
+
     $cnf[:theme] = "Twilight_edit"
     $cnf[:syntax_highlight] = true
     settings_path = get_dot_path("settings.rb")
@@ -125,6 +135,9 @@ class Editor
 
     dotfile = read_file("", "~/.vimamsarc")
     eval(dotfile) if dotfile
+    
+    custom_script = read_file("", custom_fn)
+    eval(custom_script) if custom_script
 
     # build_options
 
@@ -134,6 +147,8 @@ class Editor
       if File.exist?(fname_)
         fname = fname_
       end
+    else
+      fname = ppath("demo.txt")
     end
     fname = ARGV[0] if ARGV.size >= 1 and File.file?(File.expand_path(ARGV[0]))
     # vma.add_content_search_path(Dir.pwd)
@@ -183,6 +198,10 @@ class Editor
     return $buffer
   end
 
+  def buffers()
+    return $buffers
+  end
+
   def marshal_save(varname, vardata)
     save_var_to_file(varname, Marshal.dump(vardata))
   end
@@ -244,13 +263,18 @@ class Editor
     @converters[converter_id].apply(txt)
   end
 
+  # Used only by ack module at the moment
   def get_content_search_paths()
     r = @file_content_search_paths.clone
     p = find_project_dir_of_cur_buffer()
+    if p.nil?
+      p = buf.dirname # Search dir of current file by default
+    end
 
     if p and !@file_content_search_paths.include?(p)
       r.insert(0, p)
     end
+
     return r
   end
 
@@ -258,7 +282,7 @@ class Editor
     exts = $cnf[:extensions_to_open]
     extname = Pathname.new(filepath).extname.downcase
     can_open = exts.include?(extname)
-    puts "CAN OPEN?: #{can_open}"
+    debug "CAN OPEN?: #{can_open}"
     return can_open
   end
 end
@@ -269,7 +293,7 @@ def _quit()
 end
 
 def fatal_error(msg)
-  puts msg
+  debug msg
   exit!
 end
 
@@ -290,16 +314,20 @@ def system_clipboard_changed(clipboard_contents)
     $paste_lines = false
   end
   $clipboard << clipboard_contents
-  # puts $clipboard[-1]
+  # debug $clipboard[-1]
   $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
 end
 
+def get_clipboard()
+  return $clipboard[-1]
+end
+
 def set_clipboard(s)
   if !(s.class <= String) or s.size == 0
-    puts s.inspect
-    puts [s, s.class, s.size]
+    debug s.inspect
+    debug [s, s.class, s.size]
     log_error("s.class != String or s.size == 0")
-    Ripl.start :binding => binding
+    # Ripl.start :binding => binding
     return
   end
   $clipboard << s
@@ -354,10 +382,17 @@ end
 
 def show_key_bindings()
   kbd_s = "❙Key bindings❙\n"
-  kbd_s << "=======================================\n"
+  kbd_s << "\n⦁[Mode] keys : action⦁\n"
+
+  kbd_s << "[B]=Browse, [C]=Command, [I]=Insert, [V]=Visual\n"
+  kbd_s << "key!: Press key once, release before pressing any other keys\n"
+
+  kbd_s << "===============================================\n"
   kbd_s << $kbd.to_s
-  kbd_s << "\n=======================================\n"
-  create_new_file(nil, kbd_s)
+  kbd_s << "===============================================\n"
+  b = create_new_file(nil, kbd_s)
+  gui_set_file_lang(b.id, "hyperplaintext")
+  #
 end
 
 def diff_buffer()
@@ -368,9 +403,9 @@ def diff_buffer()
   infile.write($buffer.to_s)
   infile.flush
   cmd = "diff -w '#{orig_path}' #{infile.path}"
-  # puts cmd
+  # debug cmd
   bufstr << run_cmd(cmd)
-  # puts bufstr
+  # debug bufstr
   infile.close; infile.unlink
   create_new_file(nil, bufstr)
 end
@@ -415,7 +450,7 @@ def minibuffer_new_char(c)
 end
 
 # def readchar_new_char(c)
-  # $input_char_call_func.call(c)
+# $input_char_call_func.call(c)
 # end
 
 def minibuffer_delete()
@@ -424,7 +459,7 @@ end
 
 def message(s)
   s = "[#{DateTime.now().strftime("%H:%M")}] #{s}"
-  puts s
+  debug s
 
   $vmag.add_to_minibuf(s)
   # $minibuffer = Buffer.new(s, "")
@@ -435,6 +470,7 @@ end
 GUESS_ENCODING_ORDER = [
   Encoding::US_ASCII,
   Encoding::UTF_8,
+  Encoding::ISO_8859_1,
   Encoding::Shift_JIS,
   Encoding::EUC_JP,
   Encoding::EucJP_ms,
@@ -497,11 +533,23 @@ def load_buffer(fname)
   #$buffer_history << $buffers.size - 1
 end
 
-def jump_to_file(filename, linenum = 0)
+def jump_to_file(filename, linenum = nil, charn = nil)
   open_new_file(filename)
-  if linenum > 0
-    $buffer.jump_to_line(linenum)
+
+  # Link to character position
+  if !charn.nil?
+    if charn == "c"
+      buf.jump_to_pos(linenum)
+      center_on_current_line
+      return
+    end
+  end
+
+  # Link to line
+  if !linenum.nil?
+    buf.jump_to_line(linenum)
     center_on_current_line
+    return
   end
 end
 
@@ -531,39 +579,11 @@ def scan_word_start_marks(search_str)
   return wsmarks
 end
 
-def draw_text(str, x, y)
-  vma.paint_stack << [4, x, y, str]
-end
-
 def hook_draw()
   # TODO: as hook.register
   # easy_jump_draw()
 end
 
-def render_buffer(buffer = 0, reset = 0)
-  tmpbuf = $buffer.to_s
-  debug "pos:#{$buffer.pos} L:#{$buffer.lpos} C:#{$buffer.cpos}"
-  pos = $buffer.pos
-  selection_start = $buffer.selection_start
-
-  if $buffer.need_redraw?
-    reset = 1
-  end
-  t1 = Time.now
-  hook_draw()
-
-  if $buffer.need_redraw?
-    hpt_scan_images() if $debug #experimental
-  end
-
-  $buffer.highlight
-  if Time.now - t1 > 1 / 100.0
-    debug "SLOW render"
-    debug "Render time: #{Time.now - t1}"
-  end
-  $buffer.set_redrawed if reset == 1
-end
-
 def get_dot_path(sfx)
   dot_dir = File.expand_path("~/.vimamsa")
   Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
@@ -574,10 +594,10 @@ end
 def get_file_line_pointer(s)
   #"/code/vimamsa/lib/vimamsa/buffer_select.rb:31:def"
   #    m = s.match(/(~[a-z]*)?\/.*\//)
-  m = s.match(/((~[a-z]*)?\/.*\/\S+):(\d+)/)
+  m = s.match(/((~[a-z]*)?\/.*\/\S+):(c?)(\d+)/)
   if m != nil
     if File.exist?(File.expand_path(m[1]))
-      return [m[1], m[3].to_i]
+      return [m[1], m[4].to_i, m[3]]
     end
   end
   return nil
@@ -594,7 +614,7 @@ end
 def run_cmd(cmd)
   tmpf = Tempfile.new("vmarun", "/tmp").path
   cmd = "#{cmd} > #{tmpf}"
-  puts "CMD:\n#{cmd}"
+  debug "CMD:\n#{cmd}"
   system("bash", "-c", cmd)
   res_str = File.read(tmpf)
   return res_str
@@ -623,11 +643,11 @@ def exec_cmd(bin_name, arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil, arg5 = ni
 end
 
 def file_is_text_file(fpath)
-  puts "file_is_text_file(#{fpath})"
+  debug "file_is_text_file(#{fpath})"
   fpath = File.expand_path(fpath)
   return false if !File.exist?(fpath)
   r = exec_cmd("file", fpath)
-  puts "DEBUG:#{r}"
+  debug "DEBUG:#{r}"
   return true if r.match(/UTF-8.*text/)
   return true if r.match(/ASCII.*text/)
   return false
@@ -663,6 +683,6 @@ def find_project_dir_of_cur_buffer()
   if $buffer.fname
     pdir = find_project_dir_of_fn($buffer.fname)
   end
-  # puts "Proj dir of current file: #{pdir}"
+  # debug "Proj dir of current file: #{pdir}"
   return pdir
 end

data/lib/vimamsa/encrypt.rb

@@ -38,7 +38,7 @@ end
 
 def encrypt_cur_buffer()
   callback = proc{|x|encrypt_cur_buffer_callback(x)}
-  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback)
+  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback,{:hide=>true})
 end
 
 def encrypt_cur_buffer_callback(password,b=nil)

data/lib/vimamsa/file_finder.rb

@@ -1,5 +1,4 @@
 require "parallel"
-
 class FileFinder
   def initialize()
     $hook.register(:shutdown, self.method("save"))
@@ -42,9 +41,7 @@ def recursively_find_files()
   for d in $search_dirs
     debug("FIND FILEs IN #{d}")
     dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
-    debug("FIND FILEs IN #{d} END")
-  end
-  #$dir_list = Dir.glob('./**/*').select { |e| File.file? e }
+         debug("FIND FILEs IN #{d} END")   end   #$dir_list = Dir.glob('./**/*').select { |e| File.file? e }
   debug("END find files2")
   $dir_list = dlist
   debug("END find files")
@@ -59,22 +56,22 @@ def filter_files(search_str)
   for s in scores
     dir_hash[s[0]] = s[1] if s[1] > 0
   end
-  # puts scores
+  # debug scores
   dir_hash = dir_hash.sort_by { |k, v| -v }
   dir_hash = dir_hash[0..20]
   dir_hash.map do |file, d|
-    puts "D:#{d} #{file}"
+    debug "D:#{d} #{file}"
   end
   return dir_hash
 end
 
 def gui_file_finder_update_callback(search_str = "")
-  puts "FILE FINDER UPDATE CALLBACK: #{search_str}"
+  debug "FILE FINDER UPDATE CALLBACK: #{search_str}"
   if (search_str.size > 1)
     files = filter_files(search_str)
     $file_search_list = files
     return files
-    #puts files.inspect
+    #debug files.inspect
     #return files.values
   end
   return []
@@ -88,7 +85,7 @@ def gui_file_finder_select_callback(search_str, idx)
 end
 
 def gui_file_finder_handle_char(c)
-  puts "BUFFER SELECTOR INPUT CHAR: #{c}"
+  debug "BUFFER SELECTOR INPUT CHAR: #{c}"
   buffer_i = $select_keys.index(c)
   if buffer_i != nil
     gui_file_finder_callback(buffer_i)

data/lib/vimamsa/file_history.rb

@@ -21,7 +21,7 @@ class FileHistory
   # end
 
   def update(buf)
-    puts "FileHistory.update(buf=#{buf.fname})"
+    debug "FileHistory.update(buf=#{buf.fname})"
     return if !buf.fname
     @history[buf.fname] if !@history[buf.fname]
     if !@history[buf.fname]
@@ -29,7 +29,7 @@ class FileHistory
     else
       @history[buf.fname] += 1
     end
-    puts @history
+    debug @history
 
     # puts "FileHistory.update(buf=#{buf})"
   end
@@ -83,7 +83,7 @@ def fuzzy_filter(search_str, list, maxfinds)
 end
 
 def gui_file_history_update_callback(search_str = "")
-  puts "gui_file_history_update_callback: #{search_str}"
+  debug "gui_file_history_update_callback: #{search_str}"
   return [] if $vma.fh.history.empty?
   $search_list = []
   files = $vma.fh.history.keys.sort.collect { |x| [x, 0] }

data/lib/vimamsa/file_manager.rb

@@ -1,3 +1,4 @@
+
 class FileManager
   @@cur
 
@@ -28,11 +29,11 @@ class FileManager
     # bindkey "C o", :delete_state
 
     $kbd.add_minor_mode("fexp", :file_exp, :command)
-    
+
     bindkey "fexp o m", :fexp_sort_mtime
-    bindkey "fexp o f", :fexp_sort_fname   
+    bindkey "fexp o f", :fexp_sort_fname
 
-    # bindkey "fexp l", [:fexp_right, proc { puts "==fexp_right==" }, ""]
+    # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
     bindkey "fexp esc", [:fexp_quit, proc { $kbd.set_mode(:command) }, ""]
     bindkey "fexp enter", :fexp_select
@@ -49,7 +50,7 @@ class FileManager
     @@cur = self
     ld = buflist.get_last_dir
     dir_to_buf(ld)
-    # puts "ld=#{ld}"
+    # debug "ld=#{ld}"
     # dlist = Dir["#{ld}/*"]
   end
 
@@ -83,7 +84,7 @@ class FileManager
         next
       end
       next if x[0] == "."
-      if File.directory?(fpath) 
+      if File.directory?(fpath)
         # if f.directory?(fpath)
         @cdirs << x
       else
@@ -126,10 +127,10 @@ class FileManager
 
   def select_line
     return if @buf.lpos < @header.size
-    # puts "def select_line"
+    # debug "def select_line"
     fn = fullp(@buf.get_current_line[0..-2])
     if File.directory?(fn)
-      puts "CHDIR: #{fn}"
+      debug "CHDIR: #{fn}"
       dir_to_buf(fn)
       # elsif vma.can_open_extension?(fn)
       # jump_to_file(fn)
@@ -139,6 +140,6 @@ class FileManager
     else
       open_with_default_program(fn)
     end
-    # puts l.inspect
+    # debug l.inspect
   end
 end