vimamsa 0.1.14 → 0.1.15

data/lib/vimamsa/gui.rb

@@ -1,5 +1,25 @@
 $idle_scroll_to_mark = false
 
+$removed_controllers = []
+
+def gui_remove_controllers(widget)
+  clist = widget.observe_controllers
+  to_remove = []
+  (0..(clist.n_items - 1)).each { |x|
+    ctr = clist.get_item(x)
+    to_remove << ctr
+  }
+  if to_remove.size > 0
+    # debug "Removing controllers:"
+    # pp to_remove
+    to_remove.each { |x|
+      # To avoid GC. https://github.com/ruby-gnome/ruby-gnome/issues/15790
+      $removed_controllers << x
+      widget.remove_controller(x)
+    }
+  end
+end
+
 def gui_open_file_dialog(dirpath)
   dialog = Gtk::FileChooserDialog.new(:title => "Open file",
                                       :action => :open,
@@ -53,17 +73,15 @@ def get_visible_area()
   return [startpos, endpos]
 end
 
-def page_up
-  $view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES), -1, false)
-  return true
-end
-
-def page_down
-  $view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES), 1, false)
-  return true
-end
-
+# def page_up
+# $view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES), -1, false)
+# return true
+# end
 
+# def page_down
+# $view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES), 1, false)
+# return true
+# end
 
 def gui_create_buffer(id, bufo)
   debug "gui_create_buffer(#{id})"
@@ -71,7 +89,6 @@ def gui_create_buffer(id, bufo)
   view = VSourceView.new(nil, bufo)
 
   view.register_signals()
-  cnf.debug = true
 
   ssm = GtkSource::StyleSchemeManager.new
   ssm.set_search_path(ssm.search_path << ppath("styles/"))
@@ -85,10 +102,10 @@ def gui_create_buffer(id, bufo)
   view.set_buffer(buf1)
 
   provider = Gtk::CssProvider.new
-  provider.load(data: "textview { font-family: Monospace; font-size: 11pt; }")
+  
+  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
-  pp $cnf
   view.set_tab_width(conf(:tab_width))
 
   $vmag.buffers[id] = view
@@ -114,7 +131,8 @@ end
 
 def gui_set_buffer_contents(id, txt)
   debug "gui_set_buffer_contents(#{id}, txt)"
-  vma.gui.buffers[id].buffer.set_text(txt)
+  # vma.gui.buffers[id].buffer.set_text(txt)
+  vma.gui.buffers[id].set_content(txt)
 end
 
 #TODO: remove
@@ -135,7 +153,7 @@ def gui_set_window_title(wtitle, subtitle = "")
 end
 
 class VMAgui
-  attr_accessor :buffers, :sw, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :overlay1, :overlay2, :sws, :two_c
+  attr_accessor :buffers, :sw, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :sws, :two_c
   attr_reader :two_column, :windows, :subtitle, :app
 
   def initialize()
@@ -327,7 +345,6 @@ class VMAgui
     overlay = Gtk::Overlay.new
     overlay.set_child(sw)
     @vbox.attach(overlay, 0, 3, 2, 1)
-    $sw2 = sw
     sw.set_size_request(-1, 12)
 
     view = VSourceView.new(nil, nil)
@@ -465,8 +482,8 @@ class VMAgui
       end
     }
     if to_remove.size > 0
-      puts "Removing controllers:"
-      pp to_remove
+      # debug "Removing controllers:"
+      # pp to_remove
       to_remove.each { |x| @window.remove_controller(x) }
     end
 
@@ -480,7 +497,7 @@ class VMAgui
       name = Gdk::Keyval.to_name(keyval)
       uki = Gdk::Keyval.to_unicode(keyval)
       keystr = uki.chr("UTF-8")
-      puts "key-pressed #{keyval} #{keycode} name:#{name} str:#{keystr} unicode:#{uki}"
+      debug "key pressed #{keyval} #{keycode} name:#{name} str:#{keystr} unicode:#{uki}"
       buf.view.handle_key_event(keyval, keystr, :key_press)
       true
     end
@@ -501,19 +518,16 @@ class VMAgui
       # button1_mask?
       # ...
       # button5_mask?
-      true
+      true # = handled, do not propagate further
     end
 
     press.signal_connect "key-released" do |gesture, keyval, keycode, y|
       name = Gdk::Keyval.to_name(keyval)
       uki = Gdk::Keyval.to_unicode(keyval)
       keystr = uki.chr("UTF-8")
