vimamsa 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4603a715f3fd3b549cc38a9744d93617b3a87ba3d95268f77ed2c98c2c04643d
-  data.tar.gz: 26e82f3a6564a78dcd7188a69037f97bae3fb53c43be807560facfab8e70dd51
+  metadata.gz: 4d45a54c1e25d490c27465b9649d09fa3b0e5db85e91324fb8c70201de9ff5a1
+  data.tar.gz: f7393daa458da9e7c3b1e769049f7205e96e4ba157c162f9dacbdae700b6731d
 SHA512:
-  metadata.gz: 1f05aad90407dfdd0e9c310f08f5e79274a5901f714d63e353e7291f25c7f4dba3d402163f338cebf01fef4f8fae07522f85a58d62e76086661007f24b14a0bd
-  data.tar.gz: f503976439de2a311778b48a427354fc21a1b42434eb6a0bcfa5e3c00144fc3508abe029a058249c2b433e9f41f983679f44927ae095b1ec4a4eb36fafdbfe93
+  metadata.gz: e4d8be7daf217add0cef74e246bebf114d886f60739bc700d532035067f9a3c26dabde5ffbec7ef662278a6f7829f0513210a961e4b9c661b0f9c52ea839971a
+  data.tar.gz: 33315be557aaf4f294005e80a1c8b9be61da65b9d0d21cc90b8e03bddb0c4cf34df332217e11787d5e2dd3da1a0de459065c342b44f8a37f1aec5cd34f7ed4c1

data/README.md

@@ -4,7 +4,7 @@ Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK
 
 
 ## Requirements
- - Ruby 2.0+
+ - Ruby 3.0+
  - GTK 4
 
 ## Installation

data/lib/vimamsa/ack.rb

@@ -13,7 +13,6 @@ Will search all .txt files in the following directories:
   </span>"
 
     callback = proc { |x| FileContentSearch.search_buffer(x) }
-    # gui_one_input_action(nfo, "Search:", "search", callback)
 
     params = {}
     params["inputs"] = {}
@@ -21,7 +20,6 @@ Will search all .txt files in the following directories:
     params["inputs"]["extensions"] = { :label => "Limit to file extensions:", :type => :entry }
     params["inputs"]["extensions"][:initial_text] = conf(:default_search_extensions).join(",")
     params["inputs"]["btn1"] = { :label => "Search", :type => :button }
-    # callback = proc { |x| gui_replace_callback(x) }
 
     params[:callback] = callback
     PopupFormGenerator.new(params).run
@@ -106,20 +104,100 @@ Will search the following directories:
  If .vma_project exists in parent directory of current file, searches within that directory.
   </span>"
 
-  callback = proc { |x| ack_buffer(x) }
+  callback = proc { |x| Ack.new.ack_buffer(x) }
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def ack_buffer(_instr, b = nil)
-  instr = Shellwords.escape(_instr)
-  bufstr = ""
-  for path in vma.get_content_search_paths
-    bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
+def group_by_folder(list)
+  bh = {}
+  for b in list
+    fpath = b[:fpath]
+    if !fpath.nil?
+      bname = File.basename(b[:fpath])
+      dname = File.dirname(b[:fpath])
+    else
+      #TODO
+    end
+    bh[dname] ||= {}
+    bh[dname][:files] ||= []
+    bh[dname][:files] << { bname: bname, nfo: b }
+  end
+  arr = []
+
+  for k in bh.keys.sort
+    tp = tilde_path(k)
+    arr << { type: :dir, path: tp }
+    for f in bh[k][:files].sort_by { |x| x[:bname] }
+      arr << { type: :file, bname: f[:bname], nfo: f[:nfo] }
+    end
   end
-  if bufstr.size > 5
-    b = create_new_buffer(bufstr, "ack")
-    Gui.highlight_match(b, _instr, color: cnf.match.highlight.color!)
-  else
-    message("No results for input:#{instr}")
+  return arr
+end
+
+class Ack
+  attr_reader :buf
+  @@cur = nil # Current object of class
+
+  def self.cur()
+    return @@cur
+  end
+
+  def self.init()
+  end
+
+  def initialize()
+    @buf = nil
+    @line_to_id = {}
+  end
+
+  def ack_buffer(_instr, b = nil)
+    instr = Shellwords.escape(_instr)
+    bufstr = ""
+    for path in vma.get_content_search_paths
+      bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
+    end
+
+    b = ""
+    list = []
+    for x in bufstr.lines
+      if x.match(/(.*?):(\d+):(.+)/) # non greedy: *?
+        fn = $1
+        lineno = $2
+        matchpart = $3
+        pp [fn, lineno, matchpart]
+        b << "[#{fn},#{lineno},#{matchpart}]\n"
+        list << { fpath: fn, lineno: lineno, matchpart: matchpart }
+      end
+    end
+
+    gb = group_by_folder(list)
+    s = ""
+    @line_to_nfo = {}
+    i = 0
+    for x in gb
+      if x[:type] == :file
+        s << "╰─#{x[:bname]}:#{x[:nfo][:lineno]}:#{x[:nfo][:matchpart]}\n"
+        @line_to_nfo[i] = x
+      end
+      if x[:type] == :dir
+        s << "📂#{x[:path]}:\n"
+      end
+      i += 1
+    end
+
+    if s.size > 5
+      @buf = create_new_buffer(s, "ack")
+      @buf.module = self
+      @buf.line_action_handler = self.method("select_line")
+      Gui.highlight_match(@buf, _instr, color: cnf.match.highlight.color!)
+    else
+      message("No results for input:#{instr}")
+    end
+  end
+
+  def select_line(lineno)
+    debug "def select_line #{lineno}", 2
+    nfo = @line_to_nfo[lineno][:nfo]
+    jump_to_file(nfo[:fpath], nfo[:lineno].to_i)
   end
 end

data/lib/vimamsa/actions.rb

@@ -6,13 +6,10 @@ class Action
     @id = id
     @method = method
     @opt = opt
-
-    $actions[id] = self
+    vma.actions.register(id, self) # TODO: handle this in Editor class
   end
 end
 
-$actions = {}
-
 def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
     a = Action.new(id, name, callfunc, opt)
@@ -31,108 +28,126 @@ def missing_callfunc
   debug "missing_callfunc"
 end
 
-#TODO: remove
-# def call(id)
-  # call_action(id)
-# end
+#TODO: remove?
+def call_action(id)
+  vma.actions.call(id)
+end
 
-$acth = []
+class ActionList
+  def initialize
+    @acth = []
+    @actions = {}
+  end
 
-def call_action(id)
-  $acth << id
-  a = $actions[id]
-  if a
-    a.method.call()
-  else
-    message("Unknown action: " + id.inspect)
+  def register(id, obj)
+    @actions[id] = obj
   end
-end
 
-def last_action
-  return $acth[-1]
-end
+  def include?(act)
+    return @actions.has_key?(act)
+  end
 
-def search_actions()
-  l = []
-  opt = { :title => "Search for actions", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
-  $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
+  def [](id)
+    @actions[id]
+  end
 
-  gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                           "search_actions_select_callback",
-                           "search_actions_update_callback",
-                           opt)
-end
+  def call(id)
+    @acth << id
+    a = @actions[id]
+    if a
+      a.method.call()
+    else
+      message("Unknown action: " + id.inspect)
+    end
+  end
 
-$item_list = []
+  def last_action
+    return @acth[-1]
+  end
 
-def search_actions_update_callback(search_str = "")
-  return [] if search_str == ""
+  def gui_search()
+    l = []
+    opt = { :title => "Search for actions", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current.",
+            :columns => [{ :title => "Shortcut", :id => 0 }, { :title => "Action", :id => 1 }] }
 
-  item_list2 = []
-  for act_id in $actions.keys
-    act = $actions[act_id]
-    item = {}
-    item[:key] = ""
+    @select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
 
