vimamsa 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e99c11af9802815672e7b3cc220668fe9a0d6837760ff1cd5ca8b029ca04bc
-  data.tar.gz: b61f32cdaebc0cce856e832567787da9a9d041ed46000463d226959aee492373
+  metadata.gz: 7a71f8392835d7a5a3245366764eb79f6058ea3ded74cc1a308f021f950881ba
+  data.tar.gz: 590ea0409a43aabafe349cfcff0cb91712e2a269e334b3663b64f6b895ae666f
 SHA512:
-  metadata.gz: d26574ac402e3f2de520d84db614c26a8760bbbae75fa422dd44d0af2145df2ffcfea8fd8c5f8d45735c0367f36ab85d895660822d7f471a6ba7db2bd5e3513a
-  data.tar.gz: 3e95a3a334284bf3143e67283354c064e23afe2b3332cb5c2f4fc98fe4f80adeee2c4ee39b3759f95b72ff543269e8705d54162e8b04acc5448e41e522360600
+  metadata.gz: 1bf328f8cbe0b69e85a9720790c8f4616e1996466ad65f6473cf1cff1173d78b9cec197145c653a5d33804571d383246492e593445da390cbe567fc6ccfbb24a
+  data.tar.gz: 799f836afc3c0e304cac07f44e1b5c96affa3f6b5775b4d654b43a81168f2ab14cb4ee1218a3345ae3189203520885fd6cc1de7ce48205e78386b060c700f8ca

data/exe/vimamsa

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
-require 'ripl/multi_line'
+require "ripl/multi_line"
+require "tempfile"
 # Ripl.config[:multi_line_prompt] = ' > '
 require "pathname"
 
@@ -7,28 +8,35 @@ ENV["GTK_THEME"] = "Adwaita:dark"
 
 selfpath = __FILE__
 selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
-scriptdir = File.expand_path(File.dirname(selfpath)+"/..")
-puts scriptdir
-# Ripl.start :binding => binding
-
-# binpath = "#{scriptdir}/vimamsa"
-# argexp = [binpath]
-
-# for arg in ARGV
-  # puts arg
-  # argexp << Pathname(arg).expand_path.to_s
-# end
-
-Dir.chdir(scriptdir)
-# exec(*argexp)
-
-$LOAD_PATH.unshift(File.expand_path("lib")) 
-$LOAD_PATH.unshift(File.expand_path("ext")) 
+scriptdir = File.expand_path(File.dirname(selfpath) + "/..")
+
+
+# If process is already running, open the parameter file in the running process and exit.
+listen_dir = File.expand_path("~/.vimamsa/listen")
+if File.exist?(listen_dir) and !ARGV[0].nil?
+  tmpf = Tempfile.new("vmarun", listen_dir)
+  fp = tmpf.path
+  paramfn = File.expand_path(ARGV[0])
+  puts paramfn
+  tmpf.write(paramfn)
+  tmpf.close
+  tstart = Time.new
+  timeout = false
+  while File.exist?(fp)
+    sleep 0.001
+    if Time.new - tstart > 0.5
+      timeout = true
+      break
+    end
+  end
+  exit(0) if !timeout
+end
+
+$LOAD_PATH.unshift(File.expand_path("lib"))
+$LOAD_PATH.unshift(File.expand_path("ext"))
 
 require "vimamsa"
-# Ilib:ext 
+# Ilib:ext
 # r rbvma -e "puts VMA.new.run"
-$vmag = VMAg.new()
+$vmag = VMAgui.new()
 $vmag.run
-
-

data/ext/vmaext/vmaext.c

@@ -3,11 +3,8 @@
 #include "ruby/ruby.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
