vimamsa 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b88d4f4c567a38c726a1eee1a408fb051a972a54afebfee29add1e81f7761d
-  data.tar.gz: '0366913aba4ccf3f687cbce63fec3815df7cf8c98ae1e00272be32d898f4ec48'
+  metadata.gz: 9bd13f53f2d774550226da6e379842c2d54bde6e8ffa5362d4769940d93a033e
+  data.tar.gz: 5f2db7ad2c5402a816f186e266194f1a7545b1a2a71fd532f9140634835fc3f2
 SHA512:
-  metadata.gz: 3eaa999737e313cfbfb1028031d60101c7c3fcbcfb30504991c4a7a350da374f0969502e13facf46cc69f63b60d576817fa86cbd87981be8988e7998fef119b7
-  data.tar.gz: 298335f27adce1d7164ea138908419db2b7d1192014ad780651779f36d1a384cde34e5196fa3cae021beaf178e551de08e92a81f03643dec476bbb01a2e1d566
+  metadata.gz: d41917d0e0cfa9a876579bea6aaaafee3b3eff3757d74c399922a5db71220889f278df03bd1bc3e1177002fa906e3d30792280004dd5270d2b135dd6006f51ca
+  data.tar.gz: c4935e09ecb5a714cb481ac00386e698aee72583030f03cf9b7c182c71066513339c2c0c4aa6f723e00630e659704e95a107007a76af936d08e67a8e6ded5c5f

data/lib/vimamsa/ack.rb

@@ -111,14 +111,15 @@ Will search the following directories:
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def ack_buffer(instr, b = nil)
-  instr = Shellwords.escape(instr)
+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
   if bufstr.size > 5
-  create_new_buffer(bufstr,"ack")
+  b = create_new_buffer(bufstr,"ack")
+  highlight_match(b, _instr, color: "#10bd8e")
   else
     message("No results for input:#{instr}")
   end

data/lib/vimamsa/actions.rb

@@ -32,11 +32,14 @@ def missing_callfunc
 end
 
 #TODO: remove
-def call(id)
-  call_action(id)
-end
+# def call(id)
+  # call_action(id)
+# end
+
+$acth = []
 
 def call_action(id)
+  $acth << id
   a = $actions[id]
   if a
     a.method.call()
@@ -45,11 +48,15 @@ def call_action(id)
   end
 end
 
+def last_action
+  return $acth[-1]
+end
+
 def search_actions()
   l = []
