vimamsa 0.1.7 → 0.1.10

data/lib/vimamsa/buffer_manager.rb

@@ -0,0 +1,83 @@
+class BufferManager
+  attr_reader :buf
+  @@cur = nil # Current object of class
+
+  def self.cur()
+    return @@cur
+  end
+
+  def self.init()
+    vma.kbd.add_minor_mode("bmgr", :buf_mgr, :command)
+    reg_act(:bmgr_select, proc { buf.module.select_line }, "")
+    reg_act(:bmgr_close, proc { buf.module.close_selected }, "")
+
+    reg_act(:start_buf_manager, proc { BufferManager.new.run; vma.kbd.set_mode(:buf_mgr) }, "Buffer manager")
+
+    bindkey "bmgr enter", :bmgr_select
+    bindkey "bmgr c", :bmgr_close
+  end
+
+  def initialize()
+    @buf = nil
+    @line_to_id = {}
+  end
+
+  def buf_of_current_line()
+    l = @buf.lpos - @header.size
+    return nil if l < 0
+    bufid = @line_to_id[l]
+    buf_i = vma.buffers.get_buffer_by_id(bufid)
+    return buf_i
+  end
+
+  def close_selected
+    buf_i = buf_of_current_line()
+    if buf_i.nil?
+      message("buf already closed")
+      return
+    end
+    vma.buffers.close_other_buffer(buf_i)
+  end
+
+  def select_line
+    buf_i = buf_of_current_line()
+    return if buf_i.nil?
+
+    vma.buffers.close_current_buffer()
+    vma.buffers.set_current_buffer(buf_i)
+    @@cur = nil
+  end
+
+  def run
+    if !@@cur.nil? #One instance open already
+      #Close it
+      buf_i = vma.buffers.get_buffer_by_id(@@cur.buf.id)
+      vma.buffers.close_buffer(buf_i)
+    end
+    @@cur = self
+    @header = []
+    @header << "Current buffers:"
+    @header << "keys: <enter> to select, <c> to close buffer"
+    @header << "=" * 40
+
+    s = ""
+    s << @header.join("\n")
+    s << "\n"
+    i = 0
+    for b in vma.buffers.sort_by { |x| x.list_str }
+      x = b.list_str
+      s << "#{x}\n"
+      @line_to_id[i] = b.id
+      i += 1
+    end
+
+    if @buf.nil?
+      @buf = create_new_file(nil, s)
+      @buf.module = self
+      @buf.active_kbd_mode = :buf_mgr
+    else
+      @buf.set_content(s)
+    end
+    @buf.set_line_and_column_pos(@header.size, 0)
+  end
+end

data/lib/vimamsa/conf.rb

@@ -0,0 +1,21 @@
+$cnf = {} # TODO
+
+def conf(id)
+  return $cnf[id]
+end
+
+def set_conf(id, val)
+  $cnf[id] = val
+end
+
+def setcnf(id, val)
+  set_conf(id, val)
+end
+
+setcnf :indent_based_on_last_line, true
+setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
+
+
+setcnf "log.verbose", 1
+setcnf :tab_width, 4
+

data/lib/vimamsa/debug.rb

@@ -21,8 +21,9 @@ def debug_dump_deltas()
 end
 
 $log_messages = []
-def log_message(message)
-  puts message
+
+def log_message(message,vlevel=1)
+  puts message if conf("log.verbose") >= vlevel
   $log_messages << message
 end
 
@@ -80,19 +81,19 @@ end
 
 def run_test(test_id)
   target_results = read_file("", "tests/test_#{test_id}_output.txt")
-  old_buffer = $buffer
-  $buffer = Buffer.new("", "")
+  old_buffer = vma.buf
+  vma.buf = Buffer.new("", "")
   load "tests/test_#{test_id}.rb"
-  test_ok = $buffer.to_s.strip == target_results.strip
+  test_ok = vma.buf.to_s.strip == target_results.strip
   puts "##################"
   puts target_results
   puts "##################"
