vimamsa 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97397b2b0eb7e2d07c23e67d4c9cebeec0df6925f43a70b2d42ad87d2f5383fb
-  data.tar.gz: fe0040694d69b1b860d942fb7cf3bea5fc671ba482b72a991f4d8f6d0031524c
+  metadata.gz: 33b88d4f4c567a38c726a1eee1a408fb051a972a54afebfee29add1e81f7761d
+  data.tar.gz: '0366913aba4ccf3f687cbce63fec3815df7cf8c98ae1e00272be32d898f4ec48'
 SHA512:
-  metadata.gz: 749aa7833a6db40dc85620884f2e7be97c3d54b4e681f96255f54aa1a76148d80640f78e194f3b688e80f770c4afedbba9c096ac58a56da455102fc2ece4bcec
-  data.tar.gz: 74df362a22e70517ababecf5a61d29cc5655147f3c163764d264febfb83fa8b65182cb0f2cfc92e26e157ed3e2618c03c53f06c0d73ba5c06a18a4aa4b162201
+  metadata.gz: 3eaa999737e313cfbfb1028031d60101c7c3fcbcfb30504991c4a7a350da374f0969502e13facf46cc69f63b60d576817fa86cbd87981be8988e7998fef119b7
+  data.tar.gz: 298335f27adce1d7164ea138908419db2b7d1192014ad780651779f36d1a384cde34e5196fa3cae021beaf178e551de08e92a81f03643dec476bbb01a2e1d566

data/exe/vimamsa

@@ -1,12 +1,9 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require "ripl/multi_line"
 require "tempfile"
 # Ripl.config[:multi_line_prompt] = ' > '
 require "pathname"
 
-ENV["GTK_THEME"] = "Adwaita:dark"
-# ENV["GTK_THEME"] = "Adwaita:light"
-
 selfpath = __FILE__
 selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
 scriptdir = File.expand_path(File.dirname(selfpath) + "/..")

data/lib/vimamsa/buffer.rb

@@ -13,7 +13,6 @@ $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
   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
@@ -207,9 +206,7 @@ class Buffer < String
     # If this is done too early, the gutter is not yet drawn which
     # will result in wrong position
     if @audiofiles.size == 1
-      Thread.new {
-        GLib::Idle.add(proc { self.reset_audio_widget_positions })
-      }
+      run_as_idle proc { self.reset_audio_widget_positions }
     end
     $audiof = mf
   end

data/lib/vimamsa/buffer_manager.rb

@@ -15,6 +15,7 @@ class BufferManager
 
     bindkey "bmgr enter", :bmgr_select
     bindkey "bmgr c", :bmgr_close
+    bindkey "bmgr x", :close_current_buffer
   end
 
   def initialize()
@@ -60,7 +61,7 @@ class BufferManager
     @@cur = self
     @header = []
     @header << "Current buffers:"
-    @header << "keys: <enter> to select, <c> to close buffer"
+    @header << "keys: <enter> to select, <c> to close buffer, <x> exit"
     @header << "=" * 40
 
     s = ""

data/lib/vimamsa/easy_jump.rb

@@ -72,7 +72,7 @@ class EasyJump
       # @kbd.set_mode(:command)
       vma.kbd.remove_keyhandling_override
       @jump_sequence = []
-      vma.gui.clear_overlay()
+      vma.gui.clear_overlay
     end
     return true
   end

data/lib/vimamsa/editor.rb

@@ -93,6 +93,7 @@ class Editor
     $kbd = @kbd
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
+    
 
     FileManager.init
     BufferManager.init
@@ -169,7 +170,6 @@ class Editor
     #Load plugins
     require "vimamsa/file_history.rb"
     @fh = FileHistory.new
-    # @_plugins[:FileFinder] = FileFinder.new
     @_plugins[:FileHistory] = @fh
 
     register_plugin(:FileHistory, @fh)
