vimamsa 0.1.13 → 0.1.15

data/lib/vimamsa/gui.rb

@@ -1,12 +1,31 @@
 $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,
                                       :buttons => [["Open", :accept],
                                                    ["Cancel", :cancel]])
   dialog.set_current_folder(Gio::File.new_for_path(dirpath))
-  # dialog.set_current_folder(Gio::File.new_for_path("/tmp"))
 
   dialog.signal_connect("response") do |dialog, response_id|
     if response_id == Gtk::ResponseType::ACCEPT
@@ -24,7 +43,7 @@ def gui_file_saveas(dirpath)
                                       :action => :save,
                                       :buttons => [["Save", :accept],
                                                    ["Cancel", :cancel]])
-  # dialog.set_current_folder(dirpath) #TODO:gtk4
+  dialog.set_current_folder(Gio::File.new_for_path(dirpath))
   dialog.signal_connect("response") do |dialog, response_id|
     if response_id == Gtk::ResponseType::ACCEPT
       file_saveas(dialog.file.parse_name)
@@ -36,32 +55,6 @@ def gui_file_saveas(dirpath)
   dialog.show
 end
 
-def idle_func
-  # debug "IDLEFUNC"
-  if $idle_scroll_to_mark
-    # $view.get_visible_rect
-    vr = $view.visible_rect
-
-    # iter = b.get_iter_at(:offset => i)
-
-    b = $view.buffer
-    iter = b.get_iter_at(:offset => b.cursor_position)
-    iterxy = $view.get_iter_location(iter)
-    # debug "ITERXY" + iterxy.inspect
-
-    intr = iterxy.intersect(vr)
-    if intr.nil?
-      $view.set_cursor_pos($view.buffer.cursor_position)
-    else
-      $idle_scroll_to_mark = false
-    end
-
-    sleep(0.1)
-  end
-  sleep(0.01)
-  return true
-end
-
 def center_on_current_line()
   b = $view.buffer
   iter = b.get_iter_at(:offset => b.cursor_position)
@@ -80,20 +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 set_system_clipboard(arg)
-  vma.gui.window.display.clipboard.set(arg)
-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})"
@@ -101,7 +89,6 @@ def gui_create_buffer(id, bufo)
   view = VSourceView.new(nil, bufo)
 
   view.register_signals()
-  $debug = true
 
   ssm = GtkSource::StyleSchemeManager.new
   ssm.set_search_path(ssm.search_path << ppath("styles/"))
@@ -115,7 +102,8 @@ 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
   view.set_tab_width(conf(:tab_width))
@@ -143,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
@@ -164,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()
@@ -356,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)
@@ -494,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
 
@@ -509,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
@@ -530,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
 
@@ -556,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
@@ -567,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
 
@@ -604,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
@@ -614,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("")
@@ -652,8 +628,6 @@ class VMAgui
 
       init_minibuffer
 
-      # p = Gtk::Popover.new
-
       name = "save"
       window = @window
       action = Gio::SimpleAction.new(name)
@@ -690,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
@@ -725,6 +689,7 @@ class VMAgui
         min-width: 15px;
       }
   
+ popover background > contents { padding: 8px; border-radius: 20px; } 
          ")
       @window.style_context.add_provider(prov)
 
@@ -744,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
@@ -761,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
@@ -776,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
@@ -862,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

@@ -0,0 +1,113 @@
+module Gui
+  def self.confirm(title, callback, param: nil)
+    params = {}
+    params["title"] = title
+    params["inputs"] = {}
+    params["inputs"]["yes_btn"] = { :label => "Yes", :type => :button, :default_focus => true }
+    params[:callback] = callback
+    PopupFormGenerator.new(params).run
+  end
+end
+
+module Gtk
+  class Frame
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
+    end
+  end
+
+  class Box
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
+    end
+  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()
+    # @window.screen = main_window.screen
+    # @window.title = title
+    @window.title = ""
+
+    frame = Gtk::Frame.new()
+    # frame.margin = 20
+    @window.set_child(frame)
+
+    infolabel = Gtk::Label.new
+    infolabel.markup = title
+
+    vbox = Gtk::Box.new(:vertical, 8)
+    vbox.margin = 10
+    frame.set_child(vbox)
+
+    hbox = Gtk::Box.new(:horizontal, 8)
+    # @window.add(hbox)
+    vbox.pack_end(infolabel, :expand => false, :fill => false, :padding => 0)
+    vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 0)
+
+    button = Gtk::Button.new(:label => button_title)
+    cancel_button = Gtk::Button.new(:label => "Cancel")
+
+    label = Gtk::Label.new(field_label)
+
+    @entry1 = Gtk::Entry.new
+
+    if opt[:hide]
+      @entry1.visibility = false
+    end
+
+    button.signal_connect "clicked" do
+      callback.call(@entry1.text)
+      @window.destroy
+    end
+
+    cancel_button.signal_connect "clicked" do
+      @window.destroy
+    end
+
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+    @window.add_controller(press)
+    press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      if keyval == Gdk::Keyval::KEY_Return
+        callback.call(@entry1.text)
+        @window.destroy
+        true
+      elsif keyval == Gdk::Keyval::KEY_Escape
+        @window.destroy
+        true
+      else
+        false
+      end
+    end
+
+    hbox.pack_end(label, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(@entry1, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(button, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(cancel_button, :expand => false, :fill => false, :padding => 0)
+    return
+  end
+
+  def run
+    if !@window.visible?
+      @window.show
+    else
+      @window.destroy
+    end
+    @window
+  end
+end

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,6 +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::KEY_ISO_Left_Tab] = "tab"
 
     key_trans = {}
     key_trans["\e"] = "esc"
@@ -311,10 +330,12 @@ class VSourceView < GtkSource::View
       key_str_parts.delete_at(0)
     end
 
-    if key_str_parts[0] == "shift" and key_str_parts[1].class == String
-      #"shift-P" to just "P"
-      # key_str_parts.delete_at(0) if key_str_parts[1].match(/^[[:upper:]]$/)
-      key_str_parts.delete_at(0)
+    if key_str_parts[0] == "shift" and key_str_parts.size == 2
+      if key_str_parts[1].size == 1 # and key_str_parts[1].match(/^[[:upper:]]$/)
+        #"shift-P" to just "P" etc.
+        # but keep shift-tab as is
+        key_str_parts.delete_at(0)
+      end
     end
 
     key_str = key_str_parts.join("-")
@@ -365,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
@@ -408,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)
@@ -433,13 +457,9 @@ class VSourceView < GtkSource::View
   end
 
   def cursor_visible_idle_func
+    # return false
     debug "cursor_visible_idle_func"
     # From https://picheta.me/articles/2013/08/gtk-plus--a-method-to-guarantee-scrolling.html
-    # vr = visible_rect
-
-    # b = $view.buffer
-    # iter = buffer.get_iter_at(:offset => buffer.cursor_position)
-    # iterxy = get_iter_location(iter)
 
     # This is not the current buffer
     return false if vma.gui.view != self
@@ -483,16 +503,13 @@ class VSourceView < GtkSource::View
   end
 
   def ensure_cursor_visible
-    return #TODO:gtk4
+    # return
     debug "@idle_func_running=#{@idle_func_running}"
     return if @idle_func_running
     if is_cursor_visible == false
       @idle_func_running = true
       debug "Starting idle func"
-      Thread.new {
-        sleep 0.01
-        GLib::Idle.add(proc { cursor_visible_idle_func })
-      }
+      GLib::Idle.add(proc { cursor_visible_idle_func })
     end
   end