-      puts "key released #{keyval} #{keycode} name:#{name} str:#{keystr} unicode:#{uki}"
+      debug "key released #{keyval} #{keycode} name:#{name} str:#{keystr} unicode:#{uki}"
       buf.view.handle_key_event(keyval, keystr, :key_release)
-      # vma.kbd.match_key_conf(keystr, nil, :key_press)
-      # buf.view.handle_deltas
-      # buf.view.handle_key_event(keyval, keystr, :key_press)
-      true
+      true # = handled, do not propagate further
     end
   end
 
@@ -527,8 +541,8 @@ class VMAgui
       end
     }
     if to_remove.size > 0
-      puts "Removing controllers:"
-      pp to_remove
+      # puts "Removing controllers:"
+      # pp to_remove
       to_remove.each { |x| vma.gui.window.remove_controller(x) }
     end
   end
@@ -538,9 +552,8 @@ class VMAgui
     sleep 0.1
     width = @window.width / 2
     height = @window.height - 5
-    # Ripl.start :binding => binding
     @window.unmaximize
-    @window.set_size_request(width, height)
+    @window.set_default_size(width, height)
     return false
   end
 
@@ -575,7 +588,6 @@ 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
@@ -585,17 +597,10 @@ class VMAgui
         # 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
-      # @overlay.add(@sw) #TODO:gtk4
-      @overlay.add_overlay(@sw) #TODO:gtk4
-      @overlay1 = @overlay
-
-      # init_header_bar #TODO:gtk4
+      @overlay.add_overlay(@sw)
 
       @statnfo = Gtk::Label.new
       @subtitle = Gtk::Label.new("")
@@ -623,8 +628,6 @@ class VMAgui
 
       init_minibuffer
 
-      # p = Gtk::Popover.new
-
       name = "save"
       window = @window
       action = Gio::SimpleAction.new(name)
@@ -661,16 +664,6 @@ class VMAgui
 
       @window.show
 
-      press = Gtk::GestureClick.new
-      press.button = Gdk::BUTTON_SECONDARY
-      @window.add_controller(press)
-      press.signal_connect "pressed" do |gesture, n_press, x, y|
-        puts "FOOBARpressed"
-        # clear_surface(surface)
-        # drawing_area.queue_draw
-      end
-      @sw1 = @sw
-
       prov = Gtk::CssProvider.new
       # See gtk-4.9.4/gtk/theme/Default/_common.scss  on how to theme
       # gtksourceview/gtksourcestyleschemepreview.c
@@ -696,6 +689,7 @@ class VMAgui
         min-width: 15px;
       }
   
+ popover background > contents { padding: 8px; border-radius: 20px; } 
          ")
       @window.style_context.add_provider(prov)
 
@@ -715,6 +709,28 @@ class VMAgui
     Vimamsa::Menu.new(@menubar, @app)
   end
 
+  def toggle_two_column
+    if @two_column
+      set_one_column
+    else
+      set_two_column
+    end
+  end
+
+  def set_one_column
+    return if !@two_column
+    @windows[2][:sw].set_child(nil)
+    @windows.delete(2)
+
+    @pane.set_start_child(nil)
+    @pane.set_end_child(nil)
+
+    @vbox.remove(@pane)
+    @vbox.attach(@overlay, 0, 2, 2, 1)
+    @vbox.attach(@statbox, 1, 1, 1, 1)
+    @two_column = false
+  end
+
   def set_two_column
     return if @two_column
     # @window.set_default_size(800, 600) #TODO:gtk4
@@ -732,10 +748,10 @@ class VMAgui
 
     @vbox.remove(@overlay)
 
-    # numbers: left, top, width, height
     @pane.set_start_child(@overlay2)
     @pane.set_end_child(@overlay)
 
+    # numbers: left, top, width, height
     @vbox.attach(@pane, 0, 2, 2, 1)
 
     @sw2.vexpand = true
@@ -747,8 +763,8 @@ class VMAgui
     @sw2.show
     @two_column = true
 
-    if vma.buffers.size > 1
-      last = vma.buffers.get_last_visited_id
+    last = vma.buffers.get_last_visited_id
+    if !last.nil?
       set_buffer_to_window(last, 2)
     else
       bf = create_new_buffer "\n\n", "buff", false
@@ -833,19 +849,53 @@ class VMAgui
     $vbuf = buf1
 
     # Check if buffer is already open in another column
-    if @two_column and @active_column == 2 and id == @sw1.child.bufo.id
+    if @two_column and @active_column == 2 and id == @windows[1][:sw].child.bufo.id
       toggle_active_window
-    elsif @two_column && @active_column == 1 && !@sw2.child.nil? && id == @sw2.child.bufo.id
+    elsif @two_column && @active_column == 1 && !@windows[2][:sw].child.nil? && id == @windows[2][:sw].child.bufo.id
       #TODO: should not need !@sw2.child.nil? here. If this happens then other column is empty.
       toggle_active_window
     else
+      #TODO: improve
+      @overlay.remove_overlay(@sw)
+      @sw.set_child(nil)
+      # Creating a new ScrolledWindow every time to avoid a layout bug
+      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6189
+      @sw = new_scrolled_window
       @sw.set_child(view)
+      @overlay.add_overlay(@sw)
+      @active_window[:sw] = @sw
     end
     view.grab_focus
 
     idle_ensure_cursor_drawn
   end
 
+  def new_scrolled_window
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:automatic, :automatic)
+    @last_adj_time = Time.now
+    sw.vadjustment.signal_connect("value-changed") { |x|
+      @last_adj_time = Time.now
+      debug "@sw.vadjustment #{x.value}", 2
+    }
+    return sw
+  end
+
+  def page_down(multip: 1.0)
+    va = @sw.vadjustment
+    newval = va.value + va.page_increment * multip
+    va.value = newval
+    @sw.child.set_cursor_to_top
+  end
+
+  def page_up(multip: 1.0)
+    va = @sw.vadjustment
+    newval = va.value - va.page_increment * multip
+    newval = 0 if newval < 0
+    va.value = newval
+    @sw.child.set_cursor_to_top
+  end
+
   def idle_ensure_cursor_drawn
     run_as_idle proc { self.ensure_cursor_drawn }
   end

data/lib/vimamsa/gui_dialog.rb

@@ -1,5 +1,5 @@
 module Gui
-  def self.confirm(title, callback)
+  def self.confirm(title, callback, param: nil)
     params = {}
     params["title"] = title
     params["inputs"] = {}

data/lib/vimamsa/gui_menu.rb

@@ -31,6 +31,9 @@ module Vimamsa
       add_to_menu "Edit.Redo", { :label => "Redo edit", :action => :edit_redo }
       add_to_menu "Edit.SearchReplace", { :label => "Search and replace", :action => :gui_search_replace }
       add_to_menu "Edit.Find", { :label => "Find", :action => :find_in_buffer }
+      
+      add_to_menu "Edit.StartCompletion", { :label => "StartCompletion", :action => :start_autocomplete }
+      add_to_menu "Edit.ShowCompletion", { :label => "ShowCompletion", :action => :show_autocomplete }
 
       add_to_menu "Actions.SearchForActions", { :label => "Search for Actions", :action => :search_actions }
 
@@ -44,8 +47,9 @@ module Vimamsa
       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 "Actions.debug.dumpkbd", { :label => "Dump kbd state", :action => :kbd_dump_state }
       
-      add_to_menu "View.TwoColumn", { :label => "Start two column mode", :action => :toggle_two_column }
+      add_to_menu "View.TwoColumn", { :label => "Toggle two column mode", :action => :toggle_two_column }
       
 
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }

data/lib/vimamsa/gui_sourceview.rb

@@ -1,6 +1,6 @@
 # class VSourceView < Gtk::TextView
 class VSourceView < GtkSource::View
-  attr_accessor :bufo
+  attr_accessor :bufo, :autocp_active, :cpl_list
   # :highlight_matching_brackets
 
   # def set_highlight_current_line(vbool)
@@ -18,7 +18,7 @@ class VSourceView < GtkSource::View
     @highlight_matching_brackets = true
     @idle_func_running = false
     super()
-    @bufo = bufo #object of Buffer class buffer.rb
+    @bufo = bufo #object of Buffer class (buffer.rb)
     debug "vsource init"
     @last_keyval = nil
     @last_event = [nil, nil]
@@ -45,13 +45,14 @@ class VSourceView < GtkSource::View
     # true
     # end
 
+    # signal_connect("show-completion") do |x, y, z|
+    # debug "SHOW-COMPLETION", 2
+    # false
+    # end
+
     # 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")
-        # Ripl.start :binding => binding
-
-        debug("MOVE-CURSOR", 2)
-        # $update_cursor = true
         handle_scrolling()
       end
 
@@ -77,6 +78,11 @@ class VSourceView < GtkSource::View
     @curpos_mark = nil
   end
 
+  def set_content(str)
+    delete_cursorchar
+    self.buffer.set_text(str)
+  end
+
   def gutter_width()
     winwidth = width
     view_width = visible_rect.width
@@ -106,8 +112,6 @@ class VSourceView < GtkSource::View
       end
     }
     if to_remove.size > 0