@@ -389,7 +389,7 @@ def show_key_bindings()
   kbd_s << vma.kbd.to_s
   kbd_s << "\n"
   kbd_s << "===============================================\n"
-  b = create_new_file(nil, kbd_s)
+  b = create_new_buffer(kbd_s,"key-bindings")
   gui_set_file_lang(b.id, "hyperplaintext")
   #
 end
@@ -509,11 +509,11 @@ def create_new_file(filename = nil, file_contents = "\n")
   return buffer
 end
 
-def create_new_buffer(file_contents = "\n",prefix="buf")
+def create_new_buffer(file_contents = "\n",prefix="buf", setcurrent=true)
   debug "NEW BUFFER CREATED"
   buffer = Buffer.new(file_contents,nil,prefix)
   vma.buffers.add(buffer)
-  vma.buffers.set_current_buffer_by_id(buffer.id)
+  vma.buffers.set_current_buffer_by_id(buffer.id) if setcurrent
   buffer.set_content(file_contents)
 
   return buffer

data/lib/vimamsa/file_finder.rb

@@ -15,12 +15,12 @@ class FileFinder
 
   def initialize()
     vma.hook.register(:shutdown, self.method("save"))
-    @dir_list = vma.marshal_load("file_index")
+    @@dir_list = vma.marshal_load("file_index")
   end
 
   def save()
    debug "SAVE FILE INDEX", 2
-    vma.marshal_save("file_index", @dir_list)
+    vma.marshal_save("file_index", @@dir_list)
   end
 
   def start_gui()
@@ -30,7 +30,7 @@ class FileFinder
     end
     l = []
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-    if @dir_list == nil
+    if @@dir_list == nil
       Thread.new { FileFinder.recursively_find_files() }
     end
 
@@ -71,16 +71,16 @@ class FileFinder
       debug("FIND FILEs IN #{d}")
       dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
       debug("FIND FILEs IN #{d} END")
-    end   #@dir_list = Dir.glob('./**/*').select { |e| File.file? e }
-    debug("END find files2")
-    @dir_list = dlist
+    end
+    @@dir_list = dlist
     debug("END find files")
-    return @dir_list
+    return @@dir_list
   end
 
   def filter_files(search_str)
     dir_hash = {}
-    scores = Parallel.map(@dir_list, in_threads: 8) do |file|
+
+    scores = Parallel.map(@@dir_list, in_threads: 8) do |file|
       [file, srn_dst(search_str, file)]
     end
     for s in scores

data/lib/vimamsa/gui.rb

@@ -178,38 +178,6 @@ def gui_set_cursor_pos(id, pos)
   vma.buf.view.set_cursor_pos(pos)
 end
 
-def gui_set_active_window(winid)
-  sw = vma.gui.sw
-  if winid == 2
-    sw = vma.gui.sw2
-  end
-
-  sw.set_child(view)
-  view.grab_focus
-
-  vma.gui.view = view
-  vma.gui.buf1 = view.buffer
-  $view = view
-  $vbuf = view.buffer
-end
-
-#TODO:delete?
-def gui_attach_buf_to_window(id, winid)
-  view = vma.gui.buffers[id]
-  sw = vma.gui.sw
-  if winid == 2
-    sw = vma.gui.sw2
-  end
-
-  sw.set_child(view)
-  view.grab_focus
-
-  vma.gui.view = view
-  vma.gui.buf1 = view.buffer
-  $view = view
-  $vbuf = view.buffer
-end
-
 def gui_set_current_buffer(id)
   vma.gui.set_current_buffer(id)
   return
@@ -328,69 +296,53 @@ class VMAgui
     @da.show
   end
 
-  def toggle_overlay
-    @show_overlay = @show_overlay ^ 1
-    if !@show_overlay
-      if @da != nil
-        @overlay.remove(@da)
-      end
-      return
-    else
-      @da = Gtk::Fixed.new
-      @overlay.add_overlay(@da)
-      @overlay.set_overlay_pass_through(@da, true)
+  def remove_overlay_cursor()
+    if !@cursorov.nil?
+      @overlay.remove_overlay(@cursorov)
+      @cursorov = nil
     end
