vimamsa 0.1.18 → 0.1.20

data/lib/vimamsa/gui.rb

@@ -142,7 +142,8 @@ def gui_create_buffer(id, bufo)
   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))
+
+  view.set_tab_width(cnf.tab.width!)
 
   $vmag.buffers[id] = view
 end
@@ -189,8 +190,8 @@ def gui_set_window_title(wtitle, subtitle = "")
 end
 
 class VMAgui
-  attr_accessor :buffers, :sw, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :sws, :two_c
-  attr_reader :two_column, :windows, :subtitle, :app
+  attr_accessor :buffers, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :sws, :two_c
+  attr_reader :two_column, :windows, :subtitle, :app, :active_window
 
   def initialize()
     @two_column = false
@@ -219,6 +220,7 @@ class VMAgui
         t.exit
       end
     end
+    @app.quit
   end
 
   def scale_all_images
@@ -251,7 +253,7 @@ class VMAgui
 
   def start_overlay_draw()
     @da = Gtk::Fixed.new
-    @overlay.add_overlay(@da)
+    @active_window[:overlay].add_overlay(@da)
 
     # @overlay.set_overlay_pass_through(@da, true) #TODO:gtk4
   end
@@ -259,7 +261,7 @@ class VMAgui
   def clear_overlay()
     if @da != nil
       # @overlay.remove(@da)
-      @overlay.remove_overlay(@da)
+      @active_window[:overlay].remove_overlay(@da)
     end
   end
 
@@ -276,20 +278,6 @@ class VMAgui
     @da.show
   end
 
-  def remove_overlay_cursor()
-    if !@cursorov.nil?
-      @overlay.remove_overlay(@cursorov)
-      @cursorov = nil
-    end
-  end
-
-  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 {
@@ -306,31 +294,6 @@ class VMAgui
     }
   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 })
-    # }
-
-    # while Time.now - @last_adj_time < 0.3
-    # return true
-    # end
-
-    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()
     view.delete_cursor_char
     while d = buf.deltas.shift
@@ -385,6 +348,7 @@ class VMAgui
     sw.set_child(view)
   end
 
+    #TODO: implement in gtk4
   def init_header_bar()
     header = Gtk::HeaderBar.new
     @header = header
@@ -407,13 +371,13 @@ class VMAgui
     # icon = Gio::ThemedIcon.new("open-menu-symbolic")
     # image = Gtk::Image.new(:icon => icon, :size => :button)
     # button.add(image)
-    # header.pack_end(button)
+    # header.append(button)
 
     button = Gtk::Button.new
     icon = Gio::ThemedIcon.new("document-open-symbolic")
     image = Gtk::Image.new(:icon => icon, :size => :button)
     button.add(image)
-    header.pack_end(button)
+    header.append(button)
 
     button.signal_connect "clicked" do |_widget|
       open_file_dialog
@@ -423,7 +387,7 @@ class VMAgui
     icon = Gio::ThemedIcon.new("document-save-symbolic")
     image = Gtk::Image.new(:icon => icon, :size => :button)
     button.add(image)
-    header.pack_end(button)
+    header.append(button)
     button.signal_connect "clicked" do |_widget|
       buf.save
     end
@@ -432,7 +396,7 @@ class VMAgui
     icon = Gio::ThemedIcon.new("document-new-symbolic")
     image = Gtk::Image.new(:icon => icon, :size => :button)
     button.add(image)
-    header.pack_end(button)
+    header.append(button)
     button.signal_connect "clicked" do |_widget|
       create_new_file
     end
@@ -467,7 +431,6 @@ class VMAgui
 
     header.pack_start(box)
     @window.titlebar = header
-    # @window.add(Gtk::TextView.new)
   end
 
   def debug_idle_func
@@ -478,7 +441,7 @@ class VMAgui
       # @view.check_controllers
     end
 
-    ctrl_fn = File.expand_path("~/.vimamsa/ripl_ctrl")
+    ctrl_fn = File.expand_path(get_dot_path("ripl_ctrl"))
     # Allows to debug in case keyboard handling is lost
     if File.exist?(ctrl_fn)
       File.delete(ctrl_fn)