-#warning "C Preprocessor got here!"
-
 typedef struct node {
 int i;
 void * next;

data/lib/vimamsa/ack.rb

@@ -16,10 +16,6 @@ def gui_ack()
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def invoke_ack_search()
-  start_minibuffer_cmd("", "", :ack_buffer)
-end
-
 def ack_buffer(instr, b = nil)
   instr = instr.gsub("'", ".") # TODO
   bufstr = ""

data/lib/vimamsa/actions.rb

@@ -1,73 +1,62 @@
 class Action
-  attr_accessor :id, :method_name, :method
+  attr_accessor :id, :method_name, :method, :opt
 
-  def initialize(id, method_name, method, scope = [])
+  def initialize(id, method_name, method, opt = {})
     @method_name = method_name
     @id = id
     @method = method
+    @opt = opt
+
     $actions[id] = self
   end
 end
 
 $actions = {}
 
-# def reg_act(id, callfunc, name = "", scope = [])
-  # if callfunc.class == Proc
-    # a = Action.new(id, name, callfunc, scope)
-  # else
-    # a = Action.new(id, name, method(callfunc), scope)
-  # end
-# end
-
-def reg_act(id, callfunc, name = "", scope = [])
+def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
-    a = Action.new(id, name, callfunc, scope)
+    a = Action.new(id, name, callfunc, opt)
   else
     begin
       m = method(callfunc)
     rescue NameError
       m = method("missing_callfunc")
     end
-    a = Action.new(id, name, m, scope)
+    a = Action.new(id, name, m, opt)
   end
+  return a
 end
 
 def missing_callfunc
   puts "missing_callfunc"
 end
 
-
+#TODO: remove
 def call(id)
+  call_action(id)
+end
+
+def call_action(id)
   a = $actions[id]
   if a
-    #        Ripl.start :binding => binding
     a.method.call()
+  else
+    message("Unknown action: " + id.inspect)
   end
 end
 
 def search_actions()
   l = []
   $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-  qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                          "search_actions_select_callback",
-                          "search_actions_update_callback")
+  gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
+                           "search_actions_select_callback",
+                           "search_actions_update_callback")
 end
 
 $item_list = []
 
 def search_actions_update_callback(search_str = "")
-  #    item_list = $actions.collect {|x| x[1].id.to_s}
   return [] if search_str == ""
-  # item_list = $action_list.collect { |x|
-    # actname = x[:action].to_s
-    # if x[:action].class == Symbol
-      # mn = $actions[x[:action]].method_name
-      # actname = mn if mn.size > 0
-    # end
-    # r = { :str => actname, :key => x[:key], :action => x[:action] }
-  # }
-
-  # => {:str=>"insert_new_line", :key=>"I return", :action=>:insert_new_line}
 
   item_list2 = []
   for act_id in $actions.keys
@@ -81,7 +70,7 @@ def search_actions_update_callback(search_str = "")
     end
     item_list2 << item
   end
-  # Ripl.start :binding => binding
+
   item_list = item_list2
 
   a = filter_items(item_list, 0, search_str)
@@ -90,7 +79,6 @@ def search_actions_update_callback(search_str = "")
   r = a.collect { |x| [x[0][0], 0, x] }
   puts r.inspect
   $item_list = r
-  # Ripl.start :binding => binding
 
   r = a.collect { |x| ["[#{x[0][:key]}] #{x[0][:str]}", 0, x] }
   return r
@@ -101,7 +89,7 @@ def search_actions_select_callback(search_str, idx)
   acc = item[0][:action]
 
   puts "Selected:" + acc.to_s
-  qt_select_window_close(0)
+  gui_select_window_close(0)
 
   if acc.class == String
     eval(acc)

data/lib/vimamsa/buffer.rb

@@ -1,5 +1,6 @@
 require "digest"
 require "tempfile"
+require "fileutils"
 require "pathname"
 require "openssl"
 require "ripl/multi_line"
@@ -15,7 +16,7 @@ class Buffer < String
 
   attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang
   attr_writer :call_func, :update_highlight
-  attr_accessor :qt_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :qt_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode
+  attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
 
   @@num_buffers = 0
 
@@ -26,10 +27,9 @@ class Buffer < String
     @lang = nil
     @id = @@num_buffers
     @@num_buffers += 1
-    qt_create_buffer(@id)
+    gui_create_buffer(@id)
     puts "NEW BUFFER fn=#{fname} ID:#{@id}"
 
-    #
     @module = nil
 
     @crypt = nil
@@ -47,7 +47,21 @@ class Buffer < String
     @hl_queue = []
     @line_action_handler = nil
 
+    @dirname = nil
+    @title = "*buf-#{@id}*"
+    @subtitle = ""
+
+    if @fname
+      @title = File.basename(@fname)
+      @dirname = File.dirname(@fname)
+      userhome = File.expand_path("~")
+      @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+    end
+
     t1 = Time.now
