vimamsa 0.1.21 → 0.1.23

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -4,6 +4,7 @@ vma.kbd.add_mode("V", :visual, :visual)
 vma.kbd.add_mode("M", :minibuffer) #TODO: needed?
 vma.kbd.add_mode("R", :readchar)
 vma.kbd.add_minor_mode("audio", :audio, :command)
+vma.kbd.add_minor_mode("macro", :macro, :command)
 vma.kbd.add_mode("B", :browse, :browse, scope: :editor)
 vma.kbd.add_mode("X", :replace, :replace, name: "Replace")
 vma.kbd.set_default_mode(:command)
@@ -40,114 +41,80 @@ def insert_move(op)
   _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
-bindkey "C , ; s k", :show_key_bindings #TODO: better binding
-bindkey "C , , c b", :put_file_path_to_clipboard #TODO: better binding or remove?
-bindkey "C , , e", :encrypt_file #TODO: better binding
-bindkey "C , ; u", :set_unencrypted #TODO: better binding
-bindkey "C , c b", :close_current_buffer
-bindkey "V ctrl-c", :comment_selection
-bindkey "C x", :delete_char_forward
-bindkey "C , , l t", :load_theme
-bindkey "C , f", :gui_file_finder
-bindkey "C , h", :gui_file_history_finder
-bindkey "C , z", :gui_file_finder
-
-bindkey "C ` k", :lsp_debug
-bindkey "C ` j", :lsp_jump_to_definition
-
-bindkey "C , r r", :gui_search_replace
-bindkey "V , r r", :gui_search_replace
-bindkey "V , t b", :set_style_bold
-bindkey "V , t l", :set_style_link
-bindkey "V J", :V_join_lines
-bindkey "V , t c", :clear_formats
-bindkey "C , t h", :set_line_style_heading
-bindkey "C , t 1", :set_line_style_h1
-bindkey "C , t 2", :set_line_style_h2
-bindkey "C , t 3", :set_line_style_h3
-bindkey "C , t 4", :set_line_style_h4
-bindkey "C , t b", :set_line_style_bold
-bindkey "C , t t", :set_line_style_title
-bindkey "C , t c", :clear_line_styles
-bindkey "C , b", :start_buf_manager
-bindkey "C , w", :toggle_active_window
-bindkey "C , , w", :toggle_two_column
-
-bindkey "C , u s", :audio_stop
-bindkey "C , m a", "vma.kbd.set_mode(:audio)"
-bindkey "audio s", :audio_stop
-bindkey "audio f || audio right", [:audio_forward, proc { Audio.seek_forward }, "Seek forward in audio stream"]
-bindkey "audio left", [:audio_backward, proc { Audio.seek_forward(-5.0) }, "Seek backward in audio stream"]
-
-bindkey "audio space", :audio_stop
-bindkey "audio q || audio esc", "vma.kbd.to_previous_mode"
+add_keys "intro", {
+  "VCX up" => "buf.move(BACKWARD_LINE)",
+  "VCX down" => "buf.move(FORWARD_LINE)",
+  "VCX right" => "buf.move(FORWARD_CHAR)",
+  "VCX left" => "buf.move(BACKWARD_CHAR)",
+ "C , b" => :start_buf_manager,
+  "VC l" => "buf.move(FORWARD_CHAR)",
+  "VC , , s" => :search_actions,
+  "C , n b" => :buf_new,
+  "C y y" => :copy_cur_line,
+  "C P" => :paste_before_cursor,
+  "C p" => :paste_after_cursor,
+  "C v" => :start_visual_mode,
+  "C ctrl-r" => :redo,
+  "C u" => :undo,
+  "VC O" => :jump_end_of_line,
+  # NOTE: "G(condition)" need to be defined before "G"
+  "VC G(vma.kbd.next_command_count!=nil)" => "buf.jump_to_line()",
+  "VC G" => :jump_end_of_buffer,
+  "VC g ;" => :jump_last_edit,
+  "VC g g" => :jump_start_of_buffer,
+  "VC e" => :jump_next_word_end,
+  "VC b" => :jump_prev_word_start,
+  "VC w" => :jump_next_word_start,
+  "V esc" => "buf.end_visual_mode",
+  "V ctrl!" => "buf.end_visual_mode", 
+  
+  "C ctrl!" => :insert_mode,
+  "C i" => :insert_mode,
+  "I esc || I ctrl!" => :prev_mode,
+  "IX alt-b" => :jump_prev_word_start,
+  "IX alt-f" => :jump_next_word_start,
+  "IX ctrl-e" => :jump_end_of_line,
+  "IX ctrl-p" => :move_prev_line,
+  "IX ctrl-n" => :move_next_line,
+  "IX ctrl-b" => :move_backward_char,
+  "IX ctrl-a" => :jump_beginning_of_line,
+  
+  "CI ctrl-v" => :paste_before_cursor,
+  "I ctrl-c" => :copy_selection, #TODO: in control mode also?
+  "CI ctrl-x" => :cut_selection,
+  "CI ctrl-z" => :undo,
+  "CI ctrl-w" => :close_current_buffer,
+  "I ctrl-y" => :redo,
+  "CI backspace" => :insert_backspace,
+ "CI ctrl-o" => :open_file_dialog,
+ "I ctrl-l" => :find_in_buffer,
+ "I ctrl-g" => :find_next,
+  
+  "I shift-up" => :insert_select_up,
+  "I shift-down" => :insert_select_down, 
+}
 
-# bindkey "C , f o", :open_file_dialog
-bindkey "CI ctrl-o", :open_file_dialog
-# bindkey "M enter", :minibuffer_end
-bindkey "C , a", :ack_search
-bindkey "C d w", :delete_to_next_word_start
-
-bindkey "C d 0", :delete_to_line_start
-bindkey "C , , f", :file_finder
-bindkey "VC h", :e_move_backward_char
-bindkey "C , , .", :backup_all_buffers
-bindkey "C z ", :start_browse_mode
-bindkey "B h", :history_switch_backwards
-bindkey "B l", :history_switch_forwards
-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 i", :jump_to_start_of_buffer
-bindkey "B o", :jump_to_end_of_buffer
-bindkey "B c", :close_current_buffer
-bindkey "B ;", "buf.jump_to_last_edit"
-bindkey "B q", :jump_to_last_edit
-bindkey "B w", :jump_to_next_edit
-# bindkey "C , d", :diff_buffer
-#bindkey 'C , g', proc{invoke_grep_search}
-bindkey "C , v", :auto_indent_buffer
-bindkey "C , , d", :savedebug
-bindkey "C , , u", :update_file_index
-bindkey "C , s a", :buf_save_as
-bindkey "C d d", [:delete_line, proc { buf.delete_line }, "Delete current line"]
-bindkey "C enter || C return", [:line_action, proc { buf.handle_line_action() }, "Line action"]
-bindkey "C p", [:paste_after, proc { buf.paste(AFTER) }, ""] # TODO: implement as replace for visual mode
-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"]
+add_keys "intro delete", {
+  "C x" => :delete_char_forward,
+  "C d d" => [:delete_line, proc { buf.delete_line }, "Delete current line"]
+}
 
 
-default_keys = {
+add_keys "core", {
 
   # File handling
   "C ctrl-s" => :buf_save,
 
+  "V J" => :V_join_lines,
   # Buffer handling
   # "C B" => "bufs.switch",
   "C tab" => "bufs.switch_to_last_buf",
   #    'C , s'=> 'gui_select_buffer',
   "C , r v b" => :buf_revert,
   "C , c b" => "bufs.close_current_buffer",
-  "C , n b" => :buf_new,
   # "C , , ." => "backup_all_buffers()",
-  "VC , , s" => :search_actions,
 
   # MOVING
-  #    'VC h' => 'buf.move(BACKWARD_CHAR)',
-  "VC l" => "buf.move(FORWARD_CHAR)",
-  # "VC j" => "buf.move(FORWARD_LINE)",
-  # "VC k" => "buf.move(BACKWARD_LINE)",
 
   "VCI pagedown" => :page_down,
   "VCI pageup" => :page_up,
@@ -163,10 +130,9 @@ default_keys = {
 
   "I enter" => :insert_new_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)",
 
@@ -177,17 +143,6 @@ default_keys = {
   "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)",
-  "VC e" => "buf.jump_word(FORWARD,WORD_END)",
   #    'C '=> 'buf.jump_word(BACKWARD,END)',#TODO
   "VC f <char>" => "buf.jump_to_next_instance_of_char(<char>)",
   "VC F <char>" => "buf.jump_to_next_instance_of_char(<char>,BACKWARD)",
@@ -197,14 +152,10 @@ default_keys = {
   "VC /[1-9]/" => "vma.kbd.set_next_command_count(<char>)",
   #    'VC number=/[0-9]/+ g'=> 'jump_to_line(<number>)',
   #    'VC X=/[0-9]/+ * Y=/[0-9]/+ '=> 'x_times_y(<X>,<Y>)',
-  "VC G(vma.kbd.next_command_count!=nil)" => "buf.jump_to_line()",
   "VC 0(vma.kbd.next_command_count!=nil)" => "set_next_command_count(<char>)",
   "VC 0(vma.kbd.next_command_count==nil)" => "buf.jump(BEGINNING_OF_LINE)",
   # 'C 0'=> 'buf.jump(BEGINNING_OF_LINE)',
-  "VC g g" => "buf.jump(START_OF_BUFFER)",
-  "VC g ;" => "buf.jump_to_last_edit",
   "VC ^" => "buf.jump(BEGINNING_OF_LINE)",
-  "VC G" => "buf.jump(END_OF_BUFFER)",
   #    'VC z z' => 'center_on_current_line',
   "VC *" => "buf.jump_to_next_instance_of_word",
 
@@ -216,22 +167,13 @@ default_keys = {
 
   "R <char>" => "readchar_new_char(<char>)",
 
-  "C n" => "$search.jump_to_next()",
+  "C n" => :find_next,
   "C N" => "$search.jump_to_previous()",
 
   "C C" => :content_search,
 
-  # Debug
-  "C , d r p" => "start_ripl",
-  "C , d o" => "vma.gui.clear_overlay",
-  "C , D" => "debug_print_buffer",
   "C , c s" => "bufs.close_scrap_buffers",
-  "C , d b" => "debug_print_buffer",
-  "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)",
 
   "C o" => 'buf.jump(END_OF_LINE);buf.insert_txt("\n");vma.kbd.set_mode(:insert)',
@@ -240,23 +182,18 @@ default_keys = {
   "C I" => "buf.jump(FIRST_NON_WHITESPACE);vma.kbd.set_mode(:insert)",
   "C a" => "buf.move(FORWARD_CHAR);vma.kbd.set_mode(:insert)",
   "C J" => "buf.join_lines()",
-  "C u" => "buf.undo()",
 
   "C ^" => "buf.jump(BEGINNING_OF_LINE)",
   # "C /[1-9]/" => "vma.kbd.set_next_command_count(<char>)",
 
   # Command mode only:
-  "C ctrl-r" => "buf.redo()", # TODO:???
-  "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(' ')",
-  "C y y" => "buf.copy_line",
   "C y O" => "buf.copy(:to_line_end)",
   "C y 0" => "buf.copy(:to_line_start)",
   "C y e" => "buf.copy(:to_word_end)", # TODO
   #### Deleting
-  "C x" => "buf.delete(CURRENT_CHAR_FORWARD)",
+  # "C x" => "buf.delete(CURRENT_CHAR_FORWARD)",
   # 'C d k'=> 'delete_line(BACKWARD)', #TODO
   # 'C d j'=> 'delete_line(FORWARD)', #TODO
   # 'C d d'=> 'buf.delete_cur_line',
@@ -279,8 +216,7 @@ default_keys = {
   # 'C 0($next_command_count==nil)'=> 'jump_to_beginning_of_line',
 
   # Visual mode only:
-  "V esc" => "buf.end_visual_mode",
-  "V ctrl!" => "buf.end_visual_mode",
+
   "V y" => "buf.copy_active_selection()",
   "V a y" => "buf.copy_active_selection(:append)",
   "V g U" => :selection_upcase,
@@ -296,8 +232,6 @@ default_keys = {
   # "V ctrl-c" => "buf.comment_selection",
   "V ctrl-x" => "buf.comment_selection(:uncomment)",
 
-  "CI ctrl-v" => "buf.paste(BEFORE)",
-  "CI backspace" => "buf.delete(BACKWARD_CHAR)",
 
   # Marks
   "CV m <char>" => "buf.mark_current_position(<char>)",
@@ -305,9 +239,7 @@ default_keys = {
   # "CV ''" =>'jump_to_mark(NEXT_MARK)', #TODO
 
   # Switch to another mode
-  "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",
@@ -316,49 +248,143 @@ default_keys = {
   # Macros
   # (experimental, may not work correctly)
   # "C q a" => 'vma.macro.start_recording("a")',
-  "VC q <char>" => "vma.macro.start_recording(<char>)",
-  "VC q(vma.macro.is_recording==true) " => "$macro.end_recording", # TODO
+  
+  "macro q" => "vma.kbd.to_previous_mode; vma.macro.end_recording",
+  # "macro q z" => "vma.kbd.to_previous_mode; vma.macro.end_recording",
+  
+  # "VC q(vma.macro.is_recording==true)" => "vma.macro.end_recording", # TODO: does not work
+  # "VC o(vma.macro.is_recording==true)" => "vma.macro.end_recording", # TODO: does not work
+  # "VC q q(vma.macro.is_recording==true)" => "vma.macro.end_recording",
+  "VC q <char>" => "vma.kbd.set_mode(:macro);vma.macro.start_recording(<char>)",
   # 'C q'=> 'vma.macro.end_recording', #TODO
-  "C q v" => "vma.macro.end_recording",
+  
+  # "C q v" => "vma.kbd.to_previous_mode; vma.macro.end_recording", #TODO
+  
   # 'C v'=> 'vma.macro.end_recording',
   # "C M" => 'vma.macro.run_last_macro',
   "C @ <char>" => "vma.macro.run_macro(<char>)",
   "C , m S" => 'vma.macro.save_macro("a")',
   "C , m s" => "vma.macro.save",
-  "C , t r" => "run_tests()",
 
   # "C ." => "repeat_last_action", # TODO
   "VC ;" => "repeat_last_find",
   # "CV Q" => :quit,
   "CV ctrl-q" => :quit,
-  "CV , R" => "restart_application",
   # "I ctrl!" => "vma.kbd.to_previous_mode",
   "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",
 
   "I ctrl-d" => "buf.delete2(:to_word_end)",
 
   # Insert and Replace modes: Moving
-  "IX ctrl-a" => "buf.jump(BEGINNING_OF_LINE)",
-  "IX ctrl-b" => "buf.move(BACKWARD_CHAR)",
   "IX ctrl-f" => "buf.move(FORWARD_CHAR)",
-  "IX ctrl-n" => "buf.move(FORWARD_LINE)",
-  "IX ctrl-p" => "buf.move(BACKWARD_LINE)",
-  "IX ctrl-e" => "buf.jump(END_OF_LINE)", # context: mode:I, buttons down: {C}
-  "IX alt-f" => "buf.jump_word(FORWARD,WORD_START)",
-  "IX alt-b" => "buf.jump_word(BACKWARD,WORD_START)",
 
-  "I ctrl-h" => :show_autocomplete,
   "I ctrl-j" => "vma.buf.view.hide_completions",
 
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
+
+ "C , a" => :ack_search,
+ "C d w" => :delete_to_next_word_start,
+
+ "C d 0" => :delete_to_line_start,
+ "C , , f" => :file_finder,
+ "VC h" => :e_move_backward_char,
+ "C , , ." => :backup_all_buffers,
+ "C z " => :start_browse_mode,
+ "B h" => :history_switch_backwards,
+ "B l" => :history_switch_forwards,
+ "B z" => "center_on_current_line();call_action(:exit_browse_mode)",
+ "B enter || B return || B esc || B j || B ctrl!" => :exit_browse_mode,
+ "B s" => :page_up,
+ "B d" => :page_down,
+ "B r" => proc { vma.gui.page_down(multip: 0.25) },
+ "B e" => proc { vma.gui.page_up(multip: 0.25) },
+
+ "B i" => :jump_to_start_of_buffer,
+ "B o" => :jump_to_end_of_buffer,
+ "B c" => :close_current_buffer,
+ "B ;" => :jump_last_edit,
+ "B q" => :jump_to_last_edit,
+ "B w" => :jump_to_next_edit,
+ "C , v" => :auto_indent_buffer,
+ "C , , u" => :update_file_index,
+ "C , s a" => :buf_save_as,
+ "VC , r r" => :gui_search_replace,
+ "C , w" => :toggle_active_window,
+ "C , , w" => :toggle_two_column,
+
+ "VC s" => :easy_jump,
+ "I alt-s" => :easy_jump,
+ "VC , m f" => [:find_macro_gui, proc { vma.macro.find_macro_gui }, "Find named macro"],
+ "C , m n" => [:gui_name_macro, proc { vma.macro.gui_name_macro }, "Name last macro"],
+ "C , j r" => :jump_to_random,
+ "C , ; s k" => :show_key_bindings, #TODO: better binding,
+ "C , , c b" => :put_file_path_to_clipboard, #TODO: better binding or remove?,
+ "C , , e" => :encrypt_file, #TODO: better binding,
+ "C , ; u" => :set_unencrypted, #TODO: better binding,
+ "C , c b" => :close_current_buffer,
+ "V ctrl-c" => :comment_selection,
+ "C , f" => :gui_file_finder,
+ "C , h" => :gui_file_history_finder,
+ "C , z" => :gui_file_finder,
+
+ "C enter || C return" => [:line_action, proc { buf.handle_line_action() }, "Line action"],
+ "V d" => [:delete_selection, proc { buf.delete(SELECTION) }, ""],
+ "V a d" => [:delete_append_selection, proc { buf.delete(SELECTION, :append) }, "Delete and append selection"]
 }
 
-bindkey "C , i p", "generate_password_to_buf(15)"
+add_keys "hyperplaintext", {
+  "V , t b" => :set_style_bold,
+  "V , t l" => :set_style_link,
+  "V , t c" => :clear_formats,
+  "C , t h" => :set_line_style_heading,
+  "C , t 1" => :set_line_style_h1,
+  "C , t 2" => :set_line_style_h2,
+  "C , t 3" => :set_line_style_h3,
+  "C , t 4" => :set_line_style_h4,
+  "C , t b" => :set_line_style_bold,
+  "C , t t" => :set_line_style_title,
+  "C , t c" => :clear_line_styles,
+}
+
+bindkey ["VCB M", "B m"], :run_last_macro
+
+add_keys "experimental", {
+ "C ` k" => :lsp_debug,
+ "C ` j" => :lsp_jump_to_definition,
+ "C , u s" => :audio_stop,
 
-default_keys.each { |key, value|
-  bindkey(key, value)
+  "C , t r" => "run_tests()",
+  # "CV , R" => "restart_application", #TODO: does not work
+  "I ctrl-h" => :show_autocomplete, #TODO: does not work
+  "C , d m" => :kbd_dump_state,
+  "C , ; ." => :increment_word,
+  "C , d d" => "debug_dump_deltas",
+  "C , d c" => "debug_dump_clipboard",
+  "C , d b" => "debug_print_buffer",
+  "C , D" => "debug_print_buffer",
+  "C , d o" => "vma.gui.clear_overlay",
+  # Debug
+  "C , d r p" => 'require "pry"; binding.pry', #TODO
+#bindkey 'C , g', proc{invoke_grep_search}
+# bindkey "C , d", :diff_buffer
+ "C , , d" => :savedebug,
+ "C , m a" => "vma.kbd.set_mode(:audio)",
+ "audio s" => :audio_stop,
 }
+
+
+bindkey "audio f || audio right", [:audio_forward, proc { Audio.seek_forward }, "Seek forward in audio stream"]
+bindkey "audio left", [:audio_backward, proc { Audio.seek_forward(-5.0) }, "Seek backward in audio stream"]
+
+bindkey "audio space", :audio_stop
+bindkey "audio q || audio esc", "vma.kbd.to_previous_mode"
+
+
+bindkey "C , i p", "generate_password_to_buf(15)"
+
+# default_keys.each { |key, value|
+  # bindkey(key, value)
+# }

data/lib/vimamsa/main.rb

@@ -45,6 +45,7 @@ def buflist()
 end
 
 require "vimamsa/editor.rb"
+require "vimamsa/diff_buffer"
 
 $vma = Editor.new
 def vma()

data/lib/vimamsa/rbvma.rb

@@ -16,6 +16,7 @@ require "cgi"
 require "uri"
 require "vimamsa/conf"
 require "vimamsa/util"
+require "vimamsa/string_util"
 # exit!
 require "vimamsa/main"
 require "vimamsa/terminal"
@@ -30,6 +31,8 @@ require "vimamsa/gui_form_generator"
 require "vimamsa/gui_text"
 require "vimamsa/gui_menu"
 require "vimamsa/gui_dialog"
+require "vimamsa/gui_settings"
+require "vimamsa/gui_file_panel"
 require "vimamsa/gui_select_window"
 require "vimamsa/gui_sourceview"
 require "vimamsa/gui_sourceview_autocomplete"

data/lib/vimamsa/string_util.rb

@@ -0,0 +1,56 @@
+def flip_true_false(str)
+  str.gsub(/\b(true|false)\b/i) do |match|
+    if match.match?(/\Atrue\z/i)
+      replacement = "false"
+    else
+      replacement = "true"
+    end
+
+    # preserve casing style
+    if match == match.upcase
+      replacement.upcase
+    elsif match[0] == match[0].upcase
+      replacement.capitalize
+    else
+      replacement.downcase
+    end
+  end
+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
+
+# Get all indexes for start of matching regexp
+def scan_indexes(txt, regex)
+  # indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) + 1 }
+  indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) }
+  return indexes
+end
+
+def is_path(s)
+  m = s.match(/(~[a-z]*)?\/.*\//)
+  if m != nil
+    return true
+  end
+  return false
+end
+
+
+def sanitize_input(str)
+  if str.encoding != Encoding::UTF_8
+    str = text.encode(Encoding::UTF_8)
+  end
+  str.gsub!(/\r\n/, "\n")
+  return str
+end
+
+def is_url(s)
+  return s.match(/(https?|file):\/\/.*/) != nil
+end
+
+

data/lib/vimamsa/util.rb

@@ -3,6 +3,12 @@ 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 draw_cursor_bug_workaround()
+  if !vma.gui.nil?
+    DelayExecutioner.exec(id: :bug_workaround_draw_cursor, wait: 1.0, callable: proc { vma.gui.view.draw_cursor(); debug ":bug_workaround_draw_cursor"; false })
+  end
+end
+
 def running_wayland?
   sess = ENV["DESKTOP_SESSION"]
   sess ||= ENV["XDG_SESSION_DESKTOP"]
@@ -20,14 +26,6 @@ def tilde_path(abspath)
   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
@@ -49,13 +47,6 @@ def generate_password_to_buf(length)
   vma.buf.insert_txt(passw)
 end
 
-# Get all indexes for start of matching regexp
-def scan_indexes(txt, regex)
-  # indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) + 1 }
-  indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) }
-  return indexes
-end
-
 def file_mime_type(fpath)
   fpath = File.expand_path(fpath)
   return nil if !File.readable?(fpath)
@@ -218,7 +209,7 @@ end
 # Used for image scaling after window resize
 
 class DelayExecutioner
-
+  attr_accessor :last_run, :wait_before_next
   # Run 'callable.call' if 'wait' time elapsed from last exec call for this id
   def self.exec(id:, wait:, callable:)
     @@h ||= {}
@@ -226,6 +217,12 @@ class DelayExecutioner
     if h[id].nil?
       h[id] = DelayExecutioner.new(wait, callable)
     end
+    o = h[id]
+    if !o.last_run.nil?
+      # if Time.now - o.last_run < o.wait_before_next
+      # return
+      # end
+    end
     h[id].run
   end
 
@@ -234,6 +231,8 @@ class DelayExecutioner
     @proc = _proc
     @lastt = Time.now
     @thread_running = false
+    @last_run = nil
+    @wait_before_next = 0
   end
 
   def start_thread
@@ -242,6 +241,7 @@ class DelayExecutioner
         sleep 0.1
         if Time.now - @lastt > @wait_time
           @proc.call
+          @last_run = Time.now
           @thread_running = false
           break
         end
@@ -309,18 +309,6 @@ def read_file(text, path)
   return content
 end
 
-def sanitize_input(str)
-  if str.encoding != Encoding::UTF_8
-    str = text.encode(Encoding::UTF_8)
-  end
-  str.gsub!(/\r\n/, "\n")
-  return str
-end
-
-def is_url(s)
-  return s.match(/(https?|file):\/\/.*/) != nil
-end
-
 def expand_if_existing(fpath)
   return nil if fpath.class != String
   fpath = File.expand_path(fpath)
@@ -344,6 +332,17 @@ def is_existing_file(s)
   return false
 end
 
+def uri_to_path(uri)
+  fp = nil
+  begin
+    x = URI::DEFAULT_PARSER.unescape(URI(uri).path)
+  rescue URI::InvalidURIError
+  else
+    fp = x # only if no exception
+  end
+  return fp
+end
+
 def is_image_file(fpath)
   return false if !File.exist?(fpath)
   # return false if !fpath.match(/.(jpg|jpeg|png)$/i)
@@ -362,11 +361,3 @@ end
 # #TODO: check contents of file
 # return true
 # end
-
-def is_path(s)
-  m = s.match(/(~[a-z]*)?\/.*\//)
-  if m != nil
-    return true
-  end
-  return false
-end