vimamsa 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e861051f02f35b286c8e97c225b69b9377f1d5cdf3dcf311de89a2ababb9dcd9
-  data.tar.gz: c27f3bc13a925dbd0293592f9d692a1918e91a7ce8047868c340098be76d1613
+  metadata.gz: d29e057a168e6c2152c0d8da4c6957b863bd44e7dd9328ba2d5520ae11ab49a2
+  data.tar.gz: 4cdad5268d59c11e83335818bbcdd5627fe3e75045ab2602f84fd0d7440c6d7d
 SHA512:
-  metadata.gz: 2dbc0c1b7c6f42f0d4eca33c82b5a7e007ca549dda77b4e4d23056264a16b853b2cacbaa120ff24a1b25eb010aeea79efc955a6f3b9018bf9cca1249276f2410
-  data.tar.gz: b9e9deb8f5c3faf4a0f5e03757a8070d91e79e1bc959c991ca101df288fb62f809acc15154e7eab234647ad3d9b2d7a2b488b6013ff3a5c6db1978cf06e1654c
+  metadata.gz: c9ac4b15042dd07cab99b7be0859e714684073ff4438b8048f33bd9c21779b545d61f1ff17608d1ab15fe2e31a356e2af24df6002d027621958776b42c568db8
+  data.tar.gz: afdf6cab6f002f925542831c7e439eace41b9fd4217e8f659d9774e2c7609309ba55e1d1042447d0c091437ab379ca76c0c6fb515c7a90a7720603f1bad68b89

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/demo.txt

@@ -15,7 +15,7 @@ Extension .txt can be omitted:
 ⟦help:keybindings⟧
 
 Customizations:
-⟦~/.vimamsa/custom.rb⟧
+⟦~/.config/vimamsa/custom.rb⟧
 
 ◼ Images
 Images work in .txt-files by drag&drop. (experimental)

data/exe/vimamsa

@@ -9,7 +9,7 @@ selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
 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")
+listen_dir = File.expand_path("~/.config/vimamsa/listen")
 if File.exist?(listen_dir) and !ARGV[0].nil?
   tmpf = Tempfile.new("vmarun", listen_dir)
   fp = tmpf.path

data/lib/vimamsa/buffer.rb

@@ -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()
@@ -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
 
@@ -1268,18 +1247,17 @@ class Buffer < String
     @visual_mode = false
     #TODO: remove @visual_mode
   end
-  
+
   def start_selection()
     @selection_start = @pos
     @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)
     debug "!COPY SELECTION"

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

data/lib/vimamsa/editor.rb

@@ -1,9 +1,9 @@
 require "pty"
 
-def handle_drag_and_drop(fname)
-  debug "EDITOR:handle_drag_and_drop"
-  buf.handle_drag_and_drop(fname)
-end
+# def handle_drag_and_drop(fname)
+# debug "EDITOR:handle_drag_and_drop"
+# buf.handle_drag_and_drop(fname)
+# end
 
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro, :actions
@@ -91,23 +91,23 @@ class Editor
 
     @gui.init_menu
 
-    mkdir_if_not_exists("~/.vimamsa")
-    mkdir_if_not_exists("~/.vimamsa/backup")
-    mkdir_if_not_exists("~/.vimamsa/listen")
-    listen_dir = File.expand_path "~/.vimamsa/listen"
+    mkdir_if_not_exists("~/.config/vimamsa")
+    mkdir_if_not_exists("~/.config/vimamsa/backup")
+    mkdir_if_not_exists("~/.config/vimamsa/listen")
+    listen_dir = File.expand_path "~/.config/vimamsa/listen"
     listener = Listen.to(listen_dir) do |modified, added, removed|
       debug([modified: modified, added: added, removed: removed])
       open_file_listener(added)
     end
     listener.start
 
-    custom_fn = File.expand_path("~/.vimamsa/custom.rb")
+    custom_fn = File.expand_path("~/.config/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")
+    mkdir_if_not_exists("~/.config/vimamsa/custom.rb")
 
     $cnf[:theme] = "Twilight_edit"
     $cnf[:syntax_highlight] = true