-      debug "Removing controllers:"
-      pp to_remove
       to_remove.each { |x|
         # To avoid GC. https://github.com/ruby-gnome/ruby-gnome/issues/15790
         @removed_controllers << x
@@ -138,17 +142,17 @@ class VSourceView < GtkSource::View
       i = coord_to_iter(x, y, true)
       pp i
       @range_start = i
-      if !buf.visual_mode?
-        buf.start_visual_mode
-      end
+      buf.start_selection
     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
+        debug "Not enough drag",2
+        @range_start = nil
+      elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
+        # Can't transition from editor wide mode to buffer specific mode
+        buf.start_visual_mode
       end
       @range_start = nil
     end
@@ -228,6 +232,7 @@ class VSourceView < GtkSource::View
   end
 
   def handle_scrolling()
+    return # TODO
     delete_cursorchar
     # curpos = buffer.cursor_position
     # debug "MOVE CURSOR: #{curpos}"
@@ -247,6 +252,19 @@ class VSourceView < GtkSource::View
     }
   end
 
+  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])
+      if !i.nil?
+        @bufo.set_pos(i)
+        set_cursor_pos(i)
+      end
+    end
+  end
+
   # def handle_key_event(event, sig)
   def handle_key_event(keyval, keyname, sig)
     delete_cursorchar
@@ -291,7 +309,7 @@ class VSourceView < GtkSource::View
     keyval_trans[Gdk::Keyval::KEY_Shift_L] = "shift"
     keyval_trans[Gdk::Keyval::KEY_Shift_R] = "shift"
     keyval_trans[Gdk::Keyval::KEY_Tab] = "tab"
-    keyval_trans[Gdk::Keyval::GDK_KEY_ISO_Left_Tab] = "tab"
+    keyval_trans[Gdk::Keyval::KEY_ISO_Left_Tab] = "tab"
 
     key_trans = {}
     key_trans["\e"] = "esc"
@@ -368,6 +386,10 @@ class VSourceView < GtkSource::View
     return [x, y]
   end
 
+  def cur_pos_xy
+    return pos_to_coord(buffer.cursor_position)
+  end
+
   def handle_deltas()
     delete_cursorchar
     any_change = false
@@ -411,7 +433,6 @@ class VSourceView < GtkSource::View
 
   def set_cursor_pos(pos)
     delete_cursorchar
-    # return
     itr = buffer.get_iter_at(:offset => pos)
     itr2 = buffer.get_iter_at(:offset => pos + 1)
     buffer.place_cursor(itr)
@@ -436,7 +457,7 @@ class VSourceView < GtkSource::View
   end
 
   def cursor_visible_idle_func
-    return false
+    # return false
     debug "cursor_visible_idle_func"
     # From https://picheta.me/articles/2013/08/gtk-plus--a-method-to-guarantee-scrolling.html
 

data/lib/vimamsa/gui_sourceview_autocomplete.rb

