vimamsa 0.1.12 → 0.1.14

data/lib/vimamsa/key_binding_tree.rb

@@ -18,20 +18,6 @@
 # 'I ctrl-a'=> 'vma.buf.jump(BEGINNING_OF_LINE)',
 #
 
-$cnf = {} # TODO
-
-def conf(id)
-  return $cnf[id]
-end
-
-def set_conf(id, val)
-  $cnf[id] = val
-end
-
-def setcnf(id, val)
-  set_conf(id, val)
-end
-
 setcnf :indent_based_on_last_line, true
 setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
 
@@ -55,18 +41,21 @@ class State
 end
 
 class KeyBindingTree
-  attr_accessor :C, :I, :cur_state, :root, :match_state, :last_action, :cur_action, :modifiers
-  attr_reader :mode_root_state, :state_trail, :act_bindings
+  attr_accessor :C, :I, :cur_state, :root, :match_state, :last_action, :cur_action, :modifiers, :next_command_count, :method_handles_repeat
+  attr_reader :mode_root_state, :state_trail, :act_bindings, :default_mode_stack
 
   def initialize()
+    @next_command_count = nil
     @modes = {}
     @root = State.new("ROOT")
     @cur_state = @root # used for building the tree
     @default_mode = nil
+    @default_mode_stack = []
     @mode_history = []
     @state_trail = []
     @last_action = nil
     @cur_action = nil
+    @method_handles_repeat = false
 
     @modifiers = { :ctrl => false, :shift => false, :alt => false } # TODO: create a queue
     @last_event = [nil, nil, nil, nil, nil]
@@ -80,10 +69,26 @@ class KeyBindingTree
     @match_state = [@modes[label]] # used for matching input
     @mode_root_state = @modes[label]
     @default_mode = label
+    @default_mode_stack << label
+    if !vma.buf.nil?
+      # vma.buf.mode_stack = @default_mode_stack.clone
+    end
+  end
+
+  def set_mode_stack(ms)
+    @default_mode_stack = ms
   end
 
   def set_mode_to_default()
-    set_mode(@default_mode)
+    # set_mode(@default_mode)
+    set_mode(@default_mode_stack[-1])
+  end
+
+  def to_previous_mode()
+    if @default_mode_stack.size > 1
+      @default_mode_stack.pop
+    end
+    set_mode_to_default()
   end
 
   def add_mode(id, label, cursortype = :command, name: nil)
@@ -180,8 +185,6 @@ class KeyBindingTree
 
     if !vma.gui.view.nil?
       vma.gui.view.draw_cursor()  #TODO: handle outside this class
-
-      # Ripl.start :binding => binding
     end
   end
 
@@ -220,6 +223,7 @@ class KeyBindingTree
 
   # Print key bindings to show as documentation or for debugging
   def to_s()
+    # return self.class.to_s
     s = ""
     # @cur_state = @root
     stack = [[@root, ""]]
@@ -267,7 +271,12 @@ class KeyBindingTree
     for st in @state_trail
       st = st[0] if st.class == Array
       if first
-        s_trail << "[#{st.to_s}]"
+        trailpfx = ""
+        if !st.major_modes.empty?
+          mmid = st.major_modes.first
+          trailpfx = "#{@modes[mmid].to_s}>"
+        end
+        s_trail << "[#{trailpfx}#{st.to_s}]"
       else
         s_trail << " #{st.to_s}"
       end
@@ -279,9 +288,21 @@ class KeyBindingTree
       act_s = cstate.action.to_s if cstate.action != nil
       children << "  #{cstate.to_s} #{act_s}\n"
     end
+    if !@next_command_count.nil?
+      s_trail << " #{@next_command_count}"
+    end
     return [s_trail, children]
   end
 
+  def set_next_command_count(num)
+    if @next_command_count != nil
+      @next_command_count = @next_command_count * 10 + num.to_i
+    else
+      @next_command_count = num.to_i
+    end
+    debug("NEXT COMMAND COUNT: #{@next_command_count}")
+  end
+
   # Modifies state of key binding tree (move to new state) based on received event
   # Checks child nodes of current state if they match received event
   # if yes, change state to child