-  opt = { :title => "Search actions.", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
+  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"]
-  
+
   gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
                            "search_actions_select_callback",
                            "search_actions_update_callback",
@@ -109,7 +116,7 @@ def search_actions_select_callback(search_str, idx)
     eval(acc)
   elsif acc.class == Symbol
     debug "Symbol"
-    call(acc)
+    call_action(acc)
   end
 end
 

data/lib/vimamsa/audio.rb

@@ -0,0 +1,58 @@
+require "gstreamer"
+
+# following the example gstreamer-4.2.0/sample/helloworld_e.rb
+class Audio
+  @@playbin = nil
+
+  def self.stop
+    @@playbin.stop if !@@playbin.nil?
+  end
+
+  def self.play(fn)
+    playbin = @@playbin
+    if playbin.nil?
+      playbin = Gst::ElementFactory.make("playbin")
+      if playbin.nil?
+        puts "'playbin' gstreamer plugin missing"
+        return
+      end
+    else
+      if playbin.current_state == "playing"
+        playbin.stop # Stop previous play
+      end
+    end
+
+    # playbin.volume
+    # playbin.volume=1.0
+    # playbin.stream_time
+    # playbin.current_state
+
+    # take the commandline argument and ensure that it is a uri
+    if Gst.valid_uri?(fn)
+      uri = fn
+    else
+      uri = Gst.filename_to_uri(fn)
+    end
+    playbin.uri = uri
+    @@playbin = playbin
+
+    bus = playbin.bus
+    bus.add_watch do |bus, message|
+
+      case message.type
+      when Gst::MessageType::EOS
+        puts "End-of-stream"
+      when Gst::MessageType::ERROR
+        error, debug = message.parse_error
+        puts "Debugging info: #{debug || "none"}"
+        puts "Error: #{error.message}"
+      end
+      true
+    end
+
+    message("Start playing audio: #{fn}")
+
+    # start play back and listed to events
+    playbin.play
+  end
+end

data/lib/vimamsa/buffer.rb

@@ -5,7 +5,6 @@ require "pathname"
 require "openssl"
 require "ripl/multi_line"
 
-$paste_lines = false
 $buffer_history = []
 
 $update_highlight = false
@@ -15,7 +14,7 @@ $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
   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
+  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
 
   @@num_buffers = 0
 
@@ -32,6 +31,9 @@ class Buffer < String
     gui_create_buffer(@id, self)
     debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
+    # If true, we will create new line after this and paste there
+    @paste_lines = false
+
     @module = nil
 
     @last_save = @last_asked_from_user = @file_last_cheked = Time.now
@@ -398,7 +400,6 @@ class Buffer < String
     gui_set_buffer_contents(@id, self.to_s)
     @images = [] #TODO: if reload
     hpt_scan_images(self)
-    hpt_scan_audio(self)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -803,7 +804,7 @@ class Buffer < String
   end
 
   def copy(range_id)
-    $paste_lines = false
+    @paste_lines = false
     debug "range_id: #{range_id}"
     debug range_id.inspect
     range = get_range(range_id)
@@ -966,9 +967,14 @@ class Buffer < String
     set_line_and_column_pos(nil, nil)
   end
 
-  def delete2(range_id)
-    $paste_lines = false
-    range = get_range(range_id)
+  def delete2(range_id, mark = nil)
+    # if mark != nil
+    # debug mark, 2
+    # return
+    # end
+
+    @paste_lines = false
+    range = get_range(range_id, mark: mark)
     return if range == nil
     debug "RANGE"
     debug range.inspect
@@ -980,7 +986,7 @@ class Buffer < String
   end
 
   def delete(op, x = nil)
-    $paste_lines = false
+    @paste_lines = false
     # Delete selection
     if op == SELECTION && visual_mode?
       (startpos, endpos) = get_visual_mode_range2
@@ -1028,7 +1034,7 @@ class Buffer < String
   end
 
   # Ranges to use in delete or copy operations
-  def get_range(range_id)
+  def get_range(range_id, mark: nil)
     range = nil
     if range_id == :to_word_end
       # TODO: better way to make the search than + 150 from current position
@@ -1045,6 +1051,16 @@ class Buffer < String
         range = get_range(:to_word_end)
       end
       # Ripl.start :binding => binding
+
+    elsif range_id == :to_mark
+      debug "TO MARK"
+      start = @line_ends[@lpos]
+      mpos = @marks[mark]
+      if !mpos.nil?
+        range = start..mpos
+      else
+        return nil
+      end
     elsif range_id == :to_line_end
       debug "TO LINE END"
       range = @pos..(@line_ends[@lpos] - 1)
@@ -1068,15 +1084,18 @@ class Buffer < String
     end
     return range if range == nil
     if range.last < range.first
-      range.last = range.first
+      range = range.last..range.first
+      # range.last = range.first
     end
     if range.first < 0
-      range.first = 0
+      # range.first = 0
+      range = 0..range.last
     end
     if range.last >= self.size
-      range.last = self.size - 1
+      # range.last = self.size - 1
+      range = range.first..(self.size - 1)
     end
-    #TODO: sanity check
+    debug range, 2
     return range
   end
 
@@ -1487,6 +1506,10 @@ class Buffer < String
   end
 
   def insert_txt_at(c, pos)
+    if c.nil? or pos.nil?
+      error("input c=nil || pos=nil")
+      return
+    end
     c = c.force_encoding("UTF-8");  #TODO:correct?
     c = "\n" if c == "\r"
     add_delta([pos, INSERT, c.size, c], true)
@@ -1608,26 +1631,32 @@ class Buffer < String
     @clipboard_paste_running = true
     clipboard = vma.gui.window.display.clipboard
     clipboard.read_text_async do |_clipboard, result|
-      text = clipboard.read_text_finish(result)
-      paste_finish(text, at, register)
+      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
   end
 
   def paste_finish(text, at, register)
-    # if text == ""
-    # return if !$clipboard.any?
-    # if register == nil
-    # text = $clipboard[-1]
-    # else
-    # text = $register[register]
-    # end
-    # end
     debug "PASTE: #{text}"
+
+    # If we did not put this text to clipboard
+    if text != $clipboard[-1]
+      @paste_lines = false
+    end
+
+    text = sanitize_input(text)
+
     $clipboard << text
 
     return if text == ""
 
-    if $paste_lines
+    if @paste_lines
       debug "PASTE LINES"
       put_to_new_next_line(text)
     else
@@ -1669,7 +1698,7 @@ class Buffer < String
     add_delta([lrange.begin, DELETE, lrange.end - lrange.begin + 1], true)
     set_clipboard(s)
     update_pos(lrange.begin)
-    $paste_lines = true
+    @paste_lines = true
     #recalc_line_ends
   end
 
@@ -1686,7 +1715,7 @@ class Buffer < String
 
   def copy_active_selection(x = nil)
     debug "!COPY SELECTION"
-    $paste_lines = false
+    @paste_lines = false
     return if !@visual_mode
 
     debug "COPY SELECTION"
@@ -1766,7 +1795,7 @@ class Buffer < String
       debug "copy num_lines:#{num_lines}"
     end
     set_clipboard(self[line_range(@lpos, num_lines)])
-    $paste_lines = true
+    @paste_lines = true
   end
 
   def put_file_path_to_clipboard
@@ -1786,6 +1815,7 @@ class Buffer < String
   end
 
   def end_visual_mode()
+    return if !visual_mode?
     debug "End visual mode"
     #TODO:take previous mode (insert|command) from stack?
     $kbd.set_mode(:command)
@@ -2025,7 +2055,7 @@ class Buffer < String
   end
 end
 
-#TODO
+#TODO: function not used
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
     IO.write(savepath, self.to_s)

data/lib/vimamsa/editor.rb

@@ -26,10 +26,6 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
-def mkdir_if_not_exists(_dirpath)
-  dirpath = File.expand_path(_dirpath)
-  Dir.mkdir(dirpath) unless File.exist?(dirpath)
-end
 
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro
@@ -49,6 +45,7 @@ class Editor
     @converters = {}
     @paint_stack = []
     @_plugins = {}
+    @errors
   end
 
   def open_file_listener(added)
@@ -93,11 +90,10 @@ class Editor
     $kbd = @kbd
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
-    
 
     FileManager.init
     BufferManager.init
-    
+
     @gui.init_menu
 
     mkdir_if_not_exists("~/.vimamsa")
@@ -136,10 +132,11 @@ class Editor
 
     if conf(:enable_lsp)
       require "vimamsa/langservp"
+      require "vimamsa/audio" # TODO:config
       @langsrv["ruby"] = LangSrv.new("ruby")
       @langsrv["cpp"] = LangSrv.new("cpp")
     end
-
+    
     # build_options
 
     fname = nil
@@ -282,6 +279,11 @@ class Editor
     debug "CAN OPEN?: #{can_open}"
     return can_open
   end
+
+  def error(message)
+    debug "ERORR #{caller[0]} #{str}", 2
+    @errors << [message, caller]
+  end
 end
 
 def _quit()
@@ -389,7 +391,7 @@ def show_key_bindings()
   kbd_s << vma.kbd.to_s
   kbd_s << "\n"
   kbd_s << "===============================================\n"
-  b = create_new_buffer(kbd_s,"key-bindings")
+  b = create_new_buffer(kbd_s, "key-bindings")
   gui_set_file_lang(b.id, "hyperplaintext")
   #
 end
@@ -456,6 +458,11 @@ def minibuffer_delete()
   $minibuffer.delete(BACKWARD_CHAR)
 end
 
+def error(str)
+  puts caller[0]
+  debug "#{caller[0]} ERROR: #{str}", 2
+end
+
 def message(s)
   s = "[#{DateTime.now().strftime("%H:%M")}] #{s}"
   debug s
@@ -502,16 +509,16 @@ def create_new_file(filename = nil, file_contents = "\n")
   vma.kbd.set_mode_to_default
   vma.buffers.set_current_buffer_by_id(buffer.id)
 
-  # Do set_content twice (once in Buffer.new) to force redraw and work around a bug 
+  # Do set_content twice (once in Buffer.new) to force redraw and work around a bug
   # The bug: if switching a child of scrolledWindow to a textview with a file smaller than the window, it won't get drawn properly if in previous (larger) file the ScrolledWindow was scrolled down.
   buffer.set_content(file_contents)
 
   return buffer
 end
 
-def create_new_buffer(file_contents = "\n",prefix="buf", setcurrent=true)
+def create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
   debug "NEW BUFFER CREATED"
-  buffer = Buffer.new(file_contents,nil,prefix)
+  buffer = Buffer.new(file_contents, nil, prefix)
   vma.buffers.add(buffer)
   vma.buffers.set_current_buffer_by_id(buffer.id) if setcurrent
   buffer.set_content(file_contents)
@@ -585,6 +592,10 @@ def open_new_file(filename, file_contents = "")
     message "Switching to: #{filename}"
     vma.buffers.set_current_buffer(b)
   else
+    if !is_path_writable(filename)
+      message("Path #{filename} cannot be written to")
+      return false
+    end
     message "New file opened: #{filename}"
     fname = filename
     bf = load_buffer(fname)
@@ -622,45 +633,7 @@ def get_file_line_pointer(s)
   return nil
 end
 
-def open_url(url)
-  system("xdg-open", url)
-end
-
-def open_with_default_program(url)
-  system("xdg-open", url)
-end
-
-def run_cmd(cmd)
-  tmpf = Tempfile.new("vmarun", "/tmp").path
-  cmd = "#{cmd} > #{tmpf}"
-  debug "CMD:\n#{cmd}"
-  system("bash", "-c", cmd)
-  res_str = File.read(tmpf)
-  return res_str
-end
-
-require "open3"
-
-def exec_cmd(bin_name, arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil, arg5 = nil)
-  assert_binary_exists(bin_name)
-  if !arg5.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4, arg5)
-  elsif !arg4.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4)
-  elsif !arg3.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3)
-  elsif !arg2.nil?
-    p = Open3.popen2(bin_name, arg1, arg2)
-  elsif !arg1.nil?
-    p = Open3.popen2(bin_name, arg1)
-  else
-    p = Open3.popen2(bin_name)
-  end
-
-  ret_str = p[1].read
-  return ret_str
-end
-
+# TODO: Implement using https://github.com/blackwinter/ruby-filemagic
 def file_is_text_file(fpath)
   debug "file_is_text_file(#{fpath})"
   fpath = File.expand_path(fpath)

