vimamsa 0.1.5 → 0.1.8

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
 
@@ -19,13 +26,18 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
+def mkdir_if_not_exists(_dirpath)
+  dirpath = File.expand_path(_dirpath)
+  Dir.mkdir(dirpath) unless File.exist?(dirpath)
+end
+
 class Editor
-  attr_reader :file_content_search_paths, :file_name_search_paths
-  attr_accessor :converters, :fh, :paint_stack
+  attr_reader :file_content_search_paths, :file_name_search_paths, :gui
+  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 +54,7 @@ class Editor
   def open_file_listener(added)
     if !added.empty?
       for fp in added
-      	sleep 0.1
+        sleep 0.1
         x = IO.read(fp)
         File.delete(fp)
         for f in x.lines
@@ -62,9 +74,11 @@ class Editor
 
     # GLib::Idle.add
     # Ripl.start :binding => binding
-    # GLib::Idle.add(proc{ puts "IDLEFUNC"})
+    # GLib::Idle.add(proc{ debug "IDLEFUNC"})
     # GLib::Idle.add(proc { idle_func })
 
+    @gui = $vmag #TODO
+
     $hook = Hook.new
     register_plugin(:Hook, $hook)
     $macro = Macro.new
@@ -79,7 +93,8 @@ class Editor
 
     debug "ARGV: " + ARGV.inspect
     # build_key_bindings_tree
-    $kbd = KeyBindingTree.new()
+    @kbd = KeyBindingTree.new()
+    $kbd = @kbd
     $kbd.add_mode("C", :command)
     $kbd.add_mode("I", :insert)
     $kbd.add_mode("V", :visual)
@@ -87,17 +102,18 @@ class Editor
     $kbd.add_mode("R", :readchar)
     $kbd.add_mode("B", :browse)
     $kbd.set_default_mode(:command)
-    require "vimamsa/default_key_bindings"
+    require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
 
     FileManager.init
+    BufferManager.init
 
-    dot_dir = File.expand_path("~/.vimamsa")
-    Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
-    listen_dir = File.expand_path("~/.vimamsa/listen")
-    Dir.mkdir(listen_dir) unless File.exist?(dot_dir)
+    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
@@ -109,7 +125,7 @@ class Editor
       $cnf = eval(IO.read(settings_path))
     end
 
-    # set_qt_style(1)
+    # set_gui_style(1)
 
     # Limit file search to these extensions:
     $find_extensions = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb"]
@@ -139,7 +155,7 @@ class Editor
     if fname
       buffer = Buffer.new(read_file("", fname), fname)
     else
-      buffer = Buffer.new("INIT\n")
+      buffer = Buffer.new(" \n")
     end
     $buffers << buffer
 
@@ -173,6 +189,11 @@ class Editor
   def buf()
     return $buffer
   end
+  
+  def buffers()
+    return $buffers
+  end
+ 
 
   def marshal_save(varname, vardata)
     save_var_to_file(varname, Marshal.dump(vardata))
@@ -228,8 +249,7 @@ 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}", [:selection])
-    # reg_act(converter_id, "$buffer.convert_selected_text(:#{converter_id})", "Converter #{converter_id}", [:selection])
+    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
   end
 
   def apply_conv(converter_id, txt)
@@ -250,30 +270,29 @@ 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
 
 def _quit()
   vma.shutdown
-  exit
+  Gtk.main_quit
 end
 
 def fatal_error(msg)
-  puts msg
+  debug msg
   exit!
 end
 
 def file_saveas(filename)
-  $buffer.set_filename(filename)
-  $buffer.save()
+  buf.save_as_callback(filename)
 end
 
 def open_file_dialog()
   path = ""
   path = $buffer.fname if $buffer.fname
-  qt_open_file_dialog(File.dirname(path))
+  gui_open_file_dialog(File.dirname(path))
 end
 
 def system_clipboard_changed(clipboard_contents)
@@ -283,14 +302,18 @@ 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
     return
@@ -361,9 +384,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
@@ -407,9 +430,9 @@ def minibuffer_new_char(c)
   #$buffer = $minibuffer
 end
 