@@ -349,7 +370,7 @@ class KeyBindingTree
       if event_type == :key_press and c != "shift"
         # TODO:include other modifiers in addition to shift?
         set_state_to_root
-        printf(", BACK TO ROOT") if $debug
+        printf(", BACK TO ROOT") if cnf.debug?
       end
 
       if event_type == :key_release and c == "shift!"
@@ -357,10 +378,10 @@ class KeyBindingTree
         # only on key release when no other key has been pressed
         # after said modifier key (shift).
         set_state_to_root
-        printf(", BACK TO ROOT") if $debug
+        printf(", BACK TO ROOT") if cnf.debug?
       end
 
-      printf("\n") if $debug
+      printf("\n") if cnf.debug?
     else
 
       # Don't execute action if one of the states has children
@@ -475,11 +496,11 @@ class KeyBindingTree
   end
 
   def handle_key_bindigs_action(action, c)
-    $method_handles_repeat = false #TODO:??
+    $acth << action
+    @method_handles_repeat = false #TODO:??
     n = 1
-    if $next_command_count and !(action.class == String and action.include?("set_next_command_count"))
-      n = $next_command_count
-      # $next_command_count = nil
+    if @next_command_count and !(action.class == String and action.include?("set_next_command_count"))
+      n = @next_command_count
       debug("COUNT command #{n} times")
     end
 
@@ -487,15 +508,18 @@ class KeyBindingTree
       n.times do
         ret = exec_action(action)
 
-        if $macro.is_recording and ret != false
-          $macro.record_action(action)
+        if vma.macro.is_recording and ret != false
+          debug "RECORD ACTION:#{action}", 2
+          vma.macro.record_action(action)
         end
-        break if $method_handles_repeat
+        break if @method_handles_repeat
         # Some methods have specific implementation for repeat,
         #   like '5yy' => copy next five lines. (copy_line())
         # By default the same command is just repeated n times
         #   like '20j' => go to next line 20 times.
+        # But methods can also handle the number input themselves if vma.kbd.method_handles_repeat=true is set,
       end
+      # run_as_idle proc { vma.buf.refresh_cursor; vma.buf.refresh_cursor }, delay: 0.05
     rescue SyntaxError
       message("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
       # rescue NoMethodError
@@ -515,8 +539,8 @@ class KeyBindingTree
       end
     end
 
-    if action.class == String and !action.include?("set_next_command_count")
-      $next_command_count = nil
+    if !(action.class == String and action.include?("set_next_command_count"))
+      @next_command_count = nil
     end
   end
 end
@@ -531,7 +555,7 @@ def exec_action(action)
   $kbd.last_action = $kbd.cur_action
   $kbd.cur_action = action
   if action.class == Symbol
-    return call(action)
+    return call_action(action)
   elsif action.class == Proc
     return action.call
   else

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -3,17 +3,19 @@ vma.kbd.add_mode("I", :insert, :insert)
 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_mode("B", :browse, :command)
 vma.kbd.add_mode("X", :replace, :command, name: "Replace")
 vma.kbd.set_default_mode(:command)
 vma.kbd.set_mode(:command)
-vma.kbd.show_state_trail
+# vma.kbd.show_state_trail
+
 
 bindkey ["VCB M", "B m"], :run_last_macro
 
 bindkey "VC s", :easy_jump
-bindkey "VC , m f", [:find_macro_gui, proc { $macro.find_macro_gui }, "Find named macro"]
-bindkey "C , m n", [:gui_name_macro, proc { $macro.gui_name_macro }, "Name last macro"]
+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 "I enter", :insert_new_line
 bindkey "C , ; s k", :show_key_bindings #TODO: better binding
@@ -49,6 +51,15 @@ 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.set_mode_to_default"
+
 # bindkey "C , f o", :open_file_dialog
 bindkey "CI ctrl-o", :open_file_dialog
 # bindkey "M enter", :minibuffer_end
@@ -61,9 +72,10 @@ 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 h", [:browse_file_backwards, proc { vma.kbd.to_previous_mode; call_action(:history_switch_backwards);  }, "Browse previous file"]
 bindkey "B l", :history_switch_forwards
 #bindkey 'B z', :center_on_current_line
-bindkey "B z", "center_on_current_line();call(:exit_browse_mode)"
+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
@@ -76,7 +88,6 @@ 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", :invoke_grep_search
 #bindkey 'C , g', proc{invoke_grep_search}
 bindkey "C , v", :auto_indent_buffer
 bindkey "C , , d", :savedebug
@@ -99,7 +110,6 @@ default_keys = {
   #    'C , s'=> 'gui_select_buffer',
   "C , r v b" => :buf_revert,
   "C , c b" => "bufs.close_current_buffer",
-  #"C , b" => 'vma.kbd.set_mode("S");gui_select_buffer',
   "C , n b" => :buf_new,
   # "C , , ." => "backup_all_buffers()",
   "VC , , s" => :search_actions,
@@ -127,16 +137,16 @@ default_keys = {
   "VC f space" => "buf.jump_to_next_instance_of_char(' ')",
   "VC F space" => "buf.jump_to_next_instance_of_char(' ',BACKWARD)",
 
-  "VC /[1-9]/" => "set_next_command_count(<char>)",
+  "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 ^" => "buf.jump(BEGINNING_OF_LINE)",
-  "VC G($next_command_count!=nil)" => "buf.jump_to_line()",
-  "VC 0($next_command_count!=nil)" => "set_next_command_count(<char>)",
-  "VC 0($next_command_count==nil)" => "buf.jump(BEGINNING_OF_LINE)",
+  "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",
@@ -162,6 +172,7 @@ default_keys = {
   "C , d b" => "debug_print_buffer",
   "C , d c" => "debug_dump_clipboard",
   "C , d d" => "debug_dump_deltas",
+  
   "VC O" => "buf.jump(END_OF_LINE)",
   "VC $" => "buf.jump(END_OF_LINE)",
 
@@ -174,7 +185,7 @@ default_keys = {
   "C u" => "buf.undo()",
 
   "C ^" => "buf.jump(BEGINNING_OF_LINE)",
-  "C /[1-9]/" => "set_next_command_count(<char>)",
+  # "C /[1-9]/" => "vma.kbd.set_next_command_count(<char>)",
 
   # Command mode only:
   "C ctrl-r" => "buf.redo()", # TODO:???
@@ -197,10 +208,11 @@ default_keys = {
   "C d $" => "buf.delete2(:to_line_end)",
   #    'C d e'=> 'buf.delete_to_next_word_end',
   "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 , l b" => "load_buffer_list",
   "C , l l" => "save_buffer_list",
-  "C , r <char>" => "set_register(<char>)", # TODO
+  "C , r <char>" => "vma.set_register(<char>)", # TODO
   "C , p <char>" => "buf.paste(BEFORE,<char>)", # TODO
 
   "C ctrl-c" => "buf.comment_line()",
@@ -248,16 +260,16 @@ default_keys = {
 
   # Macros
   # (experimental, may not work correctly)
-  # "C q a" => '$macro.start_recording("a")',
-  "VC q <char>" => "$macro.start_recording(<char>)",
-  "VC q($macro.is_recording==true) " => "$macro.end_recording", # TODO
-  # 'C q'=> '$macro.end_recording', #TODO
-  "C q v" => "$macro.end_recording",
-  # 'C v'=> '$macro.end_recording',
-  # "C M" => '$macro.run_last_macro',
-  "C @ <char>" => "$macro.run_macro(<char>)",
-  "C , m S" => '$macro.save_macro("a")',
-  "C , m s" => "$macro.save",
+  # "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
+  # 'C q'=> 'vma.macro.end_recording', #TODO
+  "C q v" => "vma.macro.end_recording",
+  # '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
@@ -265,10 +277,10 @@ default_keys = {
   # "CV Q" => :quit,
   "CV ctrl-q" => :quit,
   "CV , R" => "restart_application",
-  "I ctrl!" => "vma.kbd.set_mode(:command)",
+  # "I ctrl!" => "vma.kbd.to_previous_mode",
   "C shift!" => "buf.save",
   "I <char>" => "buf.insert_txt(<char>)",
-  "I esc" => "vma.kbd.set_mode(:command)",
+  "I esc || I ctrl!" => "vma.kbd.set_mode_to_default",
 
   "I ctrl-d" => "buf.delete2(:to_word_end)",
 
@@ -282,7 +294,8 @@ default_keys = {
   "IX alt-f" => "buf.jump_word(FORWARD,WORD_START)",
   "IX alt-b" => "buf.jump_word(BACKWARD,WORD_START)",
 
-  "I tab" => 'buf.insert_txt("	")',
+  "I tab" => 'buf.insert_tab',
+  "I shift-tab" => 'buf.unindent',
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
 }

data/lib/vimamsa/macro.rb

@@ -1,6 +1,6 @@
 def gui_find_macro_update_callback(search_str = "")
   debug "gui_find_macro_update_callback: #{search_str}"
-  heystack = $macro.named_macros
+  heystack = vma.macro.named_macros
   return [] if heystack.empty?
   $macro_search_list = []
   files = heystack.keys.sort.collect { |x| [x, 0] }
@@ -15,11 +15,11 @@ end
 def gui_find_macro_select_callback(search_str, idx)
   debug "gui_find_macro_select_callback"
   selected = $macro_search_list[idx]
-  m = $macro.named_macros[selected[0]].clone
+  m = vma.macro.named_macros[selected[0]].clone
   debug "SELECTED MACRO:#{selected}, #{m}"
-  id = $macro.last_macro
-  $macro.recorded_macros[id] = m
-  $macro.run_macro(id)
+  id = vma.macro.last_macro
+  vma.macro.recorded_macros[id] = m
+  vma.macro.run_macro(id)
 end
 
 class Macro
@@ -52,7 +52,7 @@ class Macro
   end
 
   def find_macro_gui()
-    l = $macro.named_macros.keys.sort.collect { |x| [x, 0] }
+    l = vma.macro.named_macros.keys.sort.collect { |x| [x, 0] }
     $macro_search_list = l
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
 
@@ -116,36 +116,46 @@ class Macro
     run_macro(@last_macro)
   end
 
-  def run_macro(name)
-    if $macro.is_recording == true
-      message("Can't run a macro that runs a macro (recursion risk)")
-      return false
-    end
-    message("Start running macro [#{name}]")
-    if @recorded_macros.has_key?(name)
-      @last_macro = name
-    end
-    acts = @recorded_macros[name]
+  # Run the provided list of actions
+  def run_actions(acts)
+    isok = true
     if acts.kind_of?(Array) and acts.any?
       @running_macro = true
-      set_last_command({ method: $macro.method("run_macro"), params: [name] })
-      #
+      # TODO:needed?
+      # set_last_command({ method: vma.macro.method("run_macro"), params: [name] })
       for a in acts
         ret = exec_action(a)
-        debug ret
         if ret == false
-          message("Error while running macro")
-          Ripl.start :binding => binding
-
+          error "Error while running macro"
+          isok=false
           break
         end
       end
-      # eval_str = m.join(";")
-      # debug(eval_str)
-      # eval(eval_str)
     end
     @running_macro = false
     buf.set_pos(buf.pos)
+    # TODO: Should be a better way to trigger this. Sometimes need to wait for GTK to process things before updating the cursor.
+    run_as_idle proc { vma.buf.refresh_cursor; vma.buf.refresh_cursor }, delay: 0.15
+    return isok
+  end
+
+  def run_macro(name)
+    if vma.macro.is_recording == true
+      message("Can't run a macro that runs a macro (recursion risk)")
+      return false
+    end
+    message("Start running macro [#{name}]")
+    if @recorded_macros.has_key?(name)
+      @last_macro = name
+    end
+    acts = @recorded_macros[name]
+    return run_actions(acts)
+  end
+
+  def dump_last_macro()
+    puts "======MACRO START======="
+    puts @recorded_macros[@last_macro].inspect
+    puts "======MACRO END========="
   end
 
   def save_macro(name)

data/lib/vimamsa/main.rb

@@ -1,7 +1,7 @@
 #scriptdir=File.expand_path(File.dirname(__FILE__))
 $:.unshift File.dirname(__FILE__) + "/lib"
 
-# require 'benchmark/ips'
+#/home/samsam/Drive/code/vimamsa/git/lib/vimamsa/lib/vimamsa/main.rb require 'benchmark/ips'
 
 # load "vendor/ver/lib/ver/vendor/textpow.rb"
 # load "vendor/ver/lib/ver/syntax/detector.rb"
@@ -19,20 +19,13 @@ end
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-# Globals
+# Globals (TODO:refactor)
 $command_history = []
-$clipboard = []
-$register = Hash.new("")
-$cnf = {}
 $errors = []
 
-$cur_register = "a"
 $debuginfo = {}
 
-$jump_sequence = []
-
-$debug = false
-$experimental = false
+cnf.debug = false
 
 # Return currently active buffer
 def buf()
@@ -49,18 +42,11 @@ end
 
 require "vimamsa/editor.rb"
 
-# load "gui_funcs.rb"
-
 $vma = Editor.new
 def vma()
   return $vma
 end
 
-# c_startup
-# run_random_jump_test
-# main_loop
-
-# debug("END")
 
 
 

data/lib/vimamsa/rbvma.rb

@@ -12,18 +12,24 @@ require "ripl/multi_line"
 require "shellwords"
 require "cgi"
 require "uri"
+require "vimamsa/conf"
 require "vimamsa/util"
 # exit!
 require "vimamsa/main"
-require "vimamsa/form_generator"
+require "vimamsa/terminal"
 
 require "vimamsa/actions"
 require "vimamsa/key_binding_tree"
 require "vimamsa/key_actions"
 
+require "vimamsa/clipboard"
+
 # Graphical stuff:
 require "vimamsa/gui"
+require "vimamsa/gui_form_generator"
+require "vimamsa/gui_text"
 require "vimamsa/gui_menu"
+require "vimamsa/gui_dialog"
 require "vimamsa/gui_select_window"
 require "vimamsa/gui_sourceview"
 require "vimamsa/gui_image"
@@ -31,10 +37,13 @@ require "vimamsa/hyper_plain_text"
 
 require "vimamsa/ack"
 require "vimamsa/buffer"
+require "vimamsa/buffer_cursor"
+require "vimamsa/buffer_changetext"
 require "vimamsa/buffer_list"
 require "vimamsa/buffer_manager"
 require "vimamsa/constants"
 require "vimamsa/debug"
+require "vimamsa/tests"
 require "vimamsa/easy_jump"
 require "vimamsa/encrypt"
 require "vimamsa/file_finder"
@@ -43,30 +52,15 @@ require "vimamsa/hook"
 require "vimamsa/macro"
 require "vimamsa/search"
 require "vimamsa/search_replace"
-require "vimamsa/conf"
 # load "vendor/ver/lib/ver/vendor/textpow.rb"
 # load "vendor/ver/lib/ver/syntax/detector.rb"
 # load "vendor/ver/config/detect.rb"
 
-$vma = Editor.new
-
-def vma()
-  return $vma
-end
-
 def unimplemented
   debug "unimplemented"
 end
 
-
-$debug = false
-
-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
-
+cnf.debug = false
 $update_cursor = false
 
 

data/lib/vimamsa/search.rb

@@ -2,7 +2,7 @@
 def execute_search(input_str)
   $search = Search.new
   eval_str="execute_search(#{input_str.dump})"
-  $macro.overwrite_current_action(eval_str)
+  vma.macro.overwrite_current_action(eval_str)
   return $search.set(input_str, "simple", vma.buf)
 end