+  end
 
-    (startpos, endpos) = get_visible_area
-    s = @view.buffer.text
-    wpos = s.enum_for(:scan, /\W(\w)/).map { Regexp.last_match.begin(0) + 1 }
-    wpos = wpos[0..130]
-
-    # vr =  @view.visible_rect
-    # # gtk_text_view_get_line_at_y
-    # # gtk_text_view_get_iter_at_position
-    # gtk_text_view_get_iter_at_position(vr.
-    # istart = @view.get_iter_at_position(vr.x,vr.y)
-    # istart = @view.get_iter_at_y(vr.y)
-    # startpos = @view.get_iter_at_position_raw(vr.x,vr.y)[1].offset
-    # endpos = @view.get_iter_at_position_raw(vr.x+vr.width,vr.y+vr.height)[1].offset
-    # debug "startpos,endpos:#{[startpos, endpos]}"
-
-    da = @da
-    if false
-      da.signal_connect "draw" do |widget, cr|
-        cr.save
-        for pos in wpos
-          (x, y) = @view.pos_to_coord(pos)
-
-          layout = da.create_pango_layout("XY")
-          desc = Pango::FontDescription.new("sans bold 11")
-          layout.font_description = desc
-
-          cr.move_to(x, y)
-          # cr.move_to(gutter_width, 300)
-          cr.pango_layout_path(layout)
-
-          cr.set_source_rgb(1.0, 0.0, 0.0)
-          cr.fill_preserve
-        end
-        cr.restore
-        false # = draw other
-        # true # = Don't draw others
+  def overlay_draw_cursor(textpos)
+    # return
+    remove_overlay_cursor
+    GLib::Idle.add(proc { self.overlay_draw_cursor_(textpos) })
+    # overlay_draw_cursor_(textpos)
+  end
+
+  # Run proc after animated scrolling has stopped (e.g. after page down)
+  def run_after_scrolling(p)
+    Thread.new {
+      while Time.now - @last_adj_time < 0.1
+        sleep 0.1
       end
-    end
+      run_as_idle p
+    }
+  end
 
-    for pos in wpos
-      (x, y) = @view.pos_to_coord(pos)
-      # da.put(Gtk::Label.new("AB"), x, y)
-      label = Gtk::Label.new("<span background='#00000088' foreground='#ff0000' weight='ultrabold'>AB</span>")
-      label.use_markup = true
-      da.put(label, x, y)
-    end
+  # To draw on empty lines and line-ends (where select_range doesn't work)
+  def overlay_draw_cursor_(textpos)
+    # Thread.new {
+    # GLib::Idle.add(proc { p.call; false })
+    # }
 
-    # debug @view.pos_to_coord(300).inspect
+    # while Time.now - @last_adj_time < 0.3
+    # return true
+    # end
 
-    @da.show
+    remove_overlay_cursor
+    @cursorov = Gtk::Fixed.new
+    @overlay.add_overlay(@cursorov)
+
+    (x, y) = @view.pos_to_coord(textpos)
+    pp [x, y]
+
+    # Trying to draw only background of character "I"
+    label = Gtk::Label.new("<span background='#00ffaaff' foreground='#00ffaaff' weight='ultrabold'>I</span>")
+    label.use_markup = true
+    @cursorov.put(label, x, y)
+    @cursorov.show
+    return false
   end
 
   def handle_deltas()
@@ -551,6 +503,7 @@ class VMAgui
     return true
   end
 
+  # Remove widget event controllers added by gtk, and add our own.
   def reset_controllers
     clist = @window.observe_controllers
     to_remove = []
@@ -629,23 +582,32 @@ class VMAgui
     end
   end
 