@@ -119,7 +119,7 @@ class Editor
     # set_gui_style(1)
 
     #TODO: remove
-    dotfile = read_file("", "~/.vimamsarc")
+    dotfile = read_file("", "~/.config/vimamsarc")
     eval(dotfile) if dotfile
 
     custom_script = read_file("", custom_fn)
@@ -129,9 +129,12 @@ class Editor
     FileManager.init
     Autocomplete.init
 
+    if cnf.audio.enabled?
+      require "vimamsa/audio"
+    end
+
     if cnf.lsp.enabled?
       require "vimamsa/langservp"
-      require "vimamsa/audio" # TODO:config
       @langsrv["ruby"] = LangSrv.new("ruby")
       @langsrv["cpp"] = LangSrv.new("cpp")
     end
@@ -287,7 +290,6 @@ end
 
 def _quit()
   vma.shutdown
-  # Gtk.main_quit
 end
 
 def fatal_error(msg)
@@ -552,6 +554,7 @@ end
 
 def jump_to_file(filename, tnum = nil, charn = nil)
   b = open_new_file(filename)
+  return if b.nil?
   # debug "open_new_file #{filename}, #{tnum} = nil, #{charn}",2
 
   # Link to character position
@@ -595,6 +598,10 @@ def open_new_file(filename, file_contents = "")
       message("File #{filename} does not contain text")
       return false
     end
+    if Encrypt.is_encrypted?(filename)
+      decrypt_dialog(filename: filename)
+      return nil
+    end
     message "New file opened: #{filename}"
     fname = filename
     bu = load_buffer(fname)
@@ -615,7 +622,7 @@ def hook_draw()
 end
 
 def get_dot_path(sfx)
-  dot_dir = File.expand_path("~/.vimamsa")
+  dot_dir = File.expand_path("~/.config/vimamsa")
   Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
   dpath = "#{dot_dir}/#{sfx}"
   return dpath

data/lib/vimamsa/encrypt.rb

@@ -1,6 +1,44 @@
 require "openssl"
 
+def decrypt_dialog(filename:, wrong_pass: false)
+  callback = proc { |x| Encrypt.open(filename, x) }
+  msg = ""
+  msg = "\nWRONG PASSWORD!\n" if wrong_pass
+  gui_one_input_action("Decrypt file \n #{filename}\n#{msg}", "Password:", "Decrypt", callback, { :hide => true })
+end
+
 class Encrypt
+  def self.is_encrypted?(fn)
+    debug "self.is_encrypted?(fn)", 2
+    begin
+      file = File.open(fn, "r")
+      first_11_characters = file.read(11)
+      return true if first_11_characters == "VMACRYPT001"
+    rescue Errno::ENOENT
+      puts "File not found: #{file_path}"
+    rescue => e
+      puts "An error occurred: #{e.message}"
+    ensure
+      file&.close
+    end
+    return false
+  end
+
+  def self.open(fn, password)
+    debug "open_encrypted(filename,password)", 2
+    encrypted = read_file("", fn)[11..-1]
+    begin
+      crypt = Encrypt.new(password)
+      str = crypt.decrypt(encrypted)
+      # debug "PASS OK!", 2
+      bu = create_new_buffer(str)
+      bu.init_encrypted(crypt: crypt, filename: fn, encrypted: encrypted)
+    rescue OpenSSL::Cipher::CipherError => e
+      # Wrong password
+      decrypt_dialog(filename: fn, wrong_pass: true)
+    end
+  end
+
   def initialize(pass_phrase)
     salt = "uvgixEtU"
     @enc = OpenSSL::Cipher.new "AES-128-CBC"
@@ -31,7 +69,6 @@ class Encrypt
   end
 end
 
-
 def encrypt_cur_buffer()
   callback = proc { |x| encrypt_cur_buffer_callback(x) }
   gui_one_input_action("Encrypt", "Password:", "Encrypt", callback, { :hide => true })

data/lib/vimamsa/file_manager.rb

@@ -123,7 +123,7 @@ class FileManager
   def cut_file
     fn = cur_file
     debug "CUT FILE #{fn}", 2