@@ -595,6 +558,8 @@ class VMAgui
 
     Gtk::Settings.default.gtk_application_prefer_dark_theme = true
     Gtk::Settings.default.gtk_theme_name = "Adwaita"
+    Gtk::Settings.default.gtk_cursor_blink = false
+    Gtk::Settings.default.gtk_cursor_blink_time = 4000
 
     app.signal_connect "activate" do
       @window = Gtk::ApplicationWindow.new(app)
@@ -612,29 +577,22 @@ class VMAgui
 
       reset_controllers
 
-      @sw = Gtk::ScrolledWindow.new
-      @sw.set_policy(:automatic, :automatic)
+      @windows[1] = new_window(1)
 
       @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
-      }
 
-      @overlay = Gtk::Overlay.new
-      @overlay.add_overlay(@sw)
 
+      # To show keyboard key binding state
       @statnfo = Gtk::Label.new
+      
+      # To show e.g. current folder
       @subtitle = Gtk::Label.new("")
+      
       @statbox = Gtk::Box.new(:horizontal, 2)
       @statnfo.set_size_request(150, 10)
-      @statbox.pack_end(@subtitle, :expand => true, :fill => true, :padding => 0)
-      @statbox.pack_end(@statnfo, :expand => false, :fill => false, :padding => 0)
+      @statbox.append(@subtitle)
+      @subtitle.hexpand = true
+      @statbox.append(@statnfo)
       provider = Gtk::CssProvider.new
       @statnfo.add_css_class("statnfo")
       provider.load(data: "label.statnfo {   background-color:#353535; font-size: 10pt; margin-top:2px; margin-bottom:2px; align:right;}")
@@ -643,50 +601,19 @@ class VMAgui
       @statnfo.style_context.add_provider(provider)
 
       # numbers: left, top, width, height
-      @vbox.attach(@overlay, 0, 2, 2, 1)
-      @sw.vexpand = true
-      @sw.hexpand = true
+      @vbox.attach(@windows[1][:overlay], 0, 2, 2, 1)
 
       # column, row, width height
       @vbox.attach(@statbox, 1, 1, 1, 1)
 
-      @overlay.vexpand = true
-      @overlay.hexpand = true
-
       init_minibuffer
 
-      name = "save"
-      window = @window
-      action = Gio::SimpleAction.new(name)
-      action.signal_connect "activate" do |_simple_action, _parameter|
-        dialog = Gtk::MessageDialog.new(:parent => window,
-                                        :flags => :destroy_with_parent,
-                                        :buttons => :close,
-                                        :message => "Action FOOBAR activated.")
-        dialog.signal_connect(:response) do
-          dialog.destroy
-        end
-        dialog.show
-      end
-
-      @window.add_action(action)
-      doc_actions = Gio::SimpleActionGroup.new
-      doc_actions.add_action(action)
-
-      act_quit = Gio::SimpleAction.new("quit")
-      app.add_action(act_quit)
-      act_quit.signal_connect "activate" do |_simple_action, _parameter|
-        window.destroy
-        exit!
-      end
-
       menubar = Gio::Menu.new
       app.menubar = menubar
       @window.show_menubar = true
 
       @menubar = menubar
 
-      @windows[1] = { :sw => @sw, :overlay => @overlay, :id => 1 }
       @active_window = @windows[1]
 
       @window.show
@@ -727,23 +654,20 @@ class VMAgui
       vma.start
     end
 
-    # Vimamsa::Menu.new(@menubar) #TODO:gtk4
     GLib::Idle.add(proc { self.monitor })
 
     app.run
-
-    # @window.show_all
-    # @window.show
   end
 
   def monitor
+    swa = @windows[1][:sw]
     @monitor_time ||= Time.now
-    @sw_width ||= @sw.width
+    @sw_width ||= swa.width
     return true if Time.now - @monitor_time < 0.2
     # Detect element resize