-  puts $buffer.to_s
+  puts vma.buf.to_s
   puts "##################"
   puts "TEST OK" if test_ok
   puts "TEST FAILED" if !test_ok
   puts "##################"
-  $buffer = old_buffer
+  vma.buf = old_buffer
 end
 
 #TODO: remove?
@@ -120,7 +121,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     # puts buf.current_line()
     # puts "======================"
 
-    render_buffer($buffer)
+    render_buffer(vma.buf)
 
     gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
@@ -129,9 +130,9 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
 
     gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
-    render_buffer($buffer)
+    render_buffer(vma.buf)
 
-    $buffers.set_current_buffer(rand($buffers.size)) if rand > 0.25
+    vma.buffers.set_current_buffer(rand(vma.buffers.size)) if rand > 0.25
     step += 1
   end
 end

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,11 +1,11 @@
 require "pty"
 
 def exec_in_terminal(cmd, autoclose = false)
-  # puts "CMD:#{cmd}"
+  # debug "CMD:#{cmd}"
 
   # global to prevent garbage collect unlink
   $initf = Tempfile.new("bashinit")
-  # puts $initf.path
+  # debug $initf.path
   $initf.write(cmd)
   if autoclose
     $initf.write("\nsleep 10; exit;\n")
@@ -37,7 +37,7 @@ class Editor
   #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 = []
@@ -70,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
@@ -95,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")
@@ -131,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
 
@@ -140,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)
@@ -156,11 +165,11 @@ class Editor
     else
       buffer = Buffer.new(" \n")
     end
-    $buffers << buffer
+    vma.buffers << buffer
 
     # load_theme($cnf[:theme])
 
-    # render_buffer($buffer, 1) #TODO
+    # render_buffer(vma.buf, 1) #TODO
 
     # gui_select_buffer_init #TODO
     # gui_file_finder_init #TODO
@@ -188,6 +197,14 @@ class Editor
   def buf()
     return $buffer
   end
+  def buf=(aa)
+    $buffer=aa
+  end
+
+
+  def buffers()
+    return $buffers
+  end
 
   def marshal_save(varname, vardata)
     save_var_to_file(varname, Marshal.dump(vardata))
@@ -243,20 +260,25 @@ class Editor
   # Register converter
   def reg_conv(converter, converter_id)
     @converters[converter_id] = converter