-    @cut_files << fn
+    @cut_files << fn if !@cut_files.include?(fn)
     @copied_files = []
   end
 

data/lib/vimamsa/gui.rb

@@ -8,6 +8,17 @@ def iterate_gui_main_loop
   GLib::MainContext.default.iteration(true)
 end
 
+def start_profiler
+  require "ruby-prof"
+  RubyProf.start
+end
+
+def end_profiler
+  result = RubyProf.stop
+  printer = RubyProf::FlatPrinter.new(result)
+  printer.print(STDOUT)
+end
+
 # Wait for window resize to take effect
 # GTk3 had a resize notify event which got removed in gtk4
 # https://discourse.gnome.org/t/gtk4-any-way-to-connect-to-a-window-resize-signal/14869/3
@@ -193,21 +204,6 @@ class VMAgui
     @img_resizer_active = false
     @windows = {}
     @app = nil
-    # imgproc = proc {
-    # GLib::Idle.add(proc {
-    # if !buf.images.empty?
-    # vma.gui.scale_all_images
-
-    # w = Gtk::Window.new(:toplevel)
-    # w.set_default_size(1, 1)
-    # w.show_all
-    # Thread.new { sleep 0.1; w.destroy }
-    # end
-
-    # false
-    # })
-    # }
-    # @delex = DelayExecutioner.new(1, imgproc)
   end
 
   def run
@@ -223,18 +219,16 @@ class VMAgui
         t.exit
       end
     end
-  end
-
-  def delay_scale()
-    if Time.now - @dtime > 2.0
-    end
+    @app.quit
   end
 
   def scale_all_images
-    debug "scale all", 2
-    for img in buf.images
-      if !img[:obj].destroyed?
-        img[:obj].scale_image
+    for k, window in @windows
+      bu = window[:sw].child.bufo
+      for img in bu.images
+        if !img[:obj].destroyed?
+          img[:obj].scale_image
+        end
       end
     end
     false
@@ -735,12 +729,28 @@ class VMAgui
     end
 
     # Vimamsa::Menu.new(@menubar) #TODO:gtk4
+    GLib::Idle.add(proc { self.monitor })
+
     app.run
 
     # @window.show_all
     # @window.show
   end
 
+  def monitor
+    @monitor_time ||= Time.now
+    @sw_width ||= @sw.width
+    return true if Time.now - @monitor_time < 0.2
+    # Detect element resize
+    if @sw.width != @sw_width
+      # puts "@sw.width=#{@sw.width}"
+      @sw_width = @sw.width
+      DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { vma.gui.scale_all_images })
+    end
+    @monitor_time = Time.now
+    return true
+  end
+
   def init_menu
     Vimamsa::Menu.new(@menubar, @app)
   end
@@ -755,6 +765,10 @@ class VMAgui
 
   def set_one_column
     return if !@two_column
+    #This always closes the leftmost column/window
+    #TODO: close rightmost column if left active
+    set_active_window(1)
+    
     @windows[2][:sw].set_child(nil)
     @windows.delete(2)
 

data/lib/vimamsa/gui_sourceview.rb

@@ -79,7 +79,6 @@ class VSourceView < GtkSource::View
   end
 
   def set_content(str)
-    delete_cursorchar
     self.buffer.set_text(str)
   end
 
@@ -123,6 +122,52 @@ class VSourceView < GtkSource::View
   def register_signals()
     check_controllers
 