-    if @sw.width != @sw_width
+    if swa.width != @sw_width
       # puts "@sw.width=#{@sw.width}"
-      @sw_width = @sw.width
+      @sw_width = swa.width
       DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { vma.gui.scale_all_images })
     end
     @monitor_time = Time.now
@@ -764,54 +688,86 @@ class VMAgui
 
   def set_one_column
     return if !@two_column
+    #This always closes the leftmost column/window
+    #TODO: close rightmost column if left active
+    set_active_window(1)
+
     @windows[2][:sw].set_child(nil)
     @windows.delete(2)
+    w1 = @windows[1]
 
     @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)
+    @vbox.attach(w1[: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
-    # @vpaned = Gtk::Paned.new(:vertical)
-    # @vbox = Gtk::Grid.new()
-    # @window.add(@vbox)
-
-    @sw2 = Gtk::ScrolledWindow.new
-    @sw2.set_policy(:automatic, :automatic)
-    @overlay2 = Gtk::Overlay.new
-    @overlay2.add_overlay(@sw2)
-    @pane = Gtk::Paned.new(:horizontal)
+  def new_window(win_id)
+    n_sw = Gtk::ScrolledWindow.new
+    n_sw.set_policy(:automatic, :automatic)
+    n_overlay = Gtk::Overlay.new
+    n_overlay.add_overlay(n_sw)
+    # @pane = Gtk::Paned.new(:horizontal)
 
-    @windows[2] = { :sw => @sw2, :overlay => @overlay2, :id => 2 }
+    win = { :sw => n_sw, :overlay => n_overlay, :id => win_id }
+    # @windows[2] = { :sw => @sw2, :overlay => @overlay2, :id => 2 }
 
-    @vbox.remove(@overlay)
+    # @vbox.remove(@overlay)
 
-    @pane.set_start_child(@overlay2)
-    @pane.set_end_child(@overlay)
+    # @pane.set_start_child(@overlay2)
+    # @pane.set_end_child(@overlay)
 
     # numbers: left, top, width, height
-    @vbox.attach(@pane, 0, 2, 2, 1)
+    # @vbox.attach(@pane, 0, 2, 2, 1)
+
+    n_sw.vexpand = true
+    n_sw.hexpand = true
+
+    n_overlay.vexpand = true
+    n_overlay.hexpand = true
+
+    # TODO: remove??
+    n_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
+      }
+
+    # @sw2.show
+    return win
+  end
+
+  def set_two_column
+    return if @two_column
+    @windows[2] = new_window(2)
+
+    w1 = @windows[1]
+    w2 = @windows[2]
 
-    @sw2.vexpand = true
-    @sw2.hexpand = true
+    # Remove overlay from @vbox and add the Gtk::Paned instead
+    @pane = Gtk::Paned.new(:horizontal)
+    @vbox.remove(w1[:overlay])
+    @pane.set_start_child(w2[:overlay])
+    @pane.set_end_child(w1[:overlay])
 
-    @overlay2.vexpand = true
-    @overlay2.hexpand = true
+    # numbers: left, top, width, height
+    @vbox.attach(@pane, 0, 2, 2, 1)
 
-    @sw2.show
+    w2[:sw].show
     @two_column = true
 
     last = vma.buffers.get_last_visited_id
     if !last.nil?
       set_buffer_to_window(last, 2)
     else
+      # If there is only one buffer, create a new one and add to the new window/column
       bf = create_new_buffer "\n\n", "buff", false
       set_buffer_to_window(bf.id, 2)
     end
@@ -831,11 +787,17 @@ class VMAgui
     end
   end
 
-  # activate that window which has the given view
+  # Activate that window which has the given view
   def set_current_view(view)
+    # Window of current view:
     w = @windows.find { |k, v| v[:sw].child == view }
+    # All other windows:
+    otherw = @windows.find_all { |k, v| v[:sw].child != view }
     if !w.nil?
       set_active_window(w[0])
+      for k, x in otherw
+        x[:sw].child.focus_out()
+      end
     end
   end
 
@@ -850,19 +812,21 @@ class VMAgui
     end
 
     @active_window = @windows[id]
-    @active_column = id #TODO: remove
+    @active_column = id
 
-    @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??
+    @active_window[:sw].child.focus_in()
+    for k, w in @windows
+      if w != @active_window
+        fochild = w[:sw].child
+        run_as_idle proc { fochild.focus_out() }
+      end
+    end
 
+    vma.buffers.set_current_buffer_by_id(@active_window[:sw].child.bufo.id)
   end
 
   def current_view
-    return @sw.child
+    return @active_window[:sw].child
   end
 
   def set_buffer_to_window(bufid, winid)
@@ -873,9 +837,6 @@ class VMAgui
     @windows[winid][:sw].set_child(view)
     idle_ensure_cursor_drawn
 
-    # @overlay = Gtk::Overlay.new
-    # @overlay.add_overlay(view)
-
     #TODO:???
     # @view = view
     # @buf1 = buf1
@@ -885,10 +846,10 @@ class VMAgui
   end
 
   def set_current_buffer(id)
-    view = @buffers[id]
+    view2 = @buffers[id]
     debug "vma.gui.set_current_buffer(#{id}), view=#{view}"
-    buf1 = view.buffer
-    @view = view
+    buf1 = view2.buffer
+    @view = view2
     @buf1 = buf1
     $view = view
     $vbuf = buf1
@@ -901,14 +862,17 @@ class VMAgui
       toggle_active_window
     else
       #TODO: improve
-      @overlay.remove_overlay(@sw)
-      @sw.set_child(nil)
+      swa = @active_window[:sw]
+      ol = @active_window[:overlay]
+      ol.remove_overlay(swa)
+      swa.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
+      swb = new_scrolled_window
+      swb.set_child(view2)
+      ol.add_overlay(swb)
+      @active_window[:view] = view
+      @active_window[:sw] = swb
     end
     view.grab_focus
 
@@ -927,18 +891,20 @@ class VMAgui
   end
 
   def page_down(multip: 1.0)
-    va = @sw.vadjustment
+    sw = @active_window[:sw]
+    va = sw.vadjustment
     newval = va.value + va.page_increment * multip
     va.value = newval
-    @sw.child.set_cursor_to_top
+    sw.child.set_cursor_to_top
   end
 
   def page_up(multip: 1.0)
-    va = @sw.vadjustment
+    sw = @active_window[:sw]
+    va = sw.vadjustment
     newval = va.value - va.page_increment * multip
     newval = 0 if newval < 0
     va.value = newval
-    @sw.child.set_cursor_to_top
+    sw.child.set_cursor_to_top
   end
 
   def idle_ensure_cursor_drawn

data/lib/vimamsa/gui_dialog.rb

@@ -40,8 +40,9 @@ 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 = ""
+    # @window.width_request = 800
+    # @window.hexpand = false
 
     frame = Gtk::Frame.new()
     # frame.margin = 20
@@ -49,15 +50,17 @@ class OneInputAction
 
     infolabel = Gtk::Label.new
     infolabel.markup = title
+    infolabel.wrap = true
+    infolabel.max_width_chars = 80
+
 
     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)
