vimamsa 0.1.16 → 0.1.18

data/lib/vimamsa/editor.rb

@@ -1,13 +1,12 @@
 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
+  attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro, :actions
   attr_accessor :converters, :fh, :paint_stack, :kbd, :langsrv, :register, :cur_register, :clipboard
   #attr_writer :call_func, :update_highlight
 
@@ -63,6 +62,10 @@ class Editor
 
     $hook = Hook.new
     @hook = $hook
+    require "vimamsa/actions"
+    @actions = ActionList.new
+    require "vimamsa/key_actions"
+
     register_plugin(:Hook, @hook)
     @macro = Macro.new
     register_plugin(:Macro, @macro)
@@ -126,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
@@ -548,12 +554,14 @@ def load_buffer(fname)
 end
 
 def jump_to_file(filename, tnum = nil, charn = nil)
-  open_new_file(filename)
+  b = open_new_file(filename)
+  return if b.nil?
+  # debug "open_new_file #{filename}, #{tnum} = nil, #{charn}",2
 
   # Link to character position
   if !charn.nil?
     if charn == "c"
-      buf.jump_to_pos(tnum) # tnum=character position
+      b.jump_to_pos(tnum) # tnum=character position
       center_on_current_line
       return
     end
@@ -561,7 +569,7 @@ def jump_to_file(filename, tnum = nil, charn = nil)
 
   # Link to line
   if !tnum.nil?
-    buf.jump_to_line(tnum) # tnum=line position
+    b.jump_to_line(tnum) # tnum=line position
     center_on_current_line
     return
   end
@@ -579,7 +587,7 @@ def open_new_file(filename, file_contents = "")
   # File is already opened to existing buffer
   if b != nil
     message "Switching to: #{filename}"
-    vma.buffers.set_current_buffer(b)
+    bu = vma.buffers.set_current_buffer(b)
   else
     if !is_path_writable(filename)
       message("Path #{filename} cannot be written to")
@@ -591,11 +599,16 @@ 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
-    bf = load_buffer(fname)
-    vma.buffers.set_current_buffer_by_id(bf.id)
+    bu = load_buffer(fname)
+    vma.buffers.set_current_buffer_by_id(bu.id)
   end
+  return bu
 end
 
 def scan_word_start_marks(search_str)

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_history.rb

@@ -76,12 +76,12 @@ end
 
 def gui_file_history_update_callback(search_str = "")
   debug "gui_file_history_update_callback: #{search_str}"
-  return [] if $vma.fh.history.empty?
+  return [] if vma.fh.history.empty?
   $search_list = []
-  files = $vma.fh.history.keys.sort.collect { |x| [x, 0] }
+  files = vma.fh.history.keys.sort.collect { |x| [x, 0] }
 
   if (search_str.size > 1)
-    files = fuzzy_filter(search_str, $vma.fh.history.keys, 40)
+    files = fuzzy_filter(search_str, vma.fh.history.keys, 40)
   end
 
   $search_list = files

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

@@ -2,6 +2,42 @@ $idle_scroll_to_mark = false
 
 $removed_controllers = []
 
+# Run one iteration of GMainLoop
+# https://developer.gnome.org/documentation/tutorials/main-contexts.html
+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
+def wait_for_resize(window, tries = 200)
+  i = 0
+  widthold = @window.width
+  heightold = @window.height
+  while true
+    iterate_gui_main_loop
+    break if widthold != window.width
+    break if heightold != window.height
+    if i >= tries
+      debug "i >= tries", 2
+      break
+    end
+    i += 1
+  end
+end
+
 def gui_remove_controllers(widget)
   clist = widget.observe_controllers
   to_remove = []
@@ -102,7 +138,7 @@ def gui_create_buffer(id, bufo)
   view.set_buffer(buf1)
 
   provider = Gtk::CssProvider.new
-  
+
   provider.load(data: "textview { font-family: #{cnf.font.family!}; font-size: #{cnf.font.size!}pt; }")
   view.style_context.add_provider(provider)
   view.wrap_mode = :char
@@ -168,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
@@ -200,16 +221,13 @@ class VMAgui
     end
   end
 
-  def delay_scale()
-    if Time.now - @dtime > 2.0
-    end
-  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
@@ -549,11 +567,24 @@ class VMAgui
 
   def idle_set_size()
     # Need to wait for a while to window to be maximized to get correct @window.width