+    gui_set_current_buffer(@id)
+    gui_set_window_title(@title, @subtitle)
+
     set_content(str)
     debug "init time:#{Time.now - t1}"
 
@@ -63,7 +77,14 @@ class Buffer < String
     else
       $kbd.set_mode_to_default
     end
-    qt_set_current_buffer(@id)
+    # gui_set_current_buffer(@id)
+  end
+
+  def set_executable
+    if File.exists?(@fname)
+      FileUtils.chmod("+x", @fname)
+      message("Set executable: #{@fname}")
+    end
   end
 
   def detect_file_language
@@ -73,6 +94,20 @@ class Buffer < String
     @lang = "ruby" if @fname.match(/\.(rb)$/)
     @lang = "hyperplaintext" if @fname.match(/\.(txt)$/)
     @lang = "php" if @fname.match(/\.(php)$/)
+
+    lm = GtkSource::LanguageManager.new
+
+    lm.set_search_path(lm.search_path << ppath("lang/"))
+    lang = lm.guess_language(@fname)
+    # lang.get_metadata("line-comment-start")
+    # lang.get_metadata("block-comment-start")
+    # lang.get_metadata("block-comment-end")
+    @lang_nfo = lang
+    if !lang.nil? and !lang.id.nil?
+      puts "Guessed LANG: #{lang.id}"
+      @lang = lang.id
+    end
+
     if @lang
       gui_set_file_lang(@id, @lang)
     end
@@ -81,8 +116,7 @@ class Buffer < String
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
     # insert_txt_at(" ", pos)
-    qt_process_deltas
-    qt_add_image(imgpath, pos)
+    gui_add_image(imgpath, pos)
   end
 
   def is_legal_pos(pos, op = :read)
@@ -114,7 +148,6 @@ class Buffer < String
     b = " \n"
     txt = a + b
     insert_txt_at(txt, lr.end + 1)
-    qt_process_deltas
     imgpos = lr.end + 1 + a.size
     add_image(fname, imgpos)
   end
@@ -134,21 +167,7 @@ class Buffer < String
   end
 
   def get_file_type()
-    # We cant detect syntax if no filename
-    if !@fname
-      @syntax_detect_failed = true
-      return ""
-    end
-    if @ftype == nil
-      @ftype = VER::Syntax::Detector.detect(@fname)
-      if @ftype == nil
-        @syntax_detect_failed = true
-      else
-        @syntax_detect_failed = false
-      end
-    end
-    debug "ftype=#{@ftype.inspect}"
-    return @ftype
+    return @lang
   end
 
   def revert()
@@ -196,7 +215,7 @@ class Buffer < String
 
   def set_content(str)
     @encrypted_str = nil
-    @qt_update_highlight = true
+    @gui_update_highlight = true
     @ftype = nil
     if str[0..10] == "VMACRYPT001"
       @encrypted_str = str[11..-1]
@@ -250,7 +269,7 @@ class Buffer < String
     @update_hl_startpos = 0 #TODO
     @update_hl_endpos = self.size - 1
 
-    qt_set_buffer_contents(@id, self.to_s)
+    gui_set_buffer_contents(@id, self.to_s)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -259,6 +278,12 @@ class Buffer < String
     @fname = filename
     @pathname = Pathname.new(fname) if @fname
     @basename = @pathname.basename if @fname
+
+    @title = File.basename(@fname)
+    @dirname = File.dirname(@fname)
+    userhome = File.expand_path("~")
+    @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+
     detect_file_language
   end
 
@@ -434,7 +459,6 @@ class Buffer < String
     return if @edit_pos_history.empty?
     @edit_pos_history_i -= 1
     @edit_pos_history_i = @edit_pos_history.size - 1 if @edit_pos_history_i < 0
-    #        Ripl.start :binding => binding
     debug "@edit_pos_history_i=#{@edit_pos_history_i}"
     set_pos(@edit_pos_history[-@edit_pos_history_i])
     center_on_current_line
@@ -488,16 +512,26 @@ class Buffer < String
   end
 
   def get_com_str()
-    return nil if @syntax_detect_failed
+    # return nil if @syntax_detect_failed
 
     com_str = nil