data/lib/vimamsa/gui.rb

@@ -90,33 +90,6 @@ def page_down
   return true
 end
 
-def paste_system_clipboard()
-
-  #TODO: Check if something useful in this old GTK3 code.
-  utf8_string = Gdk::Atom.intern("UTF8_STRING")
-
-  clipboard = Gtk::Clipboard.get_default($vmag.window.display)
-  received_text = ""
-
-  target_string = Gdk::Selection::TARGET_STRING
-  ti = clipboard.request_contents(target_string)
-
-  if clipboard.wait_is_text_available?
-    received_text = clipboard.wait_for_text
-  end
-
-  if received_text != "" and !received_text.nil?
-    max_clipboard_items = 100
-    if received_text != $clipboard[-1]
-      #TODO: HACK
-      $paste_lines = false
-    end
-    $clipboard << received_text
-    # debug $clipboard[-1]
-    $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
-  end
-  return received_text
-end
 
 def set_system_clipboard(arg)
   vma.gui.window.display.clipboard.set(arg)
@@ -313,9 +286,15 @@ class VMAgui
   # Run proc after animated scrolling has stopped (e.g. after page down)
   def run_after_scrolling(p)
     Thread.new {
+      # After running
+      #   view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES)
+      # have to wait for animated page down scrolling to actually start
+      # Then have to wait determine that it has stopped if scrolling adjustment stops changing. There should be a better way to do this.
+      sleep 0.1
       while Time.now - @last_adj_time < 0.1
         sleep 0.1
       end
+      debug "SCROLLING ENDED", 2
       run_as_idle p
     }
   end
@@ -346,6 +325,7 @@ class VMAgui
   end
 
   def handle_deltas()
+    view.delete_cursor_char
     while d = buf.deltas.shift
       pos = d[0]
       op = d[1]
@@ -624,6 +604,7 @@ class VMAgui
       @sw = Gtk::ScrolledWindow.new
       @sw.set_policy(:automatic, :automatic)
 
+
       @last_adj_time = Time.now
       @sw.vadjustment.signal_connect("value-changed") { |x|
         # pp x.page_increment

data/lib/vimamsa/gui_select_window.rb

@@ -69,13 +69,19 @@ class SelectUpdateWindow
 
     @window.add(vbox)
 
+    if !opt[:desc].nil?
+      descl = Gtk::Label.new(opt[:desc])
+      set_margin_all(descl,15)
+      # vbox.append(descl, :expand => false, :fill => false, :padding => 0)
+      vbox.append(descl)
+    end
+
     @entry = Gtk::SearchEntry.new
     @entry.width_chars = 45
     container = Gtk::Box.new(:horizontal, 10)
     # container.halign = :start
     container.halign = :center
-    container.pack_start(@entry,
-                         :expand => false, :fill => false, :padding => 0)
+    container.append(@entry)
 
     # create tree view
     @model = Gtk::ListStore.new(String, String)
@@ -135,11 +141,6 @@ class SelectUpdateWindow
     @entry.signal_connect("changed") { debug "[changed] " }
     @entry.signal_connect("next-match") { debug "[next-match] " }
 
-    if !opt[:desc].nil?
-      descl = Gtk::Label.new(opt[:desc])
-      vbox.pack_start(descl, :expand => false, :fill => false, :padding => 0)
-    end
-
     # label = Gtk::Label.new(<<-EOF)
     # Search:
     # EOF
@@ -147,7 +148,7 @@ class SelectUpdateWindow
     # label = Gtk::Label.new("Input:")
     # vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-    vbox.pack_start(container, :expand => false, :fill => false, :padding => 0)
+    vbox.append(container)
     sw = Gtk::ScrolledWindow.new(nil, nil)
     # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)

data/lib/vimamsa/gui_sourceview.rb

@@ -34,6 +34,7 @@ class VSourceView < GtkSource::View
     # puts "drag-data-received"
     # puts
     # if data.uris.size >= 1
+
     # imgpath = CGI.unescape(data.uris[0])
     # m = imgpath.match(/^file:\/\/(.*)/)
     # if m
@@ -46,8 +47,14 @@ class VSourceView < GtkSource::View
 
     # Mainly after page-up or page-down
     signal_connect("move-cursor") do |widget, event|
-      debug("MOVE-CURSOR", 2)
-      $update_cursor = true
+      if event.name == "GTK_MOVEMENT_PAGES" and (last_action == "page_up" or last_action == "page_down")
+        # Ripl.start :binding => binding
+
+        debug("MOVE-CURSOR", 2)
+        # $update_cursor = true
+        handle_scrolling()
+      end
+
       # handle_scrolling()
       # curpos = buffer.cursor_position
       # debug "MOVE CURSOR (sig): #{curpos}"
@@ -110,47 +117,116 @@ class VSourceView < GtkSource::View
   end
 
   def register_signals()
+    check_controllers
 
-    #TODO: Doesn't seem to catch "move-cursor" signal since upgrade to gtk4
-    # self.signal_connect("move-cursor") do |widget, event|
-    # $update_cursor = true
-    # false
-    # end
+    # Implement mouse selections using @cnt_mo and @cnt_drag
+    @cnt_mo = Gtk::EventControllerMotion.new
+    self.add_controller(@cnt_mo)
+    @cnt_mo.signal_connect "motion" do |gesture, x, y|
+      if !@range_start.nil? and !x.nil? and !y.nil? and buf.visual_mode?
+        i = coord_to_iter(x, y, true)
+        @bufo.set_pos(i) if !i.nil? and @last_iter != i
+        @last_iter = i
+      end
+    end
+
+    @last_coord = nil
+    @cnt_drag = Gtk::GestureDrag.new
+    self.add_controller(@cnt_drag)
+    @cnt_drag.signal_connect "drag-begin" do |gesture, x, y|
+      debug "drag-begin", 2
+      i = coord_to_iter(x, y, true)
+      pp i
+      @range_start = i
+      if !buf.visual_mode?
+        buf.start_visual_mode
+      end
+    end
+
+    @cnt_drag.signal_connect "drag-end" do |gesture, offsetx, offsety|
+      debug "drag-end", 2
+
+      # Not enough drag
+      if offsetx.abs < 5 and offsety.abs < 5
+        buf.end_visual_mode
+      end
+      @range_start = nil
+    end
 
-    check_controllers
     click = Gtk::GestureClick.new
     click.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
     self.add_controller(click)
     # Detect mouse click
     @click = click
+
+    @range_start = nil
     click.signal_connect "pressed" do |gesture, n_press, x, y, z|
-      debug "SourceView, GestureClick x=#{x} y=#{y}"
-      pp visible_rect
-      winw = width
-      view_width = visible_rect.width
-      gutter_width = winw - view_width
+      debug "SourceView, GestureClick released x=#{x} y=#{y}"
+
+      if buf.visual_mode?
+        buf.end_visual_mode
+      end
 
       xloc = (x - gutter_width).to_i
       yloc = (y + visible_rect.y).to_i
       debug "xloc=#{xloc} yloc=#{yloc}"
 
+      i = coord_to_iter(xloc, yloc)
+      # @range_start = i
+
       # This needs to happen after xloc calculation, otherwise xloc gets a wrong value (around 200 bigger)
       if vma.gui.current_view != self
         vma.gui.set_current_view(self)
       end
 
-      i = get_iter_at_location(xloc, yloc)
-      if !i.nil?
-        @bufo.set_pos(i.offset)
-      else
-        debug "iter nil"
-        #TODO: find correct line position some other way
+      @bufo.set_pos(i) if !i.nil?
+      true
+    end
+
+    click.signal_connect "released" do |gesture, n_press, x, y, z|
+      debug "SourceView, GestureClick released x=#{x} y=#{y}"
+
+      xloc = (x - gutter_width).to_i
+      yloc = (y + visible_rect.y).to_i
+      debug "xloc=#{xloc} yloc=#{yloc}"
+
+      # This needs to happen after xloc calculation, otherwise xloc gets a wrong value (around 200 bigger)
+      if vma.gui.current_view != self
+        vma.gui.set_current_view(self)
       end
 
+      i = coord_to_iter(xloc, yloc)
+
+      # if i != @range_start
+      # debug "RANGE #{[@range_start, i]}", 2
+      # end
+
+      @bufo.set_pos(i) if !i.nil?
+      # @range_start = nil
       true
     end
   end
 
+  def coord_to_iter(xloc, yloc, transform_coord = false)
+    if transform_coord
+      xloc = (xloc - gutter_width).to_i
+      yloc = (yloc + visible_rect.y).to_i
+    end
+
+    # Try to get exact character position
+    i = get_iter_at_location(xloc, yloc)
+
+    # If doesn't work, at least get the start of correct line
+    # TODO: sometimes end of line is better choice
+    if i.nil?
+      r = get_line_at_y(yloc)
+      i = r[0] if !r.nil?
+    end
+
+    return i.offset if !i.nil?
+    return nil
+  end
+
   def handle_scrolling()
     delete_cursorchar
     # curpos = buffer.cursor_position
@@ -158,18 +234,13 @@ class VSourceView < GtkSource::View
     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?
-        # Try to get exact character position
-        i = get_iter_at_location(bc[0], bc[1])
-        if i.nil?
-          # If doesn't work, at least get the start of correct line
-          i = get_line_at_y(bc[1])
-          i = i[0]
-        end
+        i = coord_to_iter(bc[0], bc[1])
         if !i.nil?
-          @bufo.set_pos(i.offset)
+          @bufo.set_pos(i)
         end
       end
       $update_cursor = false
@@ -342,8 +413,6 @@ class VSourceView < GtkSource::View
     itr2 = buffer.get_iter_at(:offset => pos + 1)
     buffer.place_cursor(itr)
 
-    # $view.signal_emit("extend-selection", Gtk::MovementStep.new(:PAGES), -1, false)
-
     within_margin = 0.075 #margin as a [0.0,0.5) fraction of screen size
     use_align = false
     xalign = 0.5 #0.0=top 1.0=bottom, 0.5=center
@@ -358,9 +427,6 @@ class VSourceView < GtkSource::View
     $idle_scroll_to_mark = true
     ensure_cursor_visible
 
-    # scroll_to_iter(itr, within_margin, use_align, xalign, yalign)
-
-    # $view.signal_emit("extend-selection", Gtk::TextExtendSelection.new, itr,itr,itr2)
     draw_cursor
 
     return true
@@ -477,9 +543,9 @@ class VSourceView < GtkSource::View
       end
       # elsif @bufo.visual_mode?
     elsif ctype == :visual
-      debug "VISUAL MODE"
+      # debug "VISUAL MODE"
       (_start, _end) = @bufo.get_visual_mode_range2
-      debug "#{_start}, #{_end}"
+      # debug "#{_start}, #{_end}"
       itr = buffer.get_iter_at(:offset => _start)
       itr2 = buffer.get_iter_at(:offset => _end + 1)
       # Pango-CRITICAL **: pango_layout_get_cursor_pos: assertion 'index >= 0 && index <= layout->length' failed

data/lib/vimamsa/hyper_plain_text.rb

@@ -1,8 +1,10 @@
 def hpt_check_cur_word(w)
   debug "check_cur_word(w)"
-  m = w.match(/⟦(.*)⟧/)
+  m = w.match(/⟦((audio|img):)(.*)⟧/)
   if m
-    fpfx = m[1]
+    # Ripl.start :binding => binding
+
+    fpfx = m[3]
     if vma.buf.fname
       dn = File.dirname(vma.buf.fname)
 
@@ -23,8 +25,13 @@ def hpt_check_cur_word(w)
       end
 
       if fn
-        message "HPT opening file #{fn}"
-        return fn
+        if m[2] == "audio"
+          # Thread.new { Audio.play(fn) }
+          Audio.play(fn) 
+        else
+          message "HPT opening file #{fn}"
+          return fn
+        end
         # open_existing_file(fn)
         # return true
       else

data/lib/vimamsa/key_actions.rb

@@ -104,6 +104,10 @@ reg_act(:execute_current_line_in_terminal_autoclose, proc { buf.execute_current_
 reg_act(:show_images, proc { hpt_scan_images() }, "Show images inserted with ⟦img:file.png⟧ syntax")
 reg_act(:delete_current_file, proc { bufs.delete_current_buffer() }, "Delete current file")
 
+
+reg_act(:audio_stop, proc { Audio.stop }, "Stop audio playback")
+
+
 act_list = {
   # File handling
   :buf_save => { :proc => proc { buf.save },

data/lib/vimamsa/key_binding_tree.rb

@@ -267,7 +267,12 @@ class KeyBindingTree
     for st in @state_trail
       st = st[0] if st.class == Array
       if first
-        s_trail << "[#{st.to_s}]"
+        trailpfx = ""
+        if !st.major_modes.empty?
+          mmid = st.major_modes.first
+          trailpfx = "#{@modes[mmid].to_s}>"
+        end
+        s_trail << "[#{trailpfx}#{st.to_s}]"
       else
         s_trail << " #{st.to_s}"
       end
@@ -475,6 +480,7 @@ class KeyBindingTree
   end
 
   def handle_key_bindigs_action(action, c)
+    $acth << action
     $method_handles_repeat = false #TODO:??
     n = 1
     if $next_command_count and !(action.class == String and action.include?("set_next_command_count"))
@@ -531,7 +537,7 @@ def exec_action(action)
   $kbd.last_action = $kbd.cur_action
   $kbd.cur_action = action
   if action.class == Symbol
-    return call(action)
+    return call_action(action)
   elsif action.class == Proc
     return action.call
   else

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -3,6 +3,8 @@ vma.kbd.add_mode("I", :insert, :insert)
 vma.kbd.add_mode("V", :visual, :visual)
 vma.kbd.add_mode("M", :minibuffer) #TODO: needed?
 vma.kbd.add_mode("R", :readchar)
+# vma.kbd.add_mode("audio", :audio, :command)
+vma.kbd.add_minor_mode("audio", :audio, :command)
 vma.kbd.add_mode("B", :browse, :command)
 vma.kbd.add_mode("X", :replace, :command, name: "Replace")
 vma.kbd.set_default_mode(:command)
@@ -49,6 +51,15 @@ bindkey "C , b", :start_buf_manager
 bindkey "C , w", :toggle_active_window
 bindkey "C , , w", :toggle_two_column
 
+bindkey "C , u s", :audio_stop
+bindkey "C m a", "vma.kbd.set_mode(:audio)"
+bindkey "audio s", :audio_stop
+bindkey "audio space", :audio_stop
+bindkey "audio q || audio esc", "vma.kbd.set_mode_to_default"
+
+
+
+
 # bindkey "C , f o", :open_file_dialog
 bindkey "CI ctrl-o", :open_file_dialog
 # bindkey "M enter", :minibuffer_end
@@ -63,7 +74,7 @@ bindkey "C z ", :start_browse_mode
 bindkey "B h", :history_switch_backwards
 bindkey "B l", :history_switch_forwards
 #bindkey 'B z', :center_on_current_line
-bindkey "B z", "center_on_current_line();call(:exit_browse_mode)"
+bindkey "B z", "center_on_current_line();call_action(:exit_browse_mode)"
 bindkey "B enter || B return || B esc || B j || B ctrl!", :exit_browse_mode
 bindkey "B s", :page_up
 bindkey "B d", :page_down
@@ -162,6 +173,7 @@ default_keys = {
   "C , d b" => "debug_print_buffer",
   "C , d c" => "debug_dump_clipboard",
   "C , d d" => "debug_dump_deltas",
+  
   "VC O" => "buf.jump(END_OF_LINE)",
   "VC $" => "buf.jump(END_OF_LINE)",
 
@@ -197,6 +209,7 @@ default_keys = {
   "C d $" => "buf.delete2(:to_line_end)",
   #    'C d e'=> 'buf.delete_to_next_word_end',
   "C d <num> e" => "delete_next_word",
+  "C d ' <char>" => "buf.delete2(:to_mark,<char>)",
   "C r <char>" => "buf.replace_with_char(<char>)", # TODO
   "C , l b" => "load_buffer_list",
   "C , l l" => "save_buffer_list",

data/lib/vimamsa/main.rb

@@ -49,18 +49,11 @@ end
 
 require "vimamsa/editor.rb"
 
-# load "gui_funcs.rb"
-
 $vma = Editor.new
 def vma()
   return $vma
 end
 
-# c_startup
-# run_random_jump_test
-# main_loop
-
-# debug("END")
 
 
 

data/lib/vimamsa/rbvma.rb

@@ -48,12 +48,6 @@ require "vimamsa/conf"
 # load "vendor/ver/lib/ver/syntax/detector.rb"
 # load "vendor/ver/config/detect.rb"
 
-$vma = Editor.new
-
-def vma()
-  return $vma
-end
-
 def unimplemented
   debug "unimplemented"
 end

data/lib/vimamsa/search_replace.rb

@@ -68,6 +68,24 @@ def gui_grep()
   gui_one_input_action("Grep", "Search:", "grep", callback)
 end
 
+def highlight_match(bf, str, color: "#aa0000ff")
+  vbuf = bf.view.buffer
+  r = Regexp.new(Regexp.escape(str), Regexp::IGNORECASE)
+
+  hlparts = []
+
+  tt = vma.gui.view.buffer.create_tag("highlight_match_tag")
+  tt.weight = 650
+  tt.foreground = color
+
+  ind = scan_indexes(bf, r)
+  ind.each { |x|
+    itr = vbuf.get_iter_at(:offset => x)
+    itr2 = vbuf.get_iter_at(:offset => x + str.size)
+    vbuf.apply_tag(tt, itr, itr2)
+  }
+end
+
 def grep_cur_buffer(search_str, b = nil)
   debug "grep_cur_buffer(search_str)"
   lines = vma.buf.split("\n")
@@ -76,18 +94,21 @@ def grep_cur_buffer(search_str, b = nil)
   fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
   res_str = ""
 
+  hlparts = []
   $grep_matches = []
   lines.each_with_index { |l, i|
     if r.match(l)
-      # res_str << "#{fpath}#{i + 1}:#{l}\n"
-      res_str << "#{i + 1}:#{l}\n"
+      res_str << "#{i + 1}:"
+      # ind = scan_indexes(l, r)
+      res_str << "#{l}\n"
       $grep_matches << i + 1 # Lines start from index 1
     end
   }
   $grep_bufid = vma.buffers.current_buf
-  b = create_new_file(nil, res_str)
-  # set_current_buffer(buffer_i, update_history = true)
-  # @current_buf = buffer_i
+  b = create_new_buffer(res_str, "grep")
+  vbuf = vma.gui.view.buffer
+
+  highlight_match(b, search_str, color: "#10bd8e")
 
   b.line_action_handler = proc { |lineno|
     debug "GREP HANDLER:#{lineno}"
@@ -99,10 +120,6 @@ def grep_cur_buffer(search_str, b = nil)
   }
 end
 
-# def invoke_grep_search()
-# start_minibuffer_cmd("", "", :grep_cur_buffer)
-# end
-
 def gui_one_input_action(title, field_label, button_title, callback, opt = {})
   a = OneInputAction.new(nil, title, field_label, button_title, callback, opt)
   a.run
@@ -188,6 +205,13 @@ module Gtk
   end
 end
 
+def set_margin_all(widget, m)
+  widget.margin_bottom = m
+  widget.margin_top = m
+  widget.margin_end = m
+  widget.margin_start = m
+end
+
 class OneInputAction
   def initialize(main_window, title, field_label, button_title, callback, opt = {})
     @window = Gtk::Window.new()

data/lib/vimamsa/util.rb

@@ -1,5 +1,8 @@
+require "open3"
+
+
 # Run idle proc once
-# Delay execution of proc until Gtk has fully processed the last calls. 
+# Delay execution of proc until Gtk has fully processed the last calls.
 def run_as_idle(p)
   if p.class == Proc
     Thread.new {
@@ -8,6 +11,48 @@ def run_as_idle(p)
   end
 end
 
+def open_url(url)
+  system("xdg-open", url)
+end
+
+def open_with_default_program(url)
+  system("xdg-open", url)
+end
+
+def run_cmd(cmd)
+  tmpf = Tempfile.new("vmarun", "/tmp").path
+  cmd = "#{cmd} > #{tmpf}"
+  debug "CMD:\n#{cmd}"
+  system("bash", "-c", cmd)
+  res_str = File.read(tmpf)
+  return res_str
+end
+
+def exec_cmd(bin_name, arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil, arg5 = nil)
+  assert_binary_exists(bin_name)
+  if !arg5.nil?
+    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4, arg5)
+  elsif !arg4.nil?
+    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4)
+  elsif !arg3.nil?
+    p = Open3.popen2(bin_name, arg1, arg2, arg3)
+  elsif !arg2.nil?
+    p = Open3.popen2(bin_name, arg1, arg2)
+  elsif !arg1.nil?
+    p = Open3.popen2(bin_name, arg1)
+  else
+    p = Open3.popen2(bin_name)
+  end
+
+  ret_str = p[1].read
+  return ret_str
+end
+
+def mkdir_if_not_exists(_dirpath)
+  dirpath = File.expand_path(_dirpath)
+  Dir.mkdir(dirpath) unless File.exist?(dirpath)
+end
+
 class HSafe
   def initialize(hash)
     @h = hash
@@ -139,6 +184,16 @@ def read_file(text, path)
   return content
 end
 
+def sanitize_input(str)
+  if str.encoding != Encoding::UTF_8
+    str = text.encode(Encoding::UTF_8)
+  end
+  str.gsub!(/\r\n/, "\n")
+  return str
+end
+
+
+
 def is_url(s)
   return s.match(/(https?|file):\/\/.*/) != nil
 end

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,7 @@ files:
 - lib/vimamsa.rb
 - lib/vimamsa/ack.rb
 - lib/vimamsa/actions.rb
+- lib/vimamsa/audio.rb
 - lib/vimamsa/buffer.rb
 - lib/vimamsa/buffer_list.rb
 - lib/vimamsa/buffer_manager.rb