+    vbox.append(infolabel)
+    vbox.append(hbox)
 
     button = Gtk::Button.new(:label => button_title)
     cancel_button = Gtk::Button.new(:label => "Cancel")
@@ -95,10 +98,10 @@ class OneInputAction
       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)
+    hbox.append(label)
+    hbox.append(@entry1)
+    hbox.append(button)
+    hbox.append(cancel_button)
     return
   end
 

data/lib/vimamsa/gui_form_generator.rb

@@ -49,9 +49,7 @@ class PopupFormGenerator
     if params.has_key?("title")
       infolabel = Gtk::Label.new
       infolabel.markup = params["title"]
-      #TODO:gtk4
-      # vbox.pack_start(infolabel, :expand => false, :fill => false, :padding => 0)
-      vbox.pack_end(infolabel, :expand => false, :fill => false, :padding => 0)
+      vbox.append(infolabel)
     end
 
     hbox = Gtk::Box.new(:horizontal, 8)
@@ -61,7 +59,7 @@ class PopupFormGenerator
     for id, elem in params["inputs"]
       if elem[:type] == :button
         button = Gtk::Button.new(:label => elem[:label])
-        hbox.pack_end(button, :expand => false, :fill => false, :padding => 0)
+        hbox.append(button)
         if elem[:default_focus] == true
           @default_button = button
         end
@@ -75,8 +73,8 @@ class PopupFormGenerator
         if elem.has_key?(:initial_text)
           entry.text = elem[:initial_text]
         end
-        hbox.pack_end(label, :expand => false, :fill => false, :padding => 0)
-        hbox.pack_end(entry, :expand => false, :fill => false, :padding => 0)
+        hbox.append(label)
+        hbox.append(entry)
         @vals[id] = entry
 
         press = Gtk::EventControllerKey.new
@@ -96,13 +94,13 @@ class PopupFormGenerator
       end
     end
 
-    vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 0)
+    vbox.append(hbox)
 
     cancel_button = Gtk::Button.new(:label => "Cancel")
     cancel_button.signal_connect "clicked" do
       @window.destroy
     end
-    hbox.pack_end(cancel_button, :expand => false, :fill => false, :padding => 0)
+    hbox.append(cancel_button)
     @cancel_button = cancel_button
     return
   end

data/lib/vimamsa/gui_menu.rb

@@ -1,6 +1,11 @@
 module Vimamsa
   class Menu
     def add_to_menu(_mpath, x)
+      # If no menu label provided, take from the action definition
+      if !x[:action].nil? and x[:label].nil?
+        x[:label] = vma.actions[x[:action]].method_name
+      end
+
       mpath = _mpath.split(".")
       curnfo = @nfo
       for y in mpath
@@ -31,9 +36,10 @@ 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 "Edit.StartCompletion", { :label => "StartCompletion", :action => :start_autocomplete }
+      # add_to_menu "Edit.ShowCompletion", { :label => "ShowCompletion", :action => :show_autocomplete }
+      add_to_menu "Edit.CustomRb", { :action => :edit_customrb }
 
       add_to_menu "Actions.SearchForActions", { :label => "Search for Actions", :action => :search_actions }
 
@@ -46,13 +52,11 @@ 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 "Actions.debug.dumpkbd", { :label => "Dump kbd state", :action => :kbd_dump_state }
-      
-      
+
       add_to_menu "View.BufferManager", { :label => "Show open files", :action => :start_buf_manager }
       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 }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
@@ -89,7 +93,7 @@ module Vimamsa
         label_str = nfo[:label] + kbd_str
         actkey = nfo[:action].to_s
         menuitem = Gio::MenuItem.new(label_str, "app.#{actkey}")
-        
+
         # This worked in GTK3:
         # But seems there is no way to access the Label object in GTK4
         # menuitem.children[0].set_markup(label_str)
@@ -110,7 +114,6 @@ module Vimamsa
       # menuitem.set_attribute_value("use-markup", true)
       # This might change in the future(?), but the string version still works in gtk-4.13.0 (gtk/gtkmenutrackeritem.c)
 
-
       if !nfo[:items].nil? and !nfo[:items].empty?
         for k2, item in nfo[:items]
           build_menu(item, menu)
@@ -118,7 +121,6 @@ module Vimamsa
         menuitem.submenu = menu
       end
       o = parent.append_item(menuitem)
-
     end
   end #end class
 end

data/lib/vimamsa/gui_select_window.rb

@@ -154,7 +154,9 @@ class SelectUpdateWindow
     sw = Gtk::ScrolledWindow.new(nil, nil)
     # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)
-    vbox.pack_end(sw, :expand => true, :fill => true, :padding => 0)
+    vbox.append(sw)
+    sw.vexpand = true
+    sw.hexpand = true
 
     # sw.add(treeview) #TODO:gtk4
     sw.set_child(treeview)