+    # TODO: accept GLib::Type::STRING also?
+    @dt = Gtk::DropTarget.new(GLib::Type["GFile"], [Gdk::DragAction::COPY, Gdk::DragAction::MOVE])
+    # GLib::Type::INVALID
+
+    self.add_controller(@dt)
+    @dt.signal_connect "drop" do |obj, v, x, y|
+      if v.value.gtype == GLib::Type["GLocalFile"]
+        uri = v.value.uri
+      elsif v.value.class == String
+        uri = v.value.gsub(/\r\n$/, "")
+      end
+      debug "dt,drop #{v.value},#{x},#{y}", 2
+      begin
+        fp = URI(uri).path
+        buf.handle_drag_and_drop(fp)
+      rescue URI::InvalidURIError
+      end
+      true
+    end
+
+    @dt.signal_connect "enter" do |gesture, x, y, z, m|
+      debug "dt,enter", 2
+      Gdk::DragAction::COPY
+    end
+
+    @dt.signal_connect "motion" do |obj, x, y|
+      debug "dt,move", 2
+
+      Gdk::DragAction::COPY
+    end
+
+    # dc = Gtk::DropControllerMotion.new
+    # self.add_controller(dc)
+    # dc.signal_connect "enter" do |gesture, x, y|
+    # debug "enter", 2
+    # debug [x, y]
+    # # Ripl.start :binding => binding
+    # true
+    # end
+
+    # dc.signal_connect "motion" do |gesture, x, y|
+    # debug "move", 2
+    # debug [x, y]
+    # true
+    # end
+
     # Implement mouse selections using @cnt_mo and @cnt_drag
     @cnt_mo = Gtk::EventControllerMotion.new
     self.add_controller(@cnt_mo)
@@ -151,7 +196,7 @@ class VSourceView < GtkSource::View
         debug "Not enough drag", 2
         buf.end_selection
         # elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
-      elsif vma.kbd.get_scope != :editor 
+      elsif vma.kbd.get_scope != :editor
         # Can't transition from editor wide mode to buffer specific mode
         vma.kbd.set_mode(:visual)
       else
@@ -236,14 +281,12 @@ class VSourceView < GtkSource::View
 
   def handle_scrolling()
     return # TODO