+  def idle_set_size()
+    # Need to wait for a while to window to be maximized to get correct @window.width
+    sleep 0.1
+    width = @window.width / 2
+    height = @window.height - 5
+    # Ripl.start :binding => binding
+    @window.unmaximize
+    @window.set_size_request(width, height)
+    return false
+  end
+
   def init_window
     @last_debug_idle = Time.now
     app = Gtk::Application.new("net.samiddhi.vimamsa.r#{rand(1000)}", :flags_none)
     @app = app
 
-    app.signal_connect "activate" do
+    Gtk::Settings.default.gtk_application_prefer_dark_theme = true
+    Gtk::Settings.default.gtk_theme_name = "Adwaita"
 
-      # @window = Gtk::Window.new(:toplevel)
-      # @window = Gtk::Window.new()
+    app.signal_connect "activate" do
       @window = Gtk::ApplicationWindow.new(app)
       @window.set_application(app)
 
-      #    sh = @window.screen.height #TODO:gtk4
-      #    sw = @window.screen.width #TODO:gtk4
-      # TODO:Maximise vertically
-      #    @window.set_default_size((sw * 0.45).to_i, sh - 20) #TODO:gtk4
-      @window.set_default_size(800, 600)
+      @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)
@@ -659,15 +621,21 @@ class VMAgui
 
       reset_controllers
 
-      # @window.signal_connect("key-pressed") { puts "Hello World!" }
-      # @window.signal_connect("clicked") { puts "Hello World!" }
-
-      # @menubar = Gtk::PopoverMenuBar.new #TODO:gtk4
-      #    @menubar.expand = false #TODO:gtk4
-
       @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
+        # pp x.page_size
+        # pp x.step_increment
+        # pp x.upper
+        # pp x.value
+        # pp x
+        @last_adj_time = Time.now
+        # puts "@sw.vadjustment"
+      }
+
       # @sw.signal_connect("clicked") { puts "Hello World!" }
       # @sw.signal_connect("key-pressed") { puts "Hello World!" }
       @overlay = Gtk::Overlay.new
@@ -813,10 +781,10 @@ class VMAgui
     @vbox.remove(@overlay)
 
     # numbers: left, top, width, height
-    @pane.set_start_child(@overlay)
-    @pane.set_end_child(@overlay2)
+    @pane.set_start_child(@overlay2)
+    @pane.set_end_child(@overlay)
 
-    @vbox.attach(@pane, 0, 1, 2, 1)
+    @vbox.attach(@pane, 0, 2, 2, 1)
 
     @sw2.vexpand = true
     @sw2.hexpand = true
@@ -831,7 +799,7 @@ class VMAgui
       last = vma.buffers.get_last_visited_id
       set_buffer_to_window(last, 2)
     else
-      bf = create_new_buffer "\n\n"
+      bf = create_new_buffer "\n\n", "buff", false
       set_buffer_to_window(bf.id, 2)
     end
   end
@@ -848,8 +816,14 @@ class VMAgui
     else
       set_active_window(1)
     end
+  end
 
-    vma.buffers.set_current_buffer_by_id(@sw.child.bufo.id)
+  # activate that window which has the given view
+  def set_current_view(view)
+    w = @windows.find { |k, v| v[:sw].child == view }
+    if !w.nil?
+      set_active_window(w[0])
+    end
   end
 
   def set_active_window(id)
@@ -868,16 +842,26 @@ class VMAgui
     @sw = @windows[id][:sw]
     @overlay = @windows[id][:overlay]
 
+    vma.buffers.set_current_buffer_by_id(@sw.child.bufo.id)
+
     #TODO: set buf & view of active window??
 
   end
 
+  def current_view
+    return @sw.child
+  end
+
   def set_buffer_to_window(bufid, winid)
     view = @buffers[bufid]
     debug "vma.gui.set_buffer_to_window(#{bufid}), winid=#{winid}"
     buf1 = view.buffer
 
     @windows[winid][:sw].set_child(view)