-    for mode_str in ["C", "V"]
-      c_kbd = vma.kbd.act_bindings[mode_str][act_id]
-      if c_kbd.class == String
-        item[:key] = "[#{mode_str} #{c_kbd}] "
-        break
-      end
-    end
-    # c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
-    item[:action] = act_id
-    item[:str] = act_id.to_s
-    if $actions[act_id].method_name != ""
-      item[:str] = $actions[act_id].method_name
-    end
-    item_list2 << item
+    gui_select_update_window(l, @select_keys.collect { |x| x.upcase },
+                             self.method("search_actions_select_callback"),
+                             self.method("search_actions_update_callback"),
+                             opt)
   end
 
-  item_list = item_list2
+  @item_list = []
 
-  a = filter_items(item_list, 0, search_str)
-  debug a.inspect
+  def search_actions_update_callback(search_str = "")
+    return [] if search_str == ""
 
-  r = a.collect { |x| [x[0][0], 0, x] }
-  debug r.inspect
-  $item_list = r
+    item_list2 = []
+    for act_id in @actions.keys
+      act = @actions[act_id]
+      item = {}
+      item[:key] = ""
 
-  # Ripl.start :binding => binding
+      for mode_str in ["C", "V"]
+        c_kbd = vma.kbd.act_bindings[mode_str][act_id]
+        if c_kbd.class == String
+          item[:key] = "[#{mode_str}] #{c_kbd} "
+          item[:key] = "" if item[:key].size > 15
+          break
+        end
+      end
+      # c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
+      item[:action] = act_id
+      item[:str] = act_id.to_s
+      if @actions[act_id].method_name != ""
+        item[:str] = @actions[act_id].method_name
+      end
+      item_list2 << item
+    end
 
-  r = a.collect { |x| ["#{x[0][:key]}#{x[0][:str]}", 0, x] }
-  return r
-end
+    item_list = item_list2
 
-def search_actions_select_callback(search_str, idx)
-  item = $item_list[idx][2]
-  acc = item[0][:action]
+    a = filter_items(item_list, 0, search_str)
+    debug a.inspect
 
-  debug "Selected:" + acc.to_s
-  gui_select_window_close(0)
+    r = a.collect { |x| [x[0][0], 0, x] }
+    debug r.inspect
+    @item_list = r
 
-  if acc.class == String
-    eval(acc)
-  elsif acc.class == Symbol
-    debug "Symbol"
-    call_action(acc)
+    r = a.collect { |x| [x[0][:key], x[0][:str]] }
+    return r
   end
-end
 
-def filter_items(item_list, item_key, search_str)
-  item_hash = {}
-  # debug item_list.inspect
-  scores = Parallel.map(item_list, in_threads: 8) do |item|
-    if item[:str].class != String
-      puts item.inspect
-      exit!
+  def search_actions_select_callback(search_str, idx)
+    item = @item_list[idx][2]
+    acc = item[0][:action]
+
+    debug "Selected:" + acc.to_s
+    gui_select_window_close(0)
+
+    if acc.class == String
+      eval(acc)
+    elsif acc.class == Symbol
+      debug "Symbol"
+      call(acc)
     end
-    [item, srn_dst(search_str, item[:str])]
   end
-  scores.sort_by! { |x| -x[1] }
-  debug scores.inspect
-  scores = scores[0..30]
 
-  return scores
+  def filter_items(item_list, item_key, search_str)
+    item_hash = {}
+    # debug item_list.inspect
+    scores = Parallel.map(item_list, in_threads: 8) do |item|
+      if item[:str].class != String
+        puts item.inspect
+        exit!
+      end
+      [item, srn_dst(search_str, item[:str])]
+    end
+    scores.sort_by! { |x| -x[1] }
+    debug scores.inspect
+    scores = scores[0..30]
+
+    return scores
+  end
 end

data/lib/vimamsa/buffer.rb

@@ -12,7 +12,7 @@ $update_highlight = false
 $ifuncon = false
 
 class Buffer < String
-  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save, :access_time
+  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save, :access_time, :selection_active
   attr_writer :call_func, :update_highlight
   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, :paste_lines, :mode_stack, :default_mode
 
@@ -24,6 +24,7 @@ class Buffer < String
 
     update_access_time
     @images = []
+    @prefix = prefix
     @audiofiles = []
     @lang = nil
     @id = @@num_buffers