-    delete_cursorchar
     # curpos = buffer.cursor_position
     # debug "MOVE CURSOR: #{curpos}"
     return nil if vma.gui.nil?
     return nil if @bufo.nil?
     vma.gui.run_after_scrolling proc {
       debug "START UPDATE POS AFTER SCROLLING", 2
-      delete_cursorchar
       bc = window_to_buffer_coords(Gtk::TextWindowType::WIDGET, gutter_width + 2, 60)
       if !bc.nil?
         i = coord_to_iter(bc[0], bc[1])
@@ -257,7 +300,6 @@ class VSourceView < GtkSource::View
 
   def set_cursor_to_top
     debug "set_cursor_to_top", 2
-    delete_cursorchar
     bc = window_to_buffer_coords(Gtk::TextWindowType::WIDGET, gutter_width + 2, 60)
     if !bc.nil?
       i = coord_to_iter(bc[0], bc[1])
@@ -270,7 +312,6 @@ class VSourceView < GtkSource::View
 
   # def handle_key_event(event, sig)
   def handle_key_event(keyval, keyname, sig)
-    delete_cursorchar
     if $update_cursor
       handle_scrolling
     end
@@ -394,7 +435,6 @@ class VSourceView < GtkSource::View
   end
 
   def handle_deltas()
-    delete_cursorchar
     any_change = false
     while d = @bufo.deltas.shift
       any_change = true
@@ -435,7 +475,6 @@ class VSourceView < GtkSource::View
   end
 
   def set_cursor_pos(pos)
-    delete_cursorchar
     itr = buffer.get_iter_at(:offset => pos)
     itr2 = buffer.get_iter_at(:offset => pos + 1)
     buffer.place_cursor(itr)
@@ -454,7 +493,7 @@ class VSourceView < GtkSource::View
     $idle_scroll_to_mark = true
     ensure_cursor_visible
 
-    draw_cursor
+    # draw_cursor
 
     return true
   end
@@ -516,18 +555,7 @@ class VSourceView < GtkSource::View
     end
   end
 
-  # Delete the extra char added to buffer to represent the cursor
-  def delete_cursorchar
-    if !@cursorchar.nil?
-      itr = buffer.get_iter_at(:offset => @cursorchar)
-      itr2 = buffer.get_iter_at(:offset => @cursorchar + 1)
-      buffer.delete(itr, itr2)
-      @cursorchar = nil
-    end
-  end
-
   def after_action
-    delete_cursorchar
     iterate_gui_main_loop
     handle_deltas
     iterate_gui_main_loop
@@ -543,7 +571,8 @@ class VSourceView < GtkSource::View
           self.style_context.remove_provider(@cursor_prov)
         end
         prov = Gtk::CssProvider.new
-        prov.load(data: ".view text selection { background-color: #{bg}; color: #ffffff; }")
+        # prov.load(data: ".view text selection { background-color: #{bg}; color: #ffffff; }")
+        prov.load(data: ".view text selection { background-color: #{bg}; color: #ffffff; } .view { caret-color: #{bg};  }")
         self.style_context.add_provider(prov)
         @cursor_prov = prov
       end
@@ -557,40 +586,29 @@ class VSourceView < GtkSource::View
     # @tt.font = "Arial"
     # end
 
+    sv = vma.gui.sw.child
+    return if sv.nil? #TODO: should not happen?
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
     ctype = :visual if vma.buf.selection_active?
 
-    delete_cursorchar
     vma.gui.remove_overlay_cursor
     if [:command, :replace, :browse].include?(ctype)
       set_cursor_color(ctype)
-      if @bufo[@bufo.pos] == "\n"
-        # If we are at end of line, it's not possible to draw the cursor by making a selection. I tried to do this by drawing an overlay, but that generates issues. If moving the cursor causes the ScrolledWindow to be scrolled, these errors randomly appear and the whole view shows blank:
-        # (ruby:21016): Gtk-WARNING **: 19:52:23.181: Trying to snapshot GtkSourceView 0x55a97524c8c0 without a current allocation
-        # (ruby:21016): Gtk-WARNING **: 19:52:23.181: Trying to snapshot GtkGizmo 0x55a9727d2580 without a current allocation
-        # (ruby:21016): Gtk-WARNING **: 19:52:23.243: Trying to snapshot GtkSourceView 0x55a97524c8c0 without a current allocation
-        # vma.gui.overlay_draw_cursor(@bufo.pos)
-
-        # Current workaround is to add an empty space to the place where the cursor is and then remove this whenever we get any kind of event that might cause this class to be accessed.
-        itr = buffer.get_iter_at(:offset => @bufo.pos)
-        buffer.insert(itr, " ") # normal space
-        # buffer.insert(itr, " ") # thin space (U+2009)
-        # buffer.insert(itr, "l")
-        @cursorchar = @bufo.pos
-
-        # Apparently we need to redo this after buffer.insert:
-        itr = buffer.get_iter_at(:offset => @bufo.pos)
-        itr2 = buffer.get_iter_at(:offset => @bufo.pos + 1)
-        # buffer.apply_tag(@tt, itr, itr2)
-        buffer.select_range(itr, itr2)
-      else
-        itr = buffer.get_iter_at(:offset => @bufo.pos)
-        itr2 = buffer.get_iter_at(:offset => @bufo.pos + 1)
-        buffer.select_range(itr, itr2)
-      end
-      # elsif @bufo.visual_mode?
 
+      sv.overwrite = true
+      # sv.cursor_visible = true
+      # sv.reset_cursor_blink
+      
+      # (Via trial and error) This combination is needed to make cursor visible:
+      sv.cursor_visible = false
+      sv.cursor_visible = true
+      
+      # sv.reset_cursor_blink
+      Gtk::Settings.default.gtk_cursor_blink = false
+      # Gtk::Settings.default.gtk_cursor_blink_time = 8000
+      # vma.gui.sw.child.toggle_cursor_visible
+      # vma.gui.sw.child.cursor_visible = true
     elsif ctype == :visual
       set_cursor_color(ctype)
       # debug "VISUAL MODE"
@@ -601,16 +619,19 @@ class VSourceView < GtkSource::View
       # Pango-CRITICAL **: pango_layout_get_cursor_pos: assertion 'index >= 0 && index <= layout->length' failed
       buffer.select_range(itr, itr2)
     elsif ctype == :insert
-      # Not sure why this is needed
-      itr = buffer.get_iter_at(:offset => @bufo.pos)
-      buffer.select_range(itr, itr)
-
-      # Via trial and error, this combination is only thing that seems to work:
-      vma.gui.sw.child.toggle_cursor_visible
-      vma.gui.sw.child.cursor_visible = true
-
+      set_cursor_color(ctype)
+      sv.overwrite = false
+      # sv.cursor_visible = false
+      # sv.cursor_visible = true
       debug "INSERT MODE"
     else # TODO
     end
+    if [:insert, :command, :replace, :browse].include?(ctype)
+      # Place cursor where it already is
+      # Without this hack, the cursor doesn't always get drawn
+      pos = @bufo.pos
+      itr = buffer.get_iter_at(:offset => pos)
+      buffer.place_cursor(itr)
+    end
   end
 end

data/lib/vimamsa/gui_sourceview_autocomplete.rb

@@ -24,7 +24,9 @@ class Autocomplete
 
   def self.add_words(words)
     for w in words
-      @@trie << w
+      if w.size < 100
+        @@trie << w
+      end
     end
   end
 

data/lib/vimamsa/hyper_plain_text.rb

@@ -7,7 +7,7 @@ def hpt_check_cur_word(w)
       dn = File.dirname(vma.buf.fname)
 
       fcands = []
-      if fpfx[0] != "/"
+      if fpfx[0] != "/" and fpfx[0] != "~"
         fcands << "#{dn}/#{fpfx}"
         fcands << "#{dn}/#{fpfx}.txt"
       end
@@ -26,7 +26,7 @@ def hpt_check_cur_word(w)
       if fn
         if m[2] == "audio"
           # Thread.new { Audio.play(fn) }
-          Audio.play(fn)
+          Audio.play(fn) if cnf.audio.enabled?
         else
           if !file_is_text_file(fn)
             message "Not text file #{fn}"
@@ -52,6 +52,7 @@ def hpt_check_cur_word(w)
   return nil
 end
 
+
 def hpt_create_new_file(fn)
   create_new_file(fn)
 end
@@ -128,7 +129,7 @@ def hpt_scan_images(bf = nil)
   }
 
   # Need to scale after buffer loaded