+    idle_ensure_cursor_drawn
+
+    # @overlay = Gtk::Overlay.new
+    # @overlay.add_overlay(view)
 
     #TODO:???
     # @view = view
@@ -896,19 +880,26 @@ class VMAgui
     $view = view
     $vbuf = buf1
 
-    # If already open in another column
-
+    # Check if buffer is already open in another column
     if @two_column and @active_column == 2 and id == @sw1.child.bufo.id
       toggle_active_window
-    elsif @two_column and @active_column == 1 and id == @sw2.child.bufo.id
+    elsif @two_column && @active_column == 1 && !@sw2.child.nil? && id == @sw2.child.bufo.id
+      #TODO: should not need !@sw2.child.nil? here. If this happens then other column is empty.
       toggle_active_window
     else
       @sw.set_child(view)
     end
     view.grab_focus
-    # TODO:needed?
-    # view.set_cursor_visible(true)
-    # view.place_cursor_onscreen
-    # @sw.show
+
+    idle_ensure_cursor_drawn
+  end
+
+  def idle_ensure_cursor_drawn
+    run_as_idle proc { self.ensure_cursor_drawn }
+  end
+
+  def ensure_cursor_drawn
+    # view.place_cursor_onscreen #TODO: needed?
+    view.draw_cursor
   end
 end

data/lib/vimamsa/gui_menu.rb

@@ -43,6 +43,10 @@ module Vimamsa
       add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
       add_to_menu "Actions.experimental.DisableDebug", { :label => "Disable debug", :action => :disable_debug }
       add_to_menu "Actions.experimental.ShowImages", { :label => "Show images ⟦img:path⟧", :action => :show_images }
+      
+      
+      add_to_menu "View.TwoColumn", { :label => "Start two column mode", :action => :toggle_two_column }
+      
 
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }

data/lib/vimamsa/gui_sourceview.rb

@@ -25,6 +25,8 @@ class VSourceView < GtkSource::View
     @removed_controllers = []
     self.highlight_current_line = true
 
+    @tt = nil
+
     #    self.drag_dest_add_image_targets #TODO:gtk4
     #    self.drag_dest_add_uri_targets #TODO:gtk4
 
@@ -42,9 +44,19 @@ class VSourceView < GtkSource::View
     # true
     # end
 
+    # Mainly after page-up or page-down
     signal_connect("move-cursor") do |widget, event|
-      debug("MOVE-CURSOR",2)
+      debug("MOVE-CURSOR", 2)
       $update_cursor = true
+      # handle_scrolling()
+      # curpos = buffer.cursor_position
+      # debug "MOVE CURSOR (sig): #{curpos}"
+
+      # run_as_idle proc {
+      # curpos = buffer.cursor_position
+      # debug "MOVE CURSOR (sig2): #{curpos}"
+      # }
+
       false
     end
 
@@ -83,7 +95,7 @@ class VSourceView < GtkSource::View
       # if ctr.class == Gtk::EventControllerKey or ctr.class == Gtk::GestureClick
       if ctr != @click
         # to_remove << ctr if ctr.class != Gtk::GestureDrag
-        to_remove << ctr 
+        to_remove << ctr
       end
     }
     if to_remove.size > 0
@@ -118,23 +130,57 @@ class VSourceView < GtkSource::View
       view_width = visible_rect.width
       gutter_width = winw - view_width
 
-      i = get_iter_at_location((x - gutter_width).to_i, (y + visible_rect.y).to_i)
+      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 = get_iter_at_location(xloc, yloc)
       if !i.nil?
         @bufo.set_pos(i.offset)
       else
-        debug "iter nil 0000"
+        debug "iter nil"
+        #TODO: find correct line position some other way
       end
+
       true
     end
   end
 
+  def handle_scrolling()
+    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 {
+      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
+        if !i.nil?
+          @bufo.set_pos(i.offset)
+        end
+      end
+      $update_cursor = false
+    }
+  end
+
   # def handle_key_event(event, sig)
   def handle_key_event(keyval, keyname, sig)