-    if get_file_type() == "C" or get_file_type() == "Javascript"
-      com_str = "//"
-    elsif get_file_type() == "Ruby"
-      com_str = "#"
-    else
-      com_str = "//"
+    # if get_file_type() == "c" or get_file_type() == "java"
+    # com_str = "//"
+    # elsif get_file_type() == "ruby"
+    # com_str = "#"
+    # else
+    # com_str = "//"
+    # end
+
+    if !@lang_nfo.nil?
+      com_str = @lang_nfo.get_metadata("line-comment-start")
     end
+
+    # lang.get_metadata("block-comment-start")
+    # lang.get_metadata("block-comment-end")
+
+    com_str = "//" if com_str.nil?
+
     return com_str
   end
 
@@ -541,7 +575,6 @@ class Buffer < String
     ls = @line_ends[a] if a != nil
     # if a != nil and ls != @line_ends[a]
     # puts "NO MATCH @line_ends[a]"
-    # Ripl.start :binding => binding
     # end
 
     if ls == nil
@@ -553,7 +586,6 @@ class Buffer < String
   end
 
   def get_line_end(pos)
-    #Ripl.start :binding => binding
     return @line_ends.select { |x| x > pos }.min
   end
 
@@ -729,7 +761,7 @@ class Buffer < String
     elsif new_pos >= 0
       @pos = new_pos
     end
-    qt_set_cursor_pos(@id, @pos)
+    gui_set_cursor_pos(@id, @pos)
     calculate_line_and_column_pos
   end
 
@@ -1262,6 +1294,7 @@ class Buffer < String
   end
 
   def jump_to_next_instance_of_char(char, direction = FORWARD)
+
     #return if at_end_of_line?
     if direction == FORWARD
       position_of_next_char = self.index(char, @pos + 1)
@@ -1300,9 +1333,9 @@ class Buffer < String
     calculate_line_and_column_pos
   end
 
-  def execute_current_line_in_terminal()
+  def execute_current_line_in_terminal(autoclose = false)
     s = get_current_line
-    exec_in_terminal(s)
+    exec_in_terminal(s, autoclose)
   end
 
   def insert_new_line()
@@ -1322,8 +1355,18 @@ class Buffer < String
       # Indent start of new line based on last line
       last_line = line(@lpos)
       m = /^( +)([^ ]+|$)/.match(last_line)
-      debug m.inspect
-      c = c + " " * m[1].size if m
+      if m
+        c = c + " " * m[1].size if m
+      end
+      
+
+      #if tab indent
+      m = /^(\t+)([^\t]+|$)/.match(last_line)
+      if m
+        c = c + "\t" * m[1].size if m
+      end
+      
+      # debug m.inspect
     end
     if mode == BEFORE
       insert_pos = @pos
@@ -1457,7 +1500,6 @@ class Buffer < String
   def start_visual_mode()
     @visual_mode = true
     @selection_start = @pos
-    qt_set_selection_start(@id, selection_start)
     $kbd.set_mode(:visual)
   end
 
@@ -1467,7 +1509,13 @@ class Buffer < String
     return if !@visual_mode
 
     debug "COPY SELECTION"
-    set_clipboard(self[get_visual_mode_range])
+    s = self[get_visual_mode_range]
+    if x == :append
+      puts "APPEND"
+      s += "\n" + get_clipboard()
+    end
+
+    set_clipboard(s)
     end_visual_mode
     return true
   end
@@ -1612,18 +1660,17 @@ class Buffer < String
     else
       savepath = buflist.get_last_dir
     end
-    # Ripl.start :binding => binding
-    qt_file_saveas(savepath)
+    gui_file_saveas(savepath)
     # calls back to file_saveas
-    # TODO:?
   end
 
-  def save()
-    if !@fname
-      save_as()
-      return
-    end
-    message("Saving file #{@fname}")
+  def save_as_callback(fpath)
+    set_filename(fpath)
+    save()
+    gui_set_window_title(@title, @subtitle) #TODO: if not active buffer?
+  end
+
+  def write_contents_to_file(fpath)
     if @crypt != nil
       mode = "wb+"
       contents = "VMACRYPT001" + @crypt.encrypt(self.to_s)