-  GLib::Idle.add(proc { vma.gui.scale_all_images })
+  run_as_idle proc { vma.gui.scale_all_images }
 
   # vma.gui.delex.run #TODO:gtk4
 end

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -17,6 +17,7 @@ cnf.mode.default.cursor.background = "#03fcca"
 cnf.mode.visual.cursor.background = "#bc6040"
 cnf.mode.replace.cursor.background = "#fc0331"
 cnf.mode.browse.cursor.background = "#f803fc"
+cnf.mode.insert.cursor.background = "#ffffff"
 
 def _insert_move(op)
   if op == :pagedown
@@ -332,6 +333,7 @@ default_keys = {
   "CV , R" => "restart_application",
   # "I ctrl!" => "vma.kbd.to_previous_mode",
   "C shift!" => "buf.save",
+  "I ctrl-s" => "buf.save",
   "I <char>" => "buf.insert_txt(<char>)",
   "I esc || I ctrl!" => "vma.kbd.to_previous_mode",
 

data/lib/vimamsa/macro.rb

@@ -165,7 +165,7 @@ class Macro
     m = @recorded_macros[name]
     return if !(m.kind_of?(Array) and m.any?)
     contents = m.join(";")
-    dot_dir = File.expand_path("~/.vimamsa")
+    dot_dir = File.expand_path("~/.config/.vimamsa")
     Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
     save_fn = "#{dot_dir}/macro_#{name}.rb"
 

data/lib/vimamsa/rbvma.rb

@@ -1,3 +1,5 @@
+
+# require "bundler/setup"
 require "date"
 require "fileutils"
 

data/lib/vimamsa/util.rb

@@ -3,6 +3,18 @@ require "open3"
 VOWELS = %w(a e i o u)
 CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x y z)
 
