vimamsa 0.1.16 → 0.1.18

data/lib/vimamsa/key_binding_tree.rb

@@ -67,6 +67,7 @@ class KeyBindingTree
   end
 
   def set_mode(label)
+    return if get_mode == :label
     @match_state = [@modes[label]] # used for matching input
     @mode_root_state = @modes[label]
     # @default_mode = label
@@ -290,8 +291,8 @@ class KeyBindingTree
       else
         method_desc = t.action
         if t.action.class == Symbol
-          if !$actions[t.action].nil?
-            a = $actions[t.action].method_name
+          if vma.actions.include?(t.action)
+            a = vma.actions[t.action].method_name
             if !a.nil? and !a.empty?
               method_desc = a
             end
@@ -477,7 +478,7 @@ class KeyBindingTree
     # return
     # end
     # $action_list << { :action => action, :key => key }
-    if !$actions.has_key?(action)
+    if !vma.actions.include?(action)
       if action.class == String
         reg_act(action, proc { eval(action) }, action)
       end
@@ -566,7 +567,7 @@ class KeyBindingTree
   end
 
   def handle_key_bindigs_action(action, c)
-    $acth << action
+    # $acth << action #TODO:needed here?
     @method_handles_repeat = false #TODO:??
     n = 1
     if @next_command_count and !(action.class == String and action.include?("set_next_command_count"))
@@ -619,8 +620,6 @@ def bindkey(key, action)
   $kbd.bindkey(key, action)
 end
 
-$action_list = []
-
 def exec_action(action)
   $kbd.last_action = $kbd.cur_action
   $kbd.cur_action = action

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -17,11 +17,32 @@ cnf.mode.default.cursor.background = "#03fcca"
 cnf.mode.visual.cursor.background = "#bc6040"
 cnf.mode.replace.cursor.background = "#fc0331"
 cnf.mode.browse.cursor.background = "#f803fc"
-# vma.kbd.show_state_trail
+cnf.mode.insert.cursor.background = "#ffffff"
+
+def _insert_move(op)
+  if op == :pagedown
+    vma.gui.page_down
+  elsif op == :pageup
+    vma.gui.page_up
+  else
+    buf.move(op)
+  end
+end
+
+def insert_select_move(op)
+  buf.continue_selection
+  _insert_move(op)
+end
+
+def insert_move(op)
+  buf.end_selection
+  _insert_move(op)
+end
 
 bindkey ["VCB M", "B m"], :run_last_macro
 
 bindkey "VC s", :easy_jump
+bindkey "I alt-s", :easy_jump
 bindkey "VC , m f", [:find_macro_gui, proc { vma.macro.find_macro_gui }, "Find named macro"]
 bindkey "C , m n", [:gui_name_macro, proc { vma.macro.gui_name_macro }, "Name last macro"]
 bindkey "C , j r", :jump_to_random
@@ -86,8 +107,8 @@ bindkey "B z", "center_on_current_line();call_action(:exit_browse_mode)"
 bindkey "B enter || B return || B esc || B j || B ctrl!", :exit_browse_mode
 bindkey "B s", :page_up
 bindkey "B d", :page_down
-bindkey "B r", proc { vma.gui.page_down(multip:0.25)}
-bindkey "B e", proc { vma.gui.page_up(multip:0.25)}
+bindkey "B r", proc { vma.gui.page_down(multip: 0.25) }
+bindkey "B e", proc { vma.gui.page_up(multip: 0.25) }
 
 bindkey "B i", :jump_to_start_of_buffer
 bindkey "B o", :jump_to_end_of_buffer
@@ -128,24 +149,41 @@ default_keys = {
   # "VC j" => "buf.move(FORWARD_LINE)",
   # "VC k" => "buf.move(BACKWARD_LINE)",
 
-  "VC pagedown" => :page_down,
-  "VC pageup" => :page_up,
+  "VCI pagedown" => :page_down,
+  "VCI pageup" => :page_up,
 
   "I down(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_next",
   "I tab(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_next",
   "I up(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_previous",
   "I shift-tab(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_previous",
   "I enter(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select",
-  
-  "I tab" => 'buf.insert_tab',
-  "I shift-tab" => 'buf.unindent',
-  
+
+  "I tab" => "buf.insert_tab",
+  "I shift-tab" => "buf.unindent",
+
   "I enter" => :insert_new_line,
 
-  "VCIX left" => "buf.move(BACKWARD_CHAR)",
-  "VCIX right" => "buf.move(FORWARD_CHAR)",
-  "VCIX down" => "buf.move(FORWARD_LINE)",
-  "VCIX up" => "buf.move(BACKWARD_LINE)",
+  "I shift-down" => "insert_select_move(BACKWARD_CHAR)",
+  "I shift-right" => "insert_select_move(FORWARD_CHAR)",
+  "I shift-down" => "insert_select_move(FORWARD_LINE)",
+  "I shift-up" => "insert_select_move(BACKWARD_LINE)",
+  "I shift-pagedown" => "insert_select_move(:pagedown)",
+  "I shift-pageup" => "insert_select_move(:pageup)",
+
+  "I left" => "insert_move(BACKWARD_CHAR)",
+  "I right" => "insert_move(FORWARD_CHAR)",
+  "I down" => "insert_move(FORWARD_LINE)",
+  "I up" => "insert_move(BACKWARD_LINE)",
+  "I pagedown" => "insert_move(:pagedown)",
+  "I pageup" => "insert_move(:pageup)",
+
+  #TODO:
+  "I @shift-click" => "insert_mode_shift_click(charpos)",
+
+  "VCX left" => "buf.move(BACKWARD_CHAR)",
+  "VCX right" => "buf.move(FORWARD_CHAR)",
+  "VCX down" => "buf.move(FORWARD_LINE)",
+  "VCX up" => "buf.move(BACKWARD_LINE)",
 
   "VC w" => "buf.jump_word(FORWARD,WORD_START)",
   "VC b" => "buf.jump_word(BACKWARD,WORD_START)",
@@ -192,7 +230,7 @@ default_keys = {
   "C , d c" => "debug_dump_clipboard",
   "C , d d" => "debug_dump_deltas",
   "C , d m" => :kbd_dump_state,
-  
+
   "VC O" => "buf.jump(END_OF_LINE)",
   "VC $" => "buf.jump(END_OF_LINE)",
 
@@ -209,7 +247,7 @@ default_keys = {
 
   # Command mode only:
   "C ctrl-r" => "buf.redo()", # TODO:???
-  "C v" => "buf.start_visual_mode",
+  "C v" => "buf.start_selection;vma.kbd.set_mode(:visual)",
   "C P" => "buf.paste(BEFORE)", # TODO: implement as replace for visual mode
   "C space <char>" => "buf.insert_txt(<char>)",
   "C space space" => "buf.insert_txt(' ')",
@@ -269,7 +307,7 @@ default_keys = {
   "C i" => "vma.kbd.set_mode(:insert)",
   "C R" => "vma.kbd.set_mode(:replace)",
   "C ctrl!" => "vma.kbd.set_mode(:insert)",
-  
+
   # Replace mode
   "X esc || X ctrl!" => "vma.kbd.to_previous_mode",
   "X <char>" => "buf.replace_with_char(<char>);buf.move(FORWARD_CHAR)",
@@ -295,6 +333,7 @@ default_keys = {
   "CV , R" => "restart_application",
   # "I ctrl!" => "vma.kbd.to_previous_mode",
   "C shift!" => "buf.save",
+  "I ctrl-s" => "buf.save",
   "I <char>" => "buf.insert_txt(<char>)",
   "I esc || I ctrl!" => "vma.kbd.to_previous_mode",
 
@@ -312,7 +351,6 @@ default_keys = {
 
   "I ctrl-h" => :show_autocomplete,
   "I ctrl-j" => "vma.buf.view.hide_completions",
-  
 
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
@@ -320,7 +358,6 @@ default_keys = {
 
 bindkey "C , i p", "generate_password_to_buf(15)"
 
-
 default_keys.each { |key, value|
   bindkey(key, value)
 }

data/lib/vimamsa/langservp.rb

@@ -176,7 +176,9 @@ class LangSrv
   def open_file(fp, fc = nil)
     debug "open_file", 2
     fc = IO.read(fp) if fc.nil?
-    fpuri = URI.join("file:///", fp).to_s
+
+    encoded_filepath = URI.encode_www_form_component(fp)
+    fpuri = URI.parse("file://#{encoded_filepath}")
 
     a = LSP::Interface::DidOpenTextDocumentParams.new(
       text_document: LSP::Interface::TextDocumentItem.new(

data/lib/vimamsa/macro.rb

@@ -127,9 +127,12 @@ class Macro
         ret = exec_action(a)
         if ret == false
           error "Error while running macro"
-          isok=false
+          isok = false
           break
         end
+
+        vma.buf.view.after_action
+        sleep cnf.macro.animation_delay!
       end
     end
     @running_macro = false

data/lib/vimamsa/rbvma.rb

@@ -1,3 +1,5 @@
+
+# require "bundler/setup"
 require "date"
 require "fileutils"
 
@@ -18,9 +20,7 @@ require "vimamsa/util"
 require "vimamsa/main"
 require "vimamsa/terminal"
 
-require "vimamsa/actions"
 require "vimamsa/key_binding_tree"
-require "vimamsa/key_actions"
 
 require "vimamsa/clipboard"
 

data/lib/vimamsa/tests.rb

@@ -1,26 +1,26 @@
 require "digest"
 
 def run_tests()
-  tests = ["test_paste_0","test_delete_0"]
+  tests = ["test_paste_0", "test_delete_0"]
   stats = []
   for t in tests
     r = eval(t)
     if r == true
       stats << "test #{t} OK"
     else
-      stats <<  "test #{t} FAILED"
+      stats << "test #{t} FAILED"
     end
   end
-  debug "TEST RESULTS:",2
+  debug "TEST RESULTS:", 2
   puts stats.join("\n")
   puts "===================="
-  
 end
 
-
 #
 
 def test_paste_0(runmacro = true)
+  return
+  #TODO: update macro
   b = create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
 
   b.insert_txt(JABBERWOCKY)
@@ -47,7 +47,7 @@ def test_paste_0(runmacro = true)
   end
 end
 
-def macro_test(macro, correct_hex, runmacro=true)
+def macro_test(macro, correct_hex, runmacro = true)
   b = create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
   b.insert_txt(JABBERWOCKY)
   b.insert_txt(LOREM_IPSUM)
@@ -117,6 +117,3 @@ O frabjous day! Callooh! Callay!”
 All mimsy were the borogoves,
       And the mome raths outgrabe.
 "
-
-
-

data/lib/vimamsa/util.rb

@@ -3,11 +3,31 @@ require "open3"
 VOWELS = %w(a e i o u)
 CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x y z)
 
+def running_wayland?
+  sess = ENV["DESKTOP_SESSION"]
+  sess ||= ENV["XDG_SESSION_DESKTOP"]
+  sess ||= ENV["GDMSESSION"]
+  sess ||= ""
+  if sess.match(/wayland/)
+    return true
+  else
+    return false
+  end
+end
+
 def tilde_path(abspath)
   userhome = File.expand_path("~/")
   abspath.sub(/^#{Regexp.escape(userhome)}\//, "~/")
 end
 
+def to_camel_case(str)
+  words = str.split(/\W+/) # Split the input string into words
+  camel_case_words = words.map.with_index do |word, index|
+    index == 0 ? word.downcase : word.capitalize
+  end
+  camel_case_words.join
+end
+
 def generate_password(length)
   password = ""
   while password.size < length
@@ -38,13 +58,16 @@ end
 
 def file_mime_type(fpath)
   fpath = File.expand_path(fpath)
-  return false if !File.readable?(fpath)
+  return nil if !File.readable?(fpath)
   r = exec_cmd("file", "--mime-type", "--mime-encoding", fpath)
-  return false if r.class != String
-  return false if r.size < 2
+  return nil if r.class != String
+  return nil if r.size < 2
   m = r.match(".*:\s*(.*)")
-  mimetype = m[1].match(/(.*);/)
-  charset = m[1].match(/charset=(.*)/)
+  b = m[1].match(/(.*);/)
+  c = m[1].match(/charset=(.*)/)
+  return nil if b.nil? or c.nil?
+  mimetype = b[1]
+  charset = c[1]
   return [mimetype, charset]
 end
 
@@ -177,6 +200,17 @@ end
 # Used for image scaling after window resize
 
 class DelayExecutioner
+
+  # Run 'callable.call' if 'wait' time elapsed from last exec call for this id
+  def self.exec(id:, wait:, callable:)
+    @@h ||= {}
+    h = @@h
+    if h[id].nil?
+      h[id] = DelayExecutioner.new(wait, callable)
+    end
+    h[id].run
+  end
+
   def initialize(wait_time, _proc)
     @wait_time = wait_time
     @proc = _proc
@@ -198,7 +232,10 @@ class DelayExecutioner
   end
 
   def run()
+    # Reset @lastt to further delay execution until @wait_time from now
     @lastt = Time.now
+
+    # If already executed after last call to run()
     if @thread_running == false
       @thread_running = true
       start_thread
@@ -291,17 +328,22 @@ end
 
 def is_image_file(fpath)
   return false if !File.exist?(fpath)
-  return false if !fpath.match(/.(jpg|jpeg|png)$/i)
-  #TODO: check contents of file
-  return true
+  # return false if !fpath.match(/.(jpg|jpeg|png)$/i)
+  mime = file_mime_type(fpath)
+  if !mime.nil?
+    if mime[0].match(/image\//)
+      return true
+    end
+  end
+  return false
 end
 
-def is_text_file(fpath)
-  return false if !File.exist?(fpath)
-  return false if !fpath.match(/.(txt|cpp|h|rb|c|php|java|py)$/i)
-  #TODO: check contents of file
-  return true
-end
+# def is_text_file(fpath)
+# return false if !File.exist?(fpath)
+# return false if !fpath.match(/.(txt|cpp|h|rb|c|php|java|py)$/i)
+# #TODO: check contents of file
+# return true
+# end
 
 def is_path(s)
   m = s.match(/(~[a-z]*)?\/.*\//)

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.16"
+  VERSION = "0.1.18"
 end

data/vimamsa.gemspec

@@ -27,16 +27,16 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency 'ripl', '~> 0.7.1'
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
-  spec.add_runtime_dependency 'gdk4', '~> 4.2.0'
-  spec.add_runtime_dependency 'gtk4', '~> 4.2.0'
+  spec.add_runtime_dependency 'gdk4', '~> 4.2.1'
+  spec.add_runtime_dependency 'gtk4', '~> 4.2.1'
+  spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.1'
+  spec.add_runtime_dependency 'gstreamer', '~> 4.2.1'
   spec.add_runtime_dependency 'rambling-trie', '~> 2.3.1'
   
   spec.add_runtime_dependency 'differ', '~>  0.1.2'
-  spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.0'
   spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?
   spec.add_runtime_dependency 'listen', '~> 3.4'  #TODO: update?
   spec.add_runtime_dependency 'language_server-protocol', '~> 3.17.0.3'
-  spec.add_runtime_dependency 'gstreamer', '~> 4.2.0'
 
   spec.extensions = ["ext/vmaext/extconf.rb"]
   spec.licenses    = ['GPL-3.0+']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,126 +86,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: gtk4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: rambling-trie
+  name: gtksourceview5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: differ
+  name: gstreamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: gtksourceview5
+  name: rambling-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: language_server-protocol
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0.3
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0.3
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: gstreamer
+  name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 3.17.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 3.17.0.3
 description: Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby
   and GTK.
 email: