vimamsa 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b635655f9d50eb870f5593b8d2e63cfacff5ed0aece9b197ca8805622799ab0
-  data.tar.gz: 8c579b33d9d5e5d48c25fef3da47ca77eb9ba9bf713cf7c2895c1af5e2cf2d30
+  metadata.gz: 3eba5b3c9a7821e14802295825b32369ff9440046b91b065ca2b1e82e44cc444
+  data.tar.gz: 16bd4a94226c3b07cb5d40cb6e395a09f8fbbb4e96e164af19b05415048a9812
 SHA512:
-  metadata.gz: 1027546a7e21d7832e546f4ccd7eb9064aece5b7c13bef4d83477082351b2cc74e136c952999c69de70581aa651af2a5e8fd14960a1b52c91a0d0a7d08bd530c
-  data.tar.gz: 3784552302bd4f7541320785f250fe9c4aa36e6bcd7d1317f9f85b776900211a1f7d5644891de6ae224703dca6ce9c0eda12fc894d1d4f73523e6bd149b6aebf
+  metadata.gz: f74f902af54d82002d4b0d814e80cafc5326bfb712c0cd124c39be0bb2bf3f70d1eaabe6c2f05de619ee9e9ac4cf12a10a4350c568ca1b815129904b40797c48
+  data.tar.gz: a01c59f8358904e1ad511c4608de70bc31ac8bc8ccbbfa240eb897240a68f7673b7ae1bc124dcf312b94a6c7f12834d33dba692e6795713f083a5b2736ac6291

data/README.md

@@ -1,21 +1,38 @@
 # Vimamsa
 
-Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK. 
+Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK.
 
+<!-- toc -->
+
+- [Requirements](#requirements)
+- [Installation](#installation)
+  * [Other install options](#other-install-options)
+- [Run](#run)
+- [Screenshots](#screenshots)
+- [Key bindings](#key-bindings)
+- [Current limitations](#current-limitations)
+
+<!-- tocstop -->
 
 ## Requirements
  - Ruby 3.0+
  - GTK 4
 
+
 ## Installation
 
 
-On Ubuntu:
+On Ubuntu (22.04):
 ```
-sudo apt install ruby-dev
+sudo apt install ruby-dev build-essential
 sudo gem install vimamsa
 ```
 
+Run:
+```
+vimamsa
+```
+
 ### Other install options
 
 Install from sources:
@@ -40,7 +57,6 @@ vimamsa
 Install packages for optional features:
 ```
 sudo apt install ack-grep clang-format
-gem install ripl ripl-multi_line differ parallel listen rufo language_server-protocol
 ```
 
 For customization, edit ~/.vimamsa/custom.rb
@@ -52,7 +68,7 @@ For customization, edit ~/.vimamsa/custom.rb
 
 ## Key bindings
 
-Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/key_bindings_vimlike.rb
+Key bindings are very much like in VIm. For details, see menu item "Help -> Show key bindings" and file lib/vimamsa/key_bindings_vimlike.rb
 
 Keys that work somewhat similarly as in Vim:
 
@@ -70,8 +86,9 @@ d y gU gu
 Keys that work differently to Vim are documented in the tables below
 
 Syntax:  
-ctrl! means press and immediate release of ctrl key. Triggered by key up event.  
-ctrl-x means press and hold ctrl key, press x  
+
+ - ctrl! means press and immediate release of ctrl key. Triggered by key up event when no other keys were pressed between key down and key up events.
+ - ctrl-x means press and hold ctrl key, press x  
 
 <table>
 <colgroup>
@@ -144,6 +161,10 @@ For example, to bind ctrl-n to action "create new file":
 bindkey 'C ctrl-n',  'create_new_file()'
 ```
 
+
+## Known issues
+ - Cursor sometimes vanishes when dragging or resizing the window. At least some cases are fixed in new GTK4 versions ( >= 4.18, in Ubuntu Ubuntu 25.04). Workaround is to press ctrl key twice.
+
 ## Current limitations
  - UTF8 only
  - Line endings with "\n"

data/install.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+gem build vimamsa.gemspec 
+sudo gem uninstall vimamsa
+sudo gem install --local $(ls -1tr *gem |head -n 1)

data/lib/vimamsa/buffer.rb

@@ -41,6 +41,7 @@ class Buffer < String
     @module = nil
 
     @last_save = @last_asked_from_user = @file_last_cheked = Time.now
+    @t_modified = @last_save
 
     @crypt = nil
     @update_highlight = true
@@ -1295,6 +1296,16 @@ class Buffer < String
     end_visual_mode
   end
 
+  def eval_whole_buf(x = 888)
+    s = self.to_s
+    begin
+      eval(s)
+    rescue Exception
+      message("Error running eval")
+    else
+    end
+  end
+
   def convert_selected_text(converter_id)
     return if !@visual_mode
     r = get_visual_mode_range
@@ -1503,6 +1514,7 @@ class Buffer < String
         #TODO: show message box
       end
       @last_save = Time.now
+      refresh_title
       debug "file saved on #{@last_save}"
       sleep 3
     }
@@ -1515,6 +1527,20 @@ class Buffer < String
     end
   end
 
+  def unsaved_changes?
+    pp [@t_modified, @last_save]
+    return true if @t_modified > @last_save
+    return false
+  end
+
+  def refresh_title
+    if vma.buf == self
+      pfx = ""
+      pfx = "+ " if vma.buf.unsaved_changes?
+      gui_set_window_title(pfx + vma.buf.title, vma.buf.subtitle)
+    end
+  end
+
   def check_if_modified_outside
     # Don't check if less than 8 seconds since last checked
     return false if @fname.nil?
@@ -1597,4 +1623,3 @@ def backup_all_buffers()
   end
   message("Backup all buffers")
 end
-

data/lib/vimamsa/buffer_changetext.rb

@@ -5,6 +5,7 @@ class Buffer < String
 
   #TODO: change to apply=true as default
   def add_delta(delta, apply = false, auto_update_cpos = false)
+    @t_modified = Time.now
     return if !is_delta_ok(delta)
     if delta[1] == DELETE
       return if delta[0] >= self.size
@@ -26,6 +27,7 @@ class Buffer < String
       add_delta([self.size, INSERT, 1, "\n"], true)
     end
     reset_larger_cpos #TODO: correct here?
+    refresh_title
   end
 
   # TODO: rename ot auto-format. separate module?

data/lib/vimamsa/buffer_cursor.rb

@@ -141,7 +141,7 @@ class Buffer < String
   end
 
   def jump_to_next_instance_of_word()
-    if $kbd.last_action == $kbd.cur_action and @current_word != nil
+    if vma.kbd.last_action == vma.kbd.cur_action and @current_word != nil
       # debug "REPEATING *"
     else
       start_search = [@pos - 150, 0].max

data/lib/vimamsa/buffer_list.rb

@@ -154,7 +154,7 @@ class BufferList
     # end
     # vma.kbd.set_mode_to_default if vma.kbd.get_scope != :editor
 
-    gui_set_window_title(vma.buf.title, vma.buf.subtitle)
+    vma.buf.refresh_title
 
     if vma.buf.fname
       @last_dir = File.dirname(vma.buf.fname)
@@ -180,7 +180,7 @@ class BufferList
   end
 
   def get_last_dir
-    return @last_dir
+    return File.expand_path(@last_dir)
   end
 
   def reset_navigation

data/lib/vimamsa/editor.rb

@@ -74,7 +74,7 @@ class Editor
 
     # build_key_bindings_tree
     @kbd = KeyBindingTree.new()
-    $kbd = @kbd
+    $kbd = @kbd #TODO: remove global
     require "vimamsa/key_bindings_vimlike"
 
     $buffers = BufferList.new
@@ -139,7 +139,7 @@ class Editor
         fname = fname_
       end
     else
-      fname = ppath("demo.txt")
+      # fname = ppath("demo.txt")
     end
     fname = ARGV[0] if ARGV.size >= 1 and File.file?(File.expand_path(ARGV[0]))
     # vma.add_content_search_path(Dir.pwd)
@@ -261,6 +261,9 @@ class Editor
     if p and !@file_content_search_paths.include?(p)
       r.insert(0, p)
     end
+    
+    # Ensure that paths are in correct format
+    r = r.map{|x|File.expand_path(x)}
 
     return r
   end
@@ -365,21 +368,6 @@ def start_minibuffer_cmd(bufname, bufstr, cmd)
   $minibuffer.call_func = method(cmd)
 end
 
-def show_key_bindings()
-  kbd_s = "❙Key bindings❙\n"
-  kbd_s << "\n⦁[Mode] keys : action⦁\n"
-
-  kbd_s << "[B]=Browse, [C]=Command, [I]=Insert, [V]=Visual\n"
-  kbd_s << "key!: Press key once, release before pressing any other keys\n"
-
-  kbd_s << "===============================================\n"
-  kbd_s << vma.kbd.to_s
-  kbd_s << "\n"
-  kbd_s << "===============================================\n"
-  b = create_new_buffer(kbd_s, "key-bindings")
-  gui_set_file_lang(b.id, "hyperplaintext")
-  #
-end
 
 def diff_buffer()
   bufstr = ""
@@ -412,14 +400,14 @@ end
 
 def minibuffer_end()
   debug "minibuffer_end"
-  $kbd.set_mode(:command)
+  vma.kbd.set_mode(:command)
   minibuffer_input = $minibuffer.to_s[0..-2]
   return $minibuffer.call_func.call(minibuffer_input)
 end
 
 def minibuffer_cancel()
   debug "minibuffer_cancel"
-  $kbd.set_mode(:command)
+  vma.kbd.set_mode(:command)
   minibuffer_input = $minibuffer.to_s[0..-2]
   # $minibuffer.call_func.call('')
 end
@@ -645,7 +633,7 @@ def find_project_dir_of_fn(fn)
         break
       end
     end
-    return if !projdir.nil?
+    return projdir if !projdir.nil?
   end
   return projdir
 end

data/lib/vimamsa/file_finder.rb

@@ -8,6 +8,7 @@ cnf.search_dirs = []
 class StringIndex
   def initialize()
     @idx = StrIdx::StringIndex.new
+    @idx.setDirSeparator("/")
   end
 
   def find(str, minChars: 2)
@@ -94,10 +95,15 @@ class FileFinder
     select_callback = self.method("gui_file_finder_select_callback")
     update_callback = self.method("gui_file_finder_update_callback")
 
+
+    opt = { :title => "Fuzzy filename search",
+            :desc => "Search for files in folders defined in cnf.search_dirs" ,
+            :columns => [{:title=>'Filename',:id=>0}]
+            }
+                             
     gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                             # "gui_file_finder_select_callback",
                              select_callback,
-                             update_callback)
+                             update_callback, opt)
   end
 
   def gui_file_finder_update_callback(search_str = "")
@@ -105,8 +111,11 @@ class FileFinder
     if (search_str.size >= 3)
       files = filter_files(search_str)
       @file_search_list = files
+      if files.size > 1
+        files = files.collect{|x|[tilde_path(x[0])]}
+      end
+
       return files
-      #debug files.inspect
       #return files.values
     end
     return []

data/lib/vimamsa/file_manager.rb

@@ -18,7 +18,7 @@ class FileManager
   end
 
   def self.init()
-    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp); }, "File selector")
+    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp) }, "File selector")
 
     reg_act(:fexp_chdir_parent, proc { FileManager.chdir_parent }, "File selector")
     reg_act(:fexp_select, proc { buf.module.select_line }, "")
@@ -162,13 +162,14 @@ class FileManager
     #TODO:
   end
 
+  # Main inteface, show contents of current dir
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
 
     debug "last file: #{vma.buffers.last_file}", 2
     lastf = vma.buffers.last_file
     jumpto = nil
-    if File.dirname(lastf) == dirpath
+    if !lastf.nil? and File.dirname(lastf) == dirpath
       jumpto = File.basename(lastf)
     end
     vma.buffers.last_dir = dirpath
@@ -231,6 +232,13 @@ class FileManager
     else
       @buf.set_line_and_column_pos(@header.size, 0)
     end
+
+    if @cdirs.size > 0
+      r = vma.buf.line_range(2, @cdirs.size+1)
+      
+      # Hilight works only if done after buffer is drawn
+      run_as_idle proc { Gui.hilight_range(vma.buf, r, color: "#4488ffff") }
+    end
   end
 
   def fullp(fn)
@@ -267,7 +275,6 @@ class FileManager
       jump_to_file(fn)
       # vma.buffers.set_current_buffer(idx)
       vma.buffers.close_other_buffer(@buf.id)
-
     else
       open_with_default_program(fn)
     end

data/lib/vimamsa/gui.rb

@@ -348,7 +348,7 @@ class VMAgui
     sw.set_child(view)
   end
 
-    #TODO: implement in gtk4
+  #TODO: implement in gtk4
   def init_header_bar()
     header = Gtk::HeaderBar.new
     @header = header
@@ -577,17 +577,36 @@ class VMAgui
 
       reset_controllers
 
+      focus_controller = Gtk::EventControllerFocus.new
+
+      focus_controller.signal_connect("enter") do
+        debug "Gained focus"
+        draw_cursor_bug_workaround
+      end
+      @window.add_controller(focus_controller)
+
+      motion_controller = Gtk::EventControllerMotion.new
+      motion_controller.signal_connect("motion") do |controller, x, y|
+        # label.set_text("Mouse at: (%.1f, %.1f)" % [x, y])
+        # puts "MOVE #{x} #{y}"
+        
+        # Cursor vanishes when hovering over menubar
+        draw_cursor_bug_workaround if y < 30 
+        @last_cursor = [x, y]
+        @cursor_move_time = Time.now
+      end
+      @window.add_controller(motion_controller)
+
       @windows[1] = new_window(1)
 
       @last_adj_time = Time.now
 
-
       # 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.append(@subtitle)
@@ -618,6 +637,12 @@ class VMAgui
 
       @window.show
 
+      surface = @window.native.surface
+      tt = Time.now
+      surface.signal_connect("layout") do
+        # puts "Window resized or moved, other redraw."
+      end
+
       run_as_idle proc { idle_set_size }
 
       prov = Gtk::CssProvider.new
@@ -666,9 +691,9 @@ class VMAgui
     return true if Time.now - @monitor_time < 0.2
     # Detect element resize
     if swa.width != @sw_width
-      # puts "@sw.width=#{@sw.width}"
+      debug "Width change sw_width #{@sw_width}"
       @sw_width = swa.width
-      DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { vma.gui.scale_all_images })
+      DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { debug ":scale_images"; vma.gui.scale_all_images })
     end
     @monitor_time = Time.now
     return true

data/lib/vimamsa/gui_sourceview.rb

@@ -1,16 +1,7 @@
 # class VSourceView < Gtk::TextView
 class VSourceView < GtkSource::View
   attr_accessor :bufo, :autocp_active, :cpl_list
-  # :highlight_matching_brackets
 
-  # def set_highlight_current_line(vbool)
-  # end
-
-  # def set_show_line_numbers(vbool)
-  # end
-
-  # def highlight_matching_brackets=(vbool)
-  # end
 
   # def initialize(title = nil,bufo=nil)
   def initialize(title, bufo)
@@ -27,29 +18,6 @@ class VSourceView < GtkSource::View
 
     @tt = nil
 
-    #    self.drag_dest_add_image_targets #TODO:gtk4
-    #    self.drag_dest_add_uri_targets #TODO:gtk4
-
-    #    signal_connect("drag-data-received") do |widget, event, x, y, data, info, time| #TODO:gtk4
-    # puts "drag-data-received"
-    # puts
-    # if data.uris.size >= 1
-
-    # imgpath = CGI.unescape(data.uris[0])
-    # m = imgpath.match(/^file:\/\/(.*)/)
-    # if m
-    # fp = m[1]
-    # handle_drag_and_drop(fp)
-    # end
-    # end
-    # 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 (vma.actions.last_action == "page_up" or vma.actions.last_action == "page_down")
@@ -70,7 +38,6 @@ class VSourceView < GtkSource::View
 
     return
 
-    #TODO:gtk4
     signal_connect "button-release-event" do |widget, event|
       vma.buf.set_pos(buffer.cursor_position)
       false
@@ -104,9 +71,18 @@ class VSourceView < GtkSource::View
       # Sometimes a GestureClick EventController appears from somewhere
       # not initiated from this file.
 
-      # if ctr.class == Gtk::EventControllerKey or ctr.class == Gtk::GestureClick
-      if ctr != @click
-        # to_remove << ctr if ctr.class != Gtk::GestureDrag
+      # TODO: Check which of these are needed:
+      # puts ctr.class
+      # Gtk::DropTarget
+      # Gtk::EventControllerFocus
+      # Gtk::EventControllerKey
+      # Gtk::EventControllerMotion
+      # Gtk::EventControllerScroll
+      # Gtk::GestureClick
+      # Gtk::GestureDrag
+      # Gtk::ShortcutController
+
+      if ![@click, @dt].include?(ctr) and [Gtk::DropControllerMotion, Gtk::DropTarget, Gtk::GestureDrag, Gtk::GestureClick, Gtk::EventControllerKey].include?(ctr.class)
         to_remove << ctr
       end
     }
@@ -120,20 +96,19 @@ class VSourceView < GtkSource::View
   end
 
   def focus_out()
-      set_cursor_color(:inactive)
-      
-      # This does not seem to work: (TODO:why?)
-      # self.cursor_visible = false
+    set_cursor_color(:inactive)
+
+    # This does not seem to work: (TODO:why?)
+    # self.cursor_visible = false
   end
-  
+
   def focus_in()
-      set_cursor_color(@ctype)
-      self.cursor_visible = false
-      self.cursor_visible = true
-      self.grab_focus
+    set_cursor_color(@ctype)
+    self.cursor_visible = false
+    self.cursor_visible = true
+    self.grab_focus
   end
- 
-  
+
   def register_signals()
     check_controllers
 
@@ -149,11 +124,8 @@ class VSourceView < GtkSource::View
         uri = v.value.gsub(/\r\n$/, "")
       end
       debug "dt,drop #{v.value},#{x},#{y}", 2
-      begin
-        fp = URI(uri).path
-        buf.handle_drag_and_drop(fp)
-      rescue URI::InvalidURIError
-      end
+      fp = uri_to_path(uri)
+      buf.handle_drag_and_drop(fp) if !fp.nil?
       true
     end
 
@@ -332,7 +304,7 @@ class VSourceView < GtkSource::View
     end
     debug $view.visible_rect.inspect
 
-    debug "key event"
+    debug "key event" + [keyval, @last_keyval, keyname, sig].to_s
     # debug event
 
     # key_name = event.string
@@ -353,6 +325,7 @@ class VSourceView < GtkSource::View
     keyval_trans[Gdk::Keyval::KEY_KP_Enter] = "enter"
     keyval_trans[Gdk::Keyval::KEY_Alt_L] = "alt"
     keyval_trans[Gdk::Keyval::KEY_Alt_R] = "alt"
+    keyval_trans[Gdk::Keyval::KEY_Caps_Lock] = "caps"
 
     keyval_trans[Gdk::Keyval::KEY_BackSpace] = "backspace"
     keyval_trans[Gdk::Keyval::KEY_KP_Page_Down] = "pagedown"
@@ -383,6 +356,15 @@ class VSourceView < GtkSource::View
     key_str_parts << "super" if vma.kbd.modifiers[:super]
     key_str_parts << keyname
 
+    # After remapping capslock to control in gnome-tweak tool,
+    # if pressing and immediately releasing the capslock (control) key,
+    # we get first "caps" on keydown and ctrl-"caps" on keyup (keyval 65509, Gdk::Keyval::KEY_Caps_Lock)
+    # If mapping capslock to ctrl in hardware, we get keyval 65507 (Gdk::Keyval::KEY_Control_L) instead
+    if key_str_parts[0] == "ctrl" and key_str_parts[1] == "caps"
+      # Replace ctrl-caps with ctrl
+      key_str_parts.delete_at(1)
+    end
+
     if key_str_parts[0] == key_str_parts[1]
       # We don't want "ctrl-ctrl" or "alt-alt"
       # TODO:There should be a better way to do this
@@ -404,19 +386,19 @@ class VSourceView < GtkSource::View
 
     keynfo = { :key_str => key_str, :key_name => keyname, :keyval => keyval }
     debug keynfo.inspect
-    # $kbd.match_key_conf(key_str, nil, :key_press)
+    # vma.kbd.match_key_conf(key_str, nil, :key_press)
     # debug "key_str=#{key_str} key_"
 
     if key_str != "" # or prefixed_key_str != ""
       if sig == :key_release and keyval == @last_keyval
-        $kbd.match_key_conf(key_str + "!", nil, :key_release)
+        vma.kbd.match_key_conf(key_str + "!", nil, :key_release)
         @last_event = [keynfo, :key_release]
       elsif sig == :key_press
-        $kbd.match_key_conf(key_str, nil, :key_press)
+        vma.kbd.match_key_conf(key_str, nil, :key_press)
         @last_event = [keynfo, key_str, :key_press]
       end
-      @last_keyval = keyval #TODO: outside if?
     end
+    @last_keyval = keyval
 
     handle_deltas
 
@@ -596,7 +578,6 @@ class VSourceView < GtkSource::View
   end
 
   def draw_cursor
-
     sv = vma.gui.active_window[:sw].child
     return if sv.nil?
     if sv != self # if we are not the current buffer
@@ -652,3 +633,4 @@ class VSourceView < GtkSource::View
     end
   end #end draw_cursor
 end
+