+def running_wayland?
+  sess = ENV["DESKTOP_SESSION"]
+  sess ||= ENV["XDG_SESSION_DESKTOP"]
+  sess ||= ENV["GDMSESSION"]
+  sess ||= ""
+  if sess.match(/wayland/)
+    return true
+  else
+    return false
+  end
+end
+
 def tilde_path(abspath)
   userhome = File.expand_path("~/")
   abspath.sub(/^#{Regexp.escape(userhome)}\//, "~/")
@@ -46,13 +58,16 @@ end
 
 def file_mime_type(fpath)
   fpath = File.expand_path(fpath)
-  return false if !File.readable?(fpath)
+  return nil if !File.readable?(fpath)
   r = exec_cmd("file", "--mime-type", "--mime-encoding", fpath)
-  return false if r.class != String
-  return false if r.size < 2
+  return nil if r.class != String
+  return nil if r.size < 2
   m = r.match(".*:\s*(.*)")
-  mimetype = m[1].match(/(.*);/)
-  charset = m[1].match(/charset=(.*)/)
+  b = m[1].match(/(.*);/)
+  c = m[1].match(/charset=(.*)/)
+  return nil if b.nil? or c.nil?
+  mimetype = b[1]
+  charset = c[1]
   return [mimetype, charset]
 end
 
@@ -185,6 +200,17 @@ end
 # Used for image scaling after window resize
 
 class DelayExecutioner
+
+  # Run 'callable.call' if 'wait' time elapsed from last exec call for this id
+  def self.exec(id:, wait:, callable:)
+    @@h ||= {}
+    h = @@h
+    if h[id].nil?
+      h[id] = DelayExecutioner.new(wait, callable)
+    end
+    h[id].run
+  end
+
   def initialize(wait_time, _proc)
     @wait_time = wait_time
     @proc = _proc
@@ -206,7 +232,10 @@ class DelayExecutioner
   end
 
   def run()
+    # Reset @lastt to further delay execution until @wait_time from now
     @lastt = Time.now
+
+    # If already executed after last call to run()
     if @thread_running == false
       @thread_running = true
       start_thread
@@ -299,17 +328,22 @@ end
 
 def is_image_file(fpath)
   return false if !File.exist?(fpath)
-  return false if !fpath.match(/.(jpg|jpeg|png)$/i)
-  #TODO: check contents of file
-  return true
+  # return false if !fpath.match(/.(jpg|jpeg|png)$/i)
+  mime = file_mime_type(fpath)
+  if !mime.nil?
+    if mime[0].match(/image\//)
+      return true
+    end
+  end
+  return false
 end
 
-def is_text_file(fpath)
-  return false if !File.exist?(fpath)
-  return false if !fpath.match(/.(txt|cpp|h|rb|c|php|java|py)$/i)
-  #TODO: check contents of file
-  return true
-end
+# def is_text_file(fpath)
+# return false if !File.exist?(fpath)
+# return false if !fpath.match(/.(txt|cpp|h|rb|c|php|java|py)$/i)
+# #TODO: check contents of file
+# return true
+# end
 
 def is_path(s)
   m = s.match(/(~[a-z]*)?\/.*\//)

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.17"
+  VERSION = "0.1.19"
 end

data/vimamsa.gemspec

@@ -27,16 +27,16 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency 'ripl', '~> 0.7.1'
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
-  spec.add_runtime_dependency 'gdk4', '~> 4.2.0'
-  spec.add_runtime_dependency 'gtk4', '~> 4.2.0'
+  spec.add_runtime_dependency 'gdk4', '~> 4.2.1'
+  spec.add_runtime_dependency 'gtk4', '~> 4.2.1'
+  spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.1'
+  spec.add_runtime_dependency 'gstreamer', '~> 4.2.1'
   spec.add_runtime_dependency 'rambling-trie', '~> 2.3.1'
   
   spec.add_runtime_dependency 'differ', '~>  0.1.2'
-  spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.0'
   spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?
   spec.add_runtime_dependency 'listen', '~> 3.4'  #TODO: update?
   spec.add_runtime_dependency 'language_server-protocol', '~> 3.17.0.3'
-  spec.add_runtime_dependency 'gstreamer', '~> 4.2.0'
 
   spec.extensions = ["ext/vmaext/extconf.rb"]
   spec.licenses    = ['GPL-3.0+']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,126 +86,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: gtk4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: rambling-trie
+  name: gtksourceview5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: differ
+  name: gstreamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: gtksourceview5
+  name: rambling-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: language_server-protocol
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0.3
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0.3
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: gstreamer
+  name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 3.17.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 3.17.0.3
 description: Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby
   and GTK.
 email:
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Vimamsa