-    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
+    reg_act(converter_id, proc { vma.buf.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
   end
 
   def apply_conv(converter_id, txt)
     @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 = vma.buffers.last_dir 
+    end
 
     if p and !@file_content_search_paths.include?(p)
       r.insert(0, p)
     end
+
     return r
   end
 
@@ -264,7 +286,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
@@ -275,7 +297,7 @@ def _quit()
 end
 
 def fatal_error(msg)
-  puts msg
+  debug msg
   exit!
 end
 
@@ -285,7 +307,7 @@ end
 
 def open_file_dialog()
   path = ""
-  path = $buffer.fname if $buffer.fname
+  path = vma.buf.fname if vma.buf.fname
   gui_open_file_dialog(File.dirname(path))
 end
 
@@ -296,7 +318,7 @@ 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
 
@@ -306,10 +328,10 @@ 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
@@ -321,8 +343,8 @@ end
 
 def set_cursor_pos(new_pos)
   buf.set_pos(new_pos)
-  #render_buffer($buffer)
-  debug "New pos: #{new_pos}lpos:#{$buffer.lpos} cpos:#{$buffer.cpos}"
+  #render_buffer(vma.buf)
+  debug "New pos: #{new_pos}lpos:#{vma.buf.lpos} cpos:#{vma.buf.cpos}"
 end
 
 def set_last_command(cmd)
@@ -343,7 +365,7 @@ end
 
 def repeat_last_find()
   return if !defined? $last_find_command
-  $buffer.jump_to_next_instance_of_char($last_find_command[:char],
+  vma.buf.jump_to_next_instance_of_char($last_find_command[:char],
                                         $last_find_command[:direction])
 end
 
@@ -364,23 +386,30 @@ 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()
   bufstr = ""
-  orig_path = $buffer.fname
+  orig_path = vma.buf.fname
   infile = Tempfile.new("out")
   infile = Tempfile.new("in")
-  infile.write($buffer.to_s)
+  infile.write(vma.buf.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
@@ -421,7 +450,7 @@ def minibuffer_new_char(c)
     $minibuffer.insert_txt(c)
     debug "MINIBUFFER: #{c}"
   end
-  #$buffer = $minibuffer
+  #vma.buf = $minibuffer
 end
 
 # def readchar_new_char(c)
@@ -434,7 +463,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, "")
@@ -445,6 +474,7 @@ end
 GUESS_ENCODING_ORDER = [
   Encoding::US_ASCII,
   Encoding::UTF_8,
+  Encoding::ISO_8859_1,
   Encoding::Shift_JIS,
   Encoding::EUC_JP,
   Encoding::EucJP_ms,
@@ -473,7 +503,8 @@ def create_new_file(filename = nil, file_contents = "\n")
   debug "NEW FILE CREATED"
   buffer = Buffer.new(file_contents)
   # gui_set_current_buffer(buffer.id) #TODO: remove?
-  $buffers << buffer
+  vma.buffers << buffer
+  vma.kbd.set_mode_to_default
   return buffer
 end
 
@@ -491,7 +522,7 @@ end
 
 def load_buffer(fname)
   return if !File.exist?(fname)
-  existing_buffer = $buffers.get_buffer_by_filename(fname)
+  existing_buffer = vma.buffers.get_buffer_by_filename(fname)
   if existing_buffer != nil
     $buffer_history << existing_buffer
     return
@@ -503,15 +534,27 @@ def load_buffer(fname)
   debug("DONE LOAD: #{fname}")
   #buf = filter_buffer(buffer)
   #    debug("END FILTER: #{fname}")
-  $buffers << buffer
-  #$buffer_history << $buffers.size - 1
+  vma.buffers << buffer
+  #$buffer_history << vma.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
 
@@ -523,11 +566,11 @@ end
 def open_new_file(filename, file_contents = "")
   #TODO: expand path
   filename = File.expand_path(filename)
-  b = $buffers.get_buffer_by_filename(filename)
+  b = vma.buffers.get_buffer_by_filename(filename)
   # File is already opened to existing buffer
   if b != nil
     message "Switching to: #{filename}"
-    $buffers.set_current_buffer(b)
+    vma.buffers.set_current_buffer(b)
   else
     message "New file opened: #{filename}"
     fname = filename
@@ -541,39 +584,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)
@@ -584,10 +599,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
@@ -604,7 +619,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
@@ -633,11 +648,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
@@ -670,9 +685,9 @@ end
 def find_project_dir_of_cur_buffer()
   # Find "project dir" of current file. If currently editing file in path "/foo/bar/baz/fn.txt" and file named "/foo/bar/.vma_project" exists, then dir /foo/bar is treated as project dir and subject to e.g. ack search.
   pdir = nil
-  if $buffer.fname
-    pdir = find_project_dir_of_fn($buffer.fname)
+  if vma.buf.fname
+    pdir = find_project_dir_of_fn(vma.buf.fname)
   end
-  # puts "Proj dir of current file: #{pdir}"
+  # debug "Proj dir of current file: #{pdir}"
   return pdir
 end

data/lib/vimamsa/encrypt.rb

@@ -33,15 +33,15 @@ class Encrypt
 end
 
 def decrypt_cur_buffer(password, b = nil)
-  $buffer.decrypt(password)
+  vma.buf.decrypt(password)
 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)
-  $buffer.set_encrypted(password)
+  vma.buf.set_encrypted(password)
 end