-    sleep 0.1
+    @window.maximize
+    wait_for_resize(@window)
+    # Set new size as half of the screeen
     width = @window.width / 2
     height = @window.height - 5
+    width = 600 if width < 600
+    height = 600 if height < 600
+
+    #Minimum size:
+    @window.set_size_request(600, 600)
+    @window.set_default_size(width, height)
+    debug "size #{[width, height]}", 2
     @window.unmaximize
+
+    #set_default_size doesn't always have effect if run immediately
+    wait_for_resize(@window)
     @window.set_default_size(width, height)
+
     return false
   end
 
@@ -569,10 +600,6 @@ class VMAgui
       @window = Gtk::ApplicationWindow.new(app)
       @window.set_application(app)
 
-      @window.maximize
-      # Need to let Gtk process after maximize
-      run_as_idle proc { idle_set_size }
-
       @window.title = "Multiple Views"
       @vpaned = Gtk::Paned.new(:vertical)
 
@@ -664,6 +691,8 @@ class VMAgui
 
       @window.show
 
+      run_as_idle proc { idle_set_size }
+
       prov = Gtk::CssProvider.new
       # See gtk-4.9.4/gtk/theme/Default/_common.scss  on how to theme
       # gtksourceview/gtksourcestyleschemepreview.c
@@ -699,12 +728,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

data/lib/vimamsa/gui_select_window.rb

@@ -12,6 +12,8 @@ class SelectUpdateWindow
 
   def update_item_list(item_list)
     # debug item_list.inspect
+    return if item_list.empty?
+
     @model.clear
     for item in item_list
       iter = @model.append

data/lib/vimamsa/gui_sourceview.rb

@@ -52,9 +52,9 @@ class VSourceView < GtkSource::View
 
     # Mainly after page-up or page-down
     signal_connect("move-cursor") do |widget, event|
-      if event.name == "GTK_MOVEMENT_PAGES" and (last_action == "page_up" or last_action == "page_down")
-        handle_scrolling()
-      end
+      # if event.name == "GTK_MOVEMENT_PAGES" and (vma.actions.last_action == "page_up" or vma.actions.last_action == "page_down")
+      # handle_scrolling()
+      # end
 
       # handle_scrolling()
       # curpos = buffer.cursor_position
@@ -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)
@@ -149,10 +194,13 @@ class VSourceView < GtkSource::View
       debug "drag-end", 2
       if offsetx.abs < 5 and offsety.abs < 5
         debug "Not enough drag", 2
-        @range_start = nil
-      elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
+        buf.end_selection
+        # elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
+      elsif vma.kbd.get_scope != :editor
         # Can't transition from editor wide mode to buffer specific mode
-        buf.start_visual_mode
+        vma.kbd.set_mode(:visual)
+      else
+        buf.end_selection
       end
       @range_start = nil
     end
@@ -233,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])
@@ -254,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])
@@ -267,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
@@ -391,7 +435,6 @@ class VSourceView < GtkSource::View
   end
 
   def handle_deltas()
-    delete_cursorchar
     any_change = false
     while d = @bufo.deltas.shift
       any_change = true
@@ -432,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)
@@ -451,7 +493,7 @@ class VSourceView < GtkSource::View
     $idle_scroll_to_mark = true
     ensure_cursor_visible
 
-    draw_cursor
+    # draw_cursor
 
     return true
   end
@@ -513,14 +555,12 @@ 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
+  def after_action
+    iterate_gui_main_loop
+    handle_deltas
+    iterate_gui_main_loop
+    draw_cursor
+    iterate_gui_main_loop
   end
 
   def set_cursor_color(ctype)
@@ -531,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
@@ -545,38 +586,28 @@ class VSourceView < GtkSource::View
     # @tt.font = "Arial"
     # end
 
+    sv = vma.gui.sw.child
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
-    delete_cursorchar
+    ctype = :visual if vma.buf.selection_active?
+
     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"
@@ -587,16 +618,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_actions.rb

@@ -166,7 +166,7 @@ act_list = {
   # { :proc => proc {  },
   # :desc => "", :group => : },
 
-  :search_actions => { :proc => proc { search_actions },
+  :search_actions => { :proc => proc { vma.actions.gui_search },
                        :desc => "Search actions", :group => :search },
 
   :toggle_active_window => { :proc => proc { vma.gui.toggle_active_window },