-def readchar_new_char(c)
-  $input_char_call_func.call(c)
-end
+# def readchar_new_char(c)
+# $input_char_call_func.call(c)
+# end
 
 def minibuffer_delete()
   $minibuffer.delete(BACKWARD_CHAR)
@@ -417,7 +440,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, "")
@@ -455,7 +478,7 @@ GUESS_ENCODING_ORDER = [
 def create_new_file(filename = nil, file_contents = "\n")
   debug "NEW FILE CREATED"
   buffer = Buffer.new(file_contents)
-  # qt_set_current_buffer(buffer.id) #TODO: remove?
+  # gui_set_current_buffer(buffer.id) #TODO: remove?
   $buffers << buffer
   return buffer
 end
@@ -481,7 +504,7 @@ def load_buffer(fname)
   end
   debug("LOAD BUFFER: #{fname}")
   buffer = Buffer.new(read_file("", fname), fname)
-  # qt_set_current_buffer(buffer.id)
+  # gui_set_current_buffer(buffer.id)
   buffer.set_active
   debug("DONE LOAD: #{fname}")
   #buf = filter_buffer(buffer)
@@ -528,15 +551,12 @@ def draw_text(str, x, y)
   vma.paint_stack << [4, x, y, str]
 end
 
-def center_on_current_line__2del()
-  center_where_cursor
-end
-
 def hook_draw()
   # TODO: as hook.register
   # easy_jump_draw()
 end
 
+#TODO: delete this
 def render_buffer(buffer = 0, reset = 0)
   tmpbuf = $buffer.to_s
   debug "pos:#{$buffer.pos} L:#{$buffer.lpos} C:#{$buffer.cpos}"
@@ -549,8 +569,6 @@ def render_buffer(buffer = 0, reset = 0)
   t1 = Time.now
   hook_draw()
 
-  render_text(tmpbuf, pos, selection_start, reset) #TODO: remove?
-
   if $buffer.need_redraw?
     hpt_scan_images() if $debug #experimental
   end
@@ -593,7 +611,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
@@ -622,11 +640,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
@@ -662,6 +680,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/file_finder.rb

@@ -1,5 +1,4 @@
 require "parallel"
-
 class FileFinder
   def initialize()
     $hook.register(:shutdown, self.method("save"))
@@ -21,7 +20,7 @@ class FileFinder
       Thread.new { recursively_find_files() }
     end
 
-    qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
+    gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
                             "gui_file_finder_select_callback",
                             "gui_file_finder_update_callback")
   end
@@ -59,22 +58,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 []
@@ -83,12 +82,12 @@ end
 def gui_file_finder_select_callback(search_str, idx)
   selected_file = $file_search_list[idx][0]
   debug "FILE FINDER SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
-  qt_select_window_close(0)
+  gui_select_window_close(0)
   open_new_file(selected_file)
 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
@@ -55,9 +55,14 @@ class FileHistory
     l = []
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
 
-    qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                            "gui_file_history_select_callback",
-                            "gui_file_history_update_callback")
+    opt = { :title => "File history search",
+            :desc => "Search for previously opened files. Fuzzy search." ,
+            :columns => [{:title=>'Filename',:id=>0}]
+            }
+    gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
+                             "gui_file_history_select_callback",
+                             "gui_file_history_update_callback",
+                             opt)
   end
 end
 
@@ -78,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] }
@@ -86,8 +91,10 @@ def gui_file_history_update_callback(search_str = "")
   if (search_str.size > 1)
     files = fuzzy_filter(search_str, $vma.fh.history.keys, 40)
   end
+
   $search_list = files
-  return files
+  ret = files.collect{|x|[x[0]]}
+  return ret
 end
 
 def gui_file_history_select_callback(search_str, idx)
@@ -95,6 +102,6 @@ def gui_file_history_select_callback(search_str, idx)
   selected_file = $search_list[idx][0]
 
   debug "FILE HISTORY SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
-  qt_select_window_close(0)
+  gui_select_window_close(0)
   open_new_file(selected_file)
 end

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