@@ -1633,7 +1680,7 @@ class Buffer < String
     end
 
     Thread.new {
-      File.open(@fname, mode) do |io|
+      File.open(fpath, mode) do |io|
         #io.set_encoding(self.encoding)
 
         begin
@@ -1653,6 +1700,15 @@ class Buffer < String
     }
   end
 
+  def save()
+    if !@fname
+      save_as()
+      return
+    end
+    message("Saving file #{@fname}")
+    write_contents_to_file(@fname)
+  end
+
   # Indents whole buffer using external program
   def indent()
     file = Tempfile.new("out")
@@ -1665,7 +1721,7 @@ class Buffer < String
 
     message("Auto format #{@fname}")
 
-    if get_file_type() == "C" or get_file_type() == "C++"
+    if ["chdr", "c", "cpp"].include?(get_file_type())
 
       #C/C++/Java/JavaScript/Objective-C/Protobuf code
       system("clang-format -style='{BasedOnStyle: LLVM, ColumnLimit: 100,  SortIncludes: false}' #{file.path} > #{infile.path}")
@@ -1675,7 +1731,7 @@ class Buffer < String
       debug cmd
       system(cmd)
       bufc = IO.read(infile.path)
-    elsif get_file_type() == "Ruby"
+    elsif get_file_type() == "ruby"
       cmd = "rufo #{file.path}"
       debug cmd
       system(cmd)
@@ -1692,21 +1748,21 @@ class Buffer < String
   def backup()
     fname = @fname
     return if !@fname
-    message("Backup buffer #{fname}")
     spfx = fname.gsub("=", "==").gsub("/", "=:")
-    spath = File.expand_path("~/autosave")
+    spath = File.expand_path("~/.vimamsa/backup")
     return false if !can_save_to_directory?(spath)
     datetime = DateTime.now().strftime("%d%m%Y:%H%M%S")
     savepath = "#{spath}/#{spfx}_#{datetime}"
+    message("Backup buffer #{fname} TO: #{savepath}")
     if is_path_writable(savepath)
-      debug "BACKUP BUFFER TO: #{savepath}"
-      IO.write(savepath, self.to_s) if @crypt == nil #TODO: For encrypted
+      write_contents_to_file(savepath)
     else
       message("PATH NOT WRITABLE: #{savepath}")
     end
   end
 end
 
+#TODO
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
     IO.write(savepath, $buffer.to_s)

data/lib/vimamsa/buffer_list.rb

@@ -30,8 +30,8 @@ class BufferList < Array
     $buffer_history << @current_buf
     @recent_ind = 0
     $hook.call(:change_buffer, $buffer)
-    qt_set_current_buffer($buffer.id)
-    qt_set_cursor_pos($buffer.id, $buffer.pos)
+    gui_set_current_buffer($buffer.id)
+    gui_set_cursor_pos($buffer.id, $buffer.pos)
   end
 
   def switch()
@@ -83,8 +83,8 @@ class BufferList < Array
     $hook.call(:change_buffer, $buffer)
     $buffer.set_active
 
-    set_window_title("Vimamsa - #{fpath}")
-    qt_set_current_buffer($buffer.id)
+    gui_set_current_buffer($buffer.id)
+    gui_set_window_title($buffer.title,$buffer.subtitle)   
 
     # hpt_scan_images() if $debug # experimental
   end

data/lib/vimamsa/debug.rb

@@ -95,16 +95,16 @@ def run_test(test_id)
   $buffer = old_buffer
 end
 
-def qt_sleep(t2)
+#TODO: remove?
+def gui_sleep(t2)
   t1 = Time.now()
   while Time.now < t1 + t2
-    qt_process_events
     sleep(0.02)
   end
 end
 
 def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
-  open_new_file("TODO"); qt_sleep(0.1)
+  open_new_file("TODO"); gui_sleep(0.1)
 
   ttstart = Time.now
   Kernel.srand(1231)
@@ -114,7 +114,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     buf.jump_to_random_pos
     buf.insert_txt("Z") if rand() > 0.25
     buf.reset_highlight() if rand() > 0.1
-    qt_trigger_event
+    gui_trigger_event
 
     # puts "========line:========="
     # puts buf.current_line()
@@ -122,12 +122,12 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
 
     render_buffer($buffer)
 
-    qt_sleep(rand() / 2)
+    gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
       buf.revert
     end
 
-    qt_trigger_event
+    gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
     render_buffer($buffer)