@@ -47,27 +48,10 @@ class Buffer < String
     @is_parsing_syntax = false
     @last_update = Time.now - 100
     @highlights = {}
-    if fname != nil
-      @fname = File.expand_path(fname)
-      detect_file_language()
-    else
-      @fname = fname
-    end
+
+    set_filename(fname)
     @hl_queue = []
     @line_action_handler = nil
-
-    @dirname = nil
-    @title = "*#{prefix}-#{@id}*"
-    @subtitle = ""
-
-    if @fname
-      @title = File.basename(@fname)
-      @dirname = File.dirname(@fname)
-      userhome = File.expand_path("~")
-      # @subtitle = @dirname.gsub(/^#{userhome}/, "~")
-      @subtitle = @fname.gsub(/^#{userhome}/, "~")
-    end
-
     t1 = Time.now
 
     set_content(str)
@@ -304,7 +288,7 @@ class Buffer < String
     if is_image_file(fname)
       debug "Dropped image file"
       insert_image_after_current_line(fname)
-    elsif vma.can_open_extension?(fname)
+    elsif file_is_text_file(fname)
       debug "Dropped text file"
       open_new_file(fname)
     else
@@ -325,15 +309,10 @@ class Buffer < String
     self.set_content(str)
   end
 
-  def decrypt(password)
-    return if @encrypted_str.nil?
-    begin
-      @crypt = Encrypt.new(password)
-      str = @crypt.decrypt(@encrypted_str)
-    rescue OpenSSL::Cipher::CipherError => e
-      str = "incorrect password"
-    end
-    self.set_content(str)
+  def init_encrypted(crypt:, filename:, encrypted:)
+    @crypt = crypt
+    @encrypted_str = encrypted
+    set_filename(filename)
   end
 
   def sanitycheck_btree()
@@ -365,12 +344,6 @@ class Buffer < String
     @encrypted_str = nil
     @gui_update_highlight = true
     @ftype = nil
-    if str[0..10] == "VMACRYPT001"
-      @encrypted_str = str[11..-1]
-      callback = proc { |x| self.decrypt(x) }
-      gui_one_input_action("Decrypt file \n #{@fname}", "Password:", "decrypt", callback, { :hide => true })
-      str = "ENCRYPTED"
-    end
 
     if (str[-1] != "\n")
       str << "\n"
@@ -424,7 +397,10 @@ class Buffer < String
   end
 
   def set_filename(filename)
+    debug "set_filename(filename) #{filename}"
     @fname = filename
+    @title = "*#{@prefix}-#{@id}*"
+    return if @fname.nil?
     @pathname = Pathname.new(fname) if @fname
     @basename = @pathname.basename if @fname
 
@@ -435,6 +411,7 @@ class Buffer < String
     vma.buffers.last_dir = @dirname
 
     detect_file_language
+    gui_set_window_title(@title, @subtitle)
   end
 
   def get_short_path()
@@ -1051,7 +1028,7 @@ class Buffer < String
 
   # Activated when enter/return pressed
   def handle_line_action()
-    if line_action_handler.class == Proc
+    if line_action_handler.class == Proc or line_action_handler.class == Method
       # Custom handler
       line_action_handler.call(lpos)
     else
@@ -1098,6 +1075,7 @@ class Buffer < String
       else
         wtype = :file
       end
+      word = path
       # elsif hpt_check_cur_word(word) #TODO: check only
       # debug word
     elsif linep != nil
@@ -1111,6 +1089,7 @@ class Buffer < String
         return [fn, :hpt_link]
       end
     end
+    
     return [word, wtype]
   end
 
@@ -1258,17 +1237,26 @@ class Buffer < String
     @need_redraw = false
   end
 
-  def start_visual_mode()
-    @visual_mode = true
-    @selection_start = @pos
-    $kbd.set_mode(:visual)
+  def selection_active?
+    @selection_active
+  end
+
+  def end_selection()
+    @selection_start = nil
+    @selection_active = false
+    @visual_mode = false
+    #TODO: remove @visual_mode
   end
 
   def start_selection()
-    @visual_mode = true
     @selection_start = @pos
-    $kbd.set_mode(:visual)
-    #TODO: implement without setting kbd mode
+    @selection_active = true
+    @visual_mode = true
+  end
+
+  # Start selection if not already started
+  def continue_selection()
+    start_selection if !@selection_active
   end
 
   def copy_active_selection(x = nil)
@@ -1297,6 +1285,7 @@ class Buffer < String
     txt.gsub!(/\w+/, &:capitalize) if op == :capitalize
     txt.swapcase! if op == :swapcase
     txt.reverse! if op == :reverse
+    txt = to_camel_case(txt) if op == :camelcase
 
     replace_range(r, txt)
     end_visual_mode
@@ -1380,6 +1369,7 @@ class Buffer < String
       # TODO: should not happen
     end
     debug "End visual mode"
+    end_selection
     vma.kbd.to_previous_mode
     @visual_mode = false
     return true

data/lib/vimamsa/buffer_changetext.rb

@@ -74,20 +74,35 @@ class Buffer < String
     set_pos(l.end + 1)
   end
 
+  # Workaround for https://github.com/ruby-gnome/ruby-gnome/issues/1609
+  def paste_start_xclip(at, register)
+    @clipboard_paste_running = true
+    Thread.new {
+      text = `xclip -selection c -o`
+      paste_finish(text, at, register)
+    }
+    return nil
+  end
+
   # Start asynchronous read of system clipboard
   def paste_start(at, register)
     @clipboard_paste_running = true
+
+    if true or running_wayland? and !GLib::Version::or_later?(2, 79, 0)
+      return paste_start_xclip(at, register)
+    end
+    
     clipboard = vma.gui.window.display.clipboard
     clipboard.read_text_async do |_clipboard, result|
       begin
         text = clipboard.read_text_finish(result)
       rescue Gio::IOError::NotSupported
-        # Happens when pasting from KeePassX and clipboard cleared
         debug Gio::IOError::NotSupported
       else
         paste_finish(text, at, register)
       end
     end
+    return nil
   end
 
   def paste_finish(text, at, register)
@@ -141,7 +156,7 @@ class Buffer < String
     return if !is_legal_pos(p)
     (word, range) = get_word_in_pos(p, boundary: :word)
     debug [word, range].to_s, 2
-    endpos = range.begin+rep.size
+    endpos = range.begin + rep.size
     replace_range(range, rep)
     set_pos(endpos)
   end
@@ -246,9 +261,9 @@ class Buffer < String
   end
 
   def insert_tab
-    convert = conf(:tab_to_spaces_default)
-    convert = true if conf(:tab_to_spaces_languages).include?(@lang)
-    convert = false if conf(:tab_to_spaces_not_languages).include?(@lang)
+    convert = cnf.tab.to_spaces_default?
+    convert = true if cnf.tab.to_spaces_languages?.include?(@lang)
+    convert = false if cnf.tab.to_spaces_not_languages?.include?(@lang)
     tw = conf(:tab_width)
     if convert
       indent_to = (@cpos / tw) * tw + tw

data/lib/vimamsa/buffer_list.rb

@@ -65,6 +65,12 @@ class BufferList
     # TODO: implement using heap/priorityque
     @list.sort_by! { |x| x.access_time }
   end
+  
+  def each(&block)
+    for x in slist
+      block.call(x)
+    end
+  end
 
   def get_last_visited_id
     last_buf = nil
@@ -155,6 +161,7 @@ class BufferList
     end
 
     # hpt_scan_images() if cnf.debug? # experimental
+    return bu
   end
 
   def to_s

data/lib/vimamsa/buffer_manager.rb

@@ -73,7 +73,7 @@ class BufferManager
     for b in vma.buffers.list
       if !b.fname.nil?
         bname = File.basename(b.fname)
-        dname = File.dirname(b.dirname)
+        dname = File.dirname(b.fname)
       else
         bname = b.list_str
         dname = "*"

data/lib/vimamsa/conf.rb

@@ -159,3 +159,6 @@ cnf.font.size = 11
 cnf.font.family = "Monospace"
 
 
+cnf.macro.animation_delay = 0.02
+
+