@@ -0,0 +1,141 @@
+# require "trie"
+require "rambling-trie"
+
+class Autocomplete
+  @@trie = Rambling::Trie.create
+
+  def self.init
+    vma.hook.register(:file_saved, self.method("update_index"))
+  end
+
+  def self.update_index(bu)
+    debug "self.update_index", 2
+    add_words bu.scan_all_words
+  end
+
+  def self.update_dict
+    for bu in vma.buffers.list
+      for w in bu.scan_all_words
+        trie << w
+      end
+    end
+    @@trie = trie
+  end
+
+  def self.add_words(words)
+    for w in words
+      @@trie << w
+    end
+  end
+
+  def self.word_list
+    return @@dict.keys
+  end
+
+  def self.matching_words(beginning)
+    return @@trie.scan(beginning)
+  end
+end
+
+class VSourceView < GtkSource::View
+  def hide_completions
+    if @acwin.class == Gtk::Popover
+      @acwin.hide
+    end
+    @autocp_active = false
+  end
+
+  def autocp_select
+    return if !@autocp_active
+    bufo.complete_current_word(@cpl_list[@autocp_selected])
+    autocp_exit
+  end
+
+  def autocp_select_previous
+    return if @autocp_selected <= 0
+    autocp_hilight(@autocp_selected)
+    autocp_unhilight(@autocp_selected)
+    @autocp_selected -= 1
+    autocp_hilight(@autocp_selected)
+  end
+
+  def autocp_hilight(id)
+    l = @autocp_items[id]
+    l.set_text("<span foreground='#00ff00' weight='ultrabold'>#{cpl_list[id]}</span>")
+    l.use_markup = true
+  end
+
+  def autocp_unhilight(id)
+    l = @autocp_items[id]
+    l.set_text("<span>#{cpl_list[id]}</span>")
+    l.use_markup = true
+  end
+
+  def autocp_select_next
+    return if @autocp_selected >= cpl_list.size - 1
+    debug "autocp_select_next", 2
+    autocp_unhilight(@autocp_selected)
+    @autocp_selected += 1
+    autocp_hilight(@autocp_selected)
+  end
+
+  def autocp_exit
+    @autocp_items = []
+    @autocp_active = true
+    hide_completions
+  end
+
+  def try_autocomplete
+  end
+
+  def show_completions
+    hide_completions
+    bu = vma.buf
+    (w, range) = bu.get_word_in_pos(bu.pos - 1, boundary: :word)
+    debug [w, range].to_s, 2
+    matches = Autocomplete.matching_words w
+    return if matches.empty?
+    @autocp_active = true
+    @cpl_list = cpl_list = matches
+    win = Gtk::Popover.new()
+    win.parent = self
+    vbox = Gtk::Grid.new()
+    win.set_child(vbox)
+
+    i = 0
+    @autocp_items = []
+    @autocp_selected = 0
+    for x in cpl_list
+      l = Gtk::Label.new(x)
+      @autocp_items << l
+      # numbers: left, top, width, height
+      vbox.attach(l, 0, i, 1, 1)
+      i += 1
+    end
+    autocp_hilight(0)
+    (x, y) = cur_pos_xy
+    rec = Gdk::Rectangle.new(x, y + 8, 10, 10)
+    win.has_arrow = false
+    win.set_pointing_to(rec)
+    win.autohide = false
+    win.popup
+    gui_remove_controllers(win)
+    @acwin = win
+  end
+
+  def start_autocomplete
+    return
+    # Roughly following these examples:
+    # https://stackoverflow.com/questions/52359721/howto-maintain-gtksourcecompletion-when-changing-buffers-in-a-gtksourceview
+    # and gedit-plugins-41.0/plugins/wordcompletion/gedit-word-completion-plugin.c
+    # .. but it doesn't work. So implementing using Popover.
+    # Keeping this for reference
+
+    cp = self.completion
+    prov = GtkSource::CompletionWords.new("Autocomplete") # (name,icon)
+    prov.register(self.buffer)
+    cp.add_provider(prov)
+    pp prov
+    self.show_completion
+  end
+end

data/lib/vimamsa/gui_text.rb

@@ -1,11 +1,41 @@
 module Gui
-  def self.highlight_match(bf, str, color: "#aa0000ff")
+  def self.hilight_range(bf, r, color: "#aa0000ff", weight: nil, tag: nil)
+    vbuf = bf.view.buffer
+
+    if tag.nil?
+      tag = vma.gui.view.buffer.create_tag
+      tag.weight = weight if !weight.nil?
+      tag.foreground = color
+    end
+
+    itr = vbuf.get_iter_at(:offset => r.begin)
+    itr2 = vbuf.get_iter_at(:offset => r.last)
+    vbuf.apply_tag(tag, itr, itr2)
+  end
+
+  def self.highlight_match(bf, str, color: "#aa0000ff", weight: 650)
+    r = Regexp.new(Regexp.escape(str), Regexp::IGNORECASE)
+    tag = vma.gui.view.buffer.create_tag
+    tag.weight = weight
+    tag.foreground = color
+    ind = scan_indexes(bf, r)
+    ind.each { |x|
+      r = x..(x + str.size)
+      self.hilight_range(bf, r, tag: tag)
+    }
+  end
+
+  def self.highlight_match_old(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 = vma.gui.view.buffer.tag_table.lookup("highlight_match_tag")
+    if tt.nil?
+      tt = vma.gui.view.buffer.create_tag("highlight_match_tag")
+    end
+
     tt.weight = 650
     tt.foreground = color
 

data/lib/vimamsa/hyper_plain_text.rb

@@ -39,12 +39,23 @@ def hpt_check_cur_word(w)
         # return true
       else
         message "File not found: #{fpfx}"
+        newfn = fcands[0]
+        if File.extname(newfn) == ""
+          newfn = fcands[1]
+        end
+         Gui.confirm("File does not exist. Create a new file? \r #{newfn}",
+                    proc{hpt_create_new_file(newfn)})
+                   
       end
     end
   end
   return nil
 end
 
+def hpt_create_new_file(fn)
+  create_new_file(fn)
+end
+
 def translate_path(fn, bf)
   if File.exist?(fn)
     outfn = fn