+    delete_cursorchar
     if $update_cursor
-      curpos = buffer.cursor_position
-      debug "MOVE CURSOR: #{curpos}"
-      buf.set_pos(curpos)
-      $update_cursor = false
+      handle_scrolling
     end
     debug $view.visible_rect.inspect
 
@@ -226,17 +272,17 @@ class VSourceView < GtkSource::View
     # set_focus(5)
     # false
 
+    draw_cursor #TODO: only when needed
   end
 
   def pos_to_coord(i)
     b = buffer
     iter = b.get_iter_at(:offset => i)
     iterxy = get_iter_location(iter)
-    # winw = parent_window.width #TODO:gtk4
     winw = width #TODO
 
     view_width = visible_rect.width
-    gutter_width = winw - view_width
+    gutter_width = winw - view_width #TODO
 
     x = iterxy.x + gutter_width
     y = iterxy.y
@@ -249,6 +295,7 @@ class VSourceView < GtkSource::View
   end
 
   def handle_deltas()
+    delete_cursorchar
     any_change = false
     while d = @bufo.deltas.shift
       any_change = true
@@ -266,7 +313,7 @@ class VSourceView < GtkSource::View
       end
     end
     if any_change
-      # gui_set_cursor_pos(@bufo.id, @bufo.pos) #TODO: only when necessary
+      #TODO: only when necessary
       self.set_cursor_pos(pos)
     end
 
@@ -289,6 +336,7 @@ class VSourceView < GtkSource::View
   end
 
   def set_cursor_pos(pos)
+    delete_cursorchar
     # return
     itr = buffer.get_iter_at(:offset => pos)
     itr2 = buffer.get_iter_at(:offset => pos + 1)
@@ -382,14 +430,51 @@ 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 draw_cursor
+    # if @tt.nil?
+    # @tt = buffer.create_tag("font_tag")
+    # @tt.font = "Arial"
+    # end
+
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
-    # if is_command_mode
+    delete_cursorchar
+    vma.gui.remove_overlay_cursor
     if ctype == :command
-      itr = buffer.get_iter_at(:offset => @bufo.pos)
-      itr2 = buffer.get_iter_at(:offset => @bufo.pos + 1)
-      buffer.select_range(itr, itr2)
+      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?
     elsif ctype == :visual
       debug "VISUAL MODE"

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -75,7 +75,7 @@ bindkey "B c", :close_current_buffer
 bindkey "B ;", "buf.jump_to_last_edit"
 bindkey "B q", :jump_to_last_edit
 bindkey "B w", :jump_to_next_edit
-bindkey "C , d", :diff_buffer
+# bindkey "C , d", :diff_buffer
 bindkey "C , g", :invoke_grep_search
 #bindkey 'C , g', proc{invoke_grep_search}
 bindkey "C , v", :auto_indent_buffer
@@ -156,6 +156,7 @@ default_keys = {
 
   # Debug
   "C , d r p" => "start_ripl",
+  "C , d o" => "vma.gui.clear_overlay",
   "C , D" => "debug_print_buffer",
   "C , c s" => "bufs.close_scrap_buffers",
   "C , d b" => "debug_print_buffer",

data/lib/vimamsa/util.rb

@@ -1,3 +1,12 @@
+# Run idle proc once
+# Delay execution of proc until Gtk has fully processed the last calls. 
+def run_as_idle(p)
+  if p.class == Proc
+    Thread.new {
+      GLib::Idle.add(proc { p.call; false })
+    }
+  end
+end
 
 class HSafe
   def initialize(hash)
@@ -44,7 +53,6 @@ end
 # pp HSafe.new(h)[2]["sdf"][:llz].val
 # pp HSafe.new(h)["SDFSDFD"]["sdf"][:llz].val
 
-
 # From https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
 # Cross-platform way of finding an executable in the $PATH.
 #

data/lib/vimamsa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler