vimamsa 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b635655f9d50eb870f5593b8d2e63cfacff5ed0aece9b197ca8805622799ab0
-  data.tar.gz: 8c579b33d9d5e5d48c25fef3da47ca77eb9ba9bf713cf7c2895c1af5e2cf2d30
+  metadata.gz: 4b44f279b048a7cd7baba9e21e70dc9666a251f9608466f9e4bd38094c486738
+  data.tar.gz: ef57b1ad00c480d30720ec8d272df38ec289640c7951b8a04a070837e43a261a
 SHA512:
-  metadata.gz: 1027546a7e21d7832e546f4ccd7eb9064aece5b7c13bef4d83477082351b2cc74e136c952999c69de70581aa651af2a5e8fd14960a1b52c91a0d0a7d08bd530c
-  data.tar.gz: 3784552302bd4f7541320785f250fe9c4aa36e6bcd7d1317f9f85b776900211a1f7d5644891de6ae224703dca6ce9c0eda12fc894d1d4f73523e6bd149b6aebf
+  metadata.gz: 756f7c861bff64427fac5e397f8e0b4d539f46dd9d72edf39ddbc190eefff09cb86c0107ec38664ee9a1c450c2de9912f6960aee7c990c8b99c4c914cf0f5a56
+  data.tar.gz: 15a6b06c01f13435a154a2b64c544e8d5b14f253bed3e4b65e845dc510f591fcd77c1e9c278d4cf7b67699205c97952ad6ab8042fffe222260d972b88db42bee

data/README.md

@@ -1,7 +1,18 @@
 # 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+
@@ -144,6 +155,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/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_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)

data/lib/vimamsa/editor.rb

@@ -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)
@@ -645,7 +645,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/gui_sourceview.rb

@@ -104,9 +104,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 ctr != @click and [Gtk::DropControllerMotion, Gtk::DropTarget, Gtk::GestureDrag, Gtk::GestureClick, Gtk::EventControllerKey].include?(ctr.class)
         to_remove << ctr
       end
     }
@@ -120,20 +129,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
 
@@ -332,7 +340,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 +361,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 +392,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
@@ -415,8 +433,8 @@ class VSourceView < GtkSource::View
         $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 +614,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

data/lib/vimamsa/key_actions.rb

@@ -33,6 +33,8 @@ reg_act(:command_to_buf, proc { command_to_buf }, "Execute command, output to bu
 reg_act(:lsp_debug, proc { vma.buf.lsp_get_def }, "LSP get definition")
 reg_act(:lsp_jump_to_definition, proc { vma.buf.lsp_jump_to_def }, "LSP jump to definition")
 
+reg_act(:eval_buf, proc { vma.buf.eval_whole_buf }, "Eval whole current buffer as ruby code (DANGEROUS)")
+
 reg_act(:enable_debug, proc { cnf.debug = true }, "Enable debug")
 reg_act(:disable_debug, proc { cnf.debug = false }, "Disable debug")
 

data/lib/vimamsa/key_binding_tree.rb

@@ -632,11 +632,12 @@ end
 
 # Try to clear modifiers when program loses focus
 # e.g. after alt-tab
-def focus_out
-  debug "RB Clear modifiers"
-  $kbd.clear_modifiers()
-end
-
-def handle_key_event(event)
-  $kbd.handle_key_event(event)
-end
+# TODO
+# def focus_out
+  # debug "RB Clear modifiers"
+  # $kbd.clear_modifiers()
+# end
+
+# def handle_key_event(event)
+  # $kbd.handle_key_event(event)
+# end

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -127,6 +127,7 @@ bindkey "C p", [:paste_after, proc { buf.paste(AFTER) }, ""] # TODO: implement a
 bindkey "V d", [:delete_selection, proc { buf.delete(SELECTION) }, ""]
 bindkey "V a d", [:delete_append_selection, proc { buf.delete(SELECTION, :append) }, "Delete and append selection"]
 
+
 default_keys = {
 
   # File handling
@@ -266,6 +267,7 @@ default_keys = {
   "C d <num> e" => "delete_next_word",
   "C d ' <char>" => "buf.delete2(:to_mark,<char>)",
   "C r <char>" => "buf.replace_with_char(<char>)", # TODO
+  "C r space" => "buf.replace_with_char(' ')", # TODO
   "C , l b" => "load_buffer_list",
   "C , l l" => "save_buffer_list",
   "C , r <char>" => "vma.set_register(<char>)", # TODO
@@ -331,7 +333,7 @@ default_keys = {
   "CV ctrl-q" => :quit,
   "CV , R" => "restart_application",
   # "I ctrl!" => "vma.kbd.to_previous_mode",
-  "C shift!" => "buf.save",
+  "C shift! s" => "buf.save",
   "I ctrl-s" => "buf.save",
   "I <char>" => "buf.insert_txt(<char>)",
   "I esc || I ctrl!" => "vma.kbd.to_previous_mode",

data/lib/vimamsa/macro.rb

@@ -118,8 +118,10 @@ class Macro
 
   # Run the provided list of actions
   def run_actions(acts)
+    acts = [acts] if acts.class != Array
     isok = true
-    if acts.kind_of?(Array) and acts.any?
+    # if acts.kind_of?(Array) and acts.any?
+    if acts.any?
       @running_macro = true
       # TODO:needed?
       # set_last_command({ method: vma.macro.method("run_macro"), params: [name] })

data/lib/vimamsa/tests.rb

@@ -1,7 +1,19 @@
 require "digest"
 
 def run_tests()
-  tests = ["test_paste_0", "test_delete_0"]
+  # DelayExecutioner.exec(id: :run_tests, wait: 0.7, callable: proc { run_tests_0 })
+
+  # Reload class
+  # if Object.constants.include?(:EditorTests)
+  # Object.send(:remove_const, :EditorTests)
+  # end
+  load __FILE__
+
+  run_edit_tests
+end
+
+def run_tests_0()
+  tests = ["test_write_0"]
   stats = []
   for t in tests
     r = eval(t)
@@ -16,7 +28,74 @@ def run_tests()
   puts "===================="
 end
 
-#
+def run_edit_tests()
+  edt = EditorTests.new
+  tests = edt.methods.select { |x| x.match(/test_.*/) }.collect { |x| { :method => edt.method(x), :name => x } }
+  for t in tests
+    b = create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
+
+    edits = t[:method].call
+    # next if t[:name] != :test_create_close_buf
+    errors = 0
+    edits.each_with_index do |x, i|
+      if x.class == Array
+        (act, target) = x
+        
+        vma.macro.run_actions(act)
+        # bufc = b.to_s
+        bufc = vma.buf.to_s
+        if bufc != target
+          puts "ERROR[#{t[:name]}:#{i}] act=#{act.inspect} content=#{bufc.inspect} != #{target.inspect}"
+          errors += 1
+        end
+      else
+        vma.macro.run_actions(x)
+      end
+    end
+    if errors == 0
+      puts "TEST #{t[:name]} passed"
+    else
+    end
+  end
+end
+
+class EditorTests
+  def test_write
+    #[[action to run, expected buffer contents after], ...]
+    [['buf.insert_txt("zzzz")', "zzzz\n"],
+     # At end of file replace should not change anything
+     ['buf.replace_with_char("-")', "zzzz\n"],
+     'buf.insert_txt("\n")',
+     ['buf.insert_txt("yy")', "zzzz\nyy\n"],
+     :e_move_backward_char, :e_move_backward_char,
+     ['buf.insert_txt("0")', "zzzz\n0yy\n"],
+     "buf.jump(START_OF_BUFFER)",
+     ['buf.replace_with_char("1")', "1zzz\n0yy\n"]]
+  end
+
+  def test_delete
+    [['buf.insert_txt("abcdef")', "abcdef\n"],
+     'buf.insert_txt("\n")',
+     ['buf.insert_txt("yy")', "abcdef\nyy\n"],
+     "buf.jump(START_OF_BUFFER)",
+     :delete_char_forward,
+     [:delete_char_forward, "cdef\nyy\n"],
+     "buf.jump(END_OF_LINE)",
+     "buf.delete(BACKWARD_CHAR)",
+     ["buf.delete(BACKWARD_CHAR)", "cd\nyy\n"]]
+  end
+
+  def test_create_close_buf
+    ['buf.insert_txt("abcdef")',
+     [:buf_new,"\n"],
+     'buf.insert_txt("a")',
+     'buf.insert_txt("b")',
+     'buf.insert_txt("c")',
+     'buf.insert_txt("d")',
+     ['buf.insert_txt("e")',"abcde\n"],
+     [:close_current_buffer, "abcdef\n"]]
+  end
+end
 
 def test_paste_0(runmacro = true)
   return

data/lib/vimamsa/text_transforms.rb

@@ -19,6 +19,8 @@ end
 Converter.new(lambda { |x| x.split("\n").collect { |x| r = x.strip }.select { |y| !y.empty? }.join(" ") + "\n" }, :lambda, :joinlines)
 
 Converter.new(lambda { |x| x.split("\n").sort.join("\n") }, :lambda, :sortlines)
+Converter.new(lambda { |x| x.split("\n").reverse.join("\n") }, :lambda, :reverse_lines)
+
 Converter.new(lambda { |x| x.split(/\s+/).sort.join(" ") }, :lambda, :sortwords)
 Converter.new(lambda { |x| x.split("\n").collect { |b| b.scan(/(\d+(\.\d+)?)/).collect { |c| c[0] }.join(" ") }.join("\n") }, :lambda, :getnums_on_lines)
 

data/lib/vimamsa/util.rb

@@ -93,7 +93,7 @@ end
 
 # file --mime-type --mime-encoding
 
-# Run idle proc once
+# Run idle proc once (return false)
 # Delay execution of proc until Gtk has fully processed the last calls.
 def run_as_idle(p, delay: 0.0)
   if p.class == Proc
@@ -141,6 +141,24 @@ def exec_cmd(bin_name, arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil, arg5 = ni
   return ret_str
 end
 
+def pipe_to_external(program, text)
+  # Open a pipe to the external program
+  IO.popen(program, "r+") do |pipe|
+    # Send the text to the program
+    pipe.write(text)
+    pipe.close_write # Close the write end to signal EOF to the program
+    # Read and return the output from the program
+    output = pipe.read
+    return output
+  end
+rescue Errno::ENOENT
+  puts "Error: The program '#{program}' was not found."
+  nil
+rescue => e
+  puts "An error occurred: #{e.message}"
+  nil
+end
+
 def mkdir_if_not_exists(_dirpath)
   dirpath = File.expand_path(_dirpath)
   Dir.mkdir(dirpath) unless File.exist?(dirpath)

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end

data/vimamsa.gemspec

@@ -5,7 +5,7 @@ require "vimamsa/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "vimamsa"
-  spec.version       = Vimamsa::VERSION
+  spec.version       = Vimamsa::VERSION # in lib/vimamsa/version.rb
   spec.authors       = ["Sami Sieranoja"]
   spec.email         = ["sami.sieranoja@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Sami Sieranoja
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -295,7 +295,7 @@ homepage: https://github.com/SamiSieranoja/vimamsa
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,8 +311,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Vimamsa
 test_files: []