vimamsa 0.1.7 → 0.1.10

data/lib/vimamsa/key_binding_tree.rb

@@ -15,7 +15,7 @@
 # 'C , r v b'=> 'revert_buffer',
 #
 # In insert mode: press and hold ctrl, press "a"
-# 'I ctrl-a'=> '$buffer.jump(BEGINNING_OF_LINE)',
+# 'I ctrl-a'=> 'vma.buf.jump(BEGINNING_OF_LINE)',
 #
 
 $cnf = {} # TODO
@@ -36,7 +36,7 @@ setcnf :indent_based_on_last_line, true
 setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
 
 class State
-  attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes
+  attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes, :level
 
   def initialize(key_name, eval_rule = "")
     @key_name = key_name
@@ -44,6 +44,7 @@ class State
     @children = []
     @major_modes = []
     @action = nil
+    @level = 0
   end
 
   def to_s()
@@ -86,6 +87,7 @@ class KeyBindingTree
   # $kbd.add_mode("I", :insert)
   def add_mode(id, label)
     mode = State.new(id)
+    mode.level = 1
     @modes[label] = mode
     @root.children << mode
     if @default_mode == nil
@@ -127,22 +129,21 @@ class KeyBindingTree
     @match_state.each { |parent|
       parent.children.each { |c|
         # printf(" KEY MATCH: ")
-        # puts [c.key_name, key_name].inspect
+        # debug [c.key_name, key_name].inspect
         if c.key_name == key_name and c.eval_rule == ""
           new_state << c
         elsif c.key_name == key_name and c.eval_rule != ""
-          puts "CHECK EVAL: #{c.eval_rule}"
+          debug "CHECK EVAL: #{c.eval_rule}"
           if eval(c.eval_rule)
             new_state << c
-            puts "EVAL TRUE"
+            debug "EVAL TRUE"
           else
-            puts "EVAL FALSE"
+            debug "EVAL FALSE"
           end
         end
       }
     }
 
-
     if new_state.any? # Match found
       @match_state = new_state
       return new_state
@@ -153,6 +154,11 @@ class KeyBindingTree
     end
   end
 
+  def show_state_trail
+    (st, children) = get_state_trail_str()
+    vma.gui.statnfo.markup = "<span weight='ultrabold'>#{st}</span>"
+  end
+
   def set_mode(label)
     @mode_history << @mode_root_state
 
@@ -195,7 +201,7 @@ class KeyBindingTree
     end
 
     @state_trail = [@mode_root_state]
-    # puts get_state_trail_str()
+    # debug get_state_trail_str()
     # $next_command_count = nil # TODO: set somewhere else?
   end
 
@@ -205,6 +211,7 @@ class KeyBindingTree
     # @cur_state = @root
     stack = [[@root, ""]]
     lines = []
+
     while stack.any?
       t, p = *stack.pop # t = current state, p = current path
       if t.children.any?
@@ -212,14 +219,27 @@ class KeyBindingTree
           if c.eval_rule.size > 0
             new_p = "#{p} #{c.key_name}(#{c.eval_rule})"
           else
-            new_p = "#{p} #{c.key_name}"
+            if c.level == 1
+              new_p = "#{p} [#{c.key_name}]"
+            else
+              new_p = "#{p} #{c.key_name}"
+            end
           end
           stack << [c, new_p]
         }
         # stack.concat[t.children]
       else
-        # s += p + " : #{t.action}\n"
-        lines << p + " : #{t.action}"
+        method_desc = t.action
+        if t.action.class == Symbol
+          if !$actions[t.action].nil?
+            a = $actions[t.action].method_name
+            if !a.nil? and !a.empty?
+              method_desc = a
+            end
+          end
+        end
+
+        lines << p + " : #{method_desc}"
       end
     end
     s = lines.sort.join("\n")
@@ -227,21 +247,26 @@ class KeyBindingTree
   end
 
   def get_state_trail_str
-    s = ""
     s_trail = ""
     last_state = @state_trail.last
     last_state = last_state[0] if last_state.class == Array
+    first = true
     for st in @state_trail
       st = st[0] if st.class == Array
-      s_trail << " #{st.to_s}"
+      if first
+        s_trail << "[#{st.to_s}]"
+      else
+        s_trail << " #{st.to_s}"
+      end
+      first = false
     end
-    s << "CUR STATE: #{s_trail}\n"
+    children = ""
     for cstate in last_state.children
       act_s = "..."
       act_s = cstate.action.to_s if cstate.action != nil
-      s << "  #{cstate.to_s} #{act_s}\n"
+      children << "  #{cstate.to_s} #{act_s}\n"
     end
-    return s
+    return [s_trail, children]
   end
 
   # Modifies state of key binding tree (move to new state) based on received event
@@ -305,20 +330,6 @@ class KeyBindingTree
 
     if new_state != nil
       @state_trail << new_state
-      puts get_state_trail_str()
-      # # puts "CUR STATE: #{@state_trail.collect{|x| x.to_s}.join}"
-      # s_trail = ""
-      # for st in @state_trail
-      # st = st[0] if st.class == Array
-      # s_trail << " #{st.to_s}"
-      # end
-      # puts "CUR STATE: #{s_trail}"
-      # for cstate in new_state[0].children
-      # act_s = "..."
-      # act_s = cstate.action.to_s if cstate.action != nil
-      # puts "  #{cstate.to_s} #{act_s}"
-      # end
-      # new_state[0].children.collect{|x|x.to_s}
     end
 
     if new_state == nil
@@ -330,7 +341,7 @@ class KeyBindingTree
       end
 
       if event_type == :key_release and c == "shift!"
-        # Pressing a modifier key (shift) puts state back to root
+        # Pressing a modifier key (shift) sets state back to root
         # only on key release when no other key has been pressed
         # after said modifier key (shift).
         set_state_to_root
@@ -346,109 +357,22 @@ class KeyBindingTree
 
       if s_act.any? and !state_with_children.any?
         eval_s = s_act.first.action if eval_s == nil
-        puts "FOUND MATCH:#{eval_s}"
-        puts "CHAR: #{c}"
+        debug "FOUND MATCH:#{eval_s}"
+        debug "CHAR: #{c}"
         c.gsub!("\\", %q{\\\\} * 4) # Escape \ -chars
         c.gsub!("'", "#{'\\' * 4}'") # Escape ' -chars
 
         eval_s.gsub!("<char>", "'#{c}'") if eval_s.class == String
-        puts eval_s
-        puts c
+        debug eval_s
+        debug c
         handle_key_bindigs_action(eval_s, c)
         set_state_to_root
       end
     end
 
-    return true
-  end
-
-  # Receive keyboard event from Qt
-  def handle_key_event(event)
-    start_profiler
-    # puts "GOT KEY EVENT: #{key.inspect}"
-    debug "GOT KEY EVENT:: #{event} #{event[2]}"
-    debug "|#{event.inspect}|"
-    $debuginfo["cur_event"] = event
-
-    t1 = Time.now
-
-    keycode = event[0]
-    event_type = event[1]
-    modifierinfo = event[4]
-
-    event[3] = event[2]
-    # String representation of received key
-    key_str = event[2]
-
-    @modifiers.delete(Qt::Key_Alt) if event[4] & ALTMODIFIER == 0
-    @modifiers.delete(Qt::Key_Control) if event[4] & CONTROLMODIFIER == 0
-    @modifiers.delete(Qt::Key_Shift) if event[4] & SHIFTMODIFIER == 0
-
-    # Add as modifier if ctrl, alt or shift
-    if modifierinfo & ALTMODIFIER != 0 or modifierinfo & CONTROLMODIFIER != 0 or modifierinfo & SHIFTMODIFIER != 0
-      # And keypress and not already a modifier
-      if event_type == KEY_PRESS and !@modifiers.include?(keycode)
-        @modifiers << keycode
-      end
-    end
-
-    # puts "----D------------"
-    # puts @modifiers.inspect
-    # puts event.inspect
-    # puts event[4] & ALTMODIFIER
-    # puts "-----------------"
-
-    @modifiers.delete(keycode) if event_type == KEY_RELEASE
-
-    # uval = keyval_to_unicode(event[0])
-    # event[3] = [uval].pack('c*').force_encoding('UTF-8') #TODO: 32bit?
-    # debug("key_code_to_uval: uval: #{uval} uchar:#{event[3]}")
-
-    if $event_keysym_translate_table.include?(keycode)
-      key_str = $event_keysym_translate_table[keycode]
-    end
-
-    # Prefix string representation with modifiers, e.g. ctrl-shift-a
-    key_prefix = ""
-    @modifiers.each { |pressed_key|
-      if $event_keysym_translate_table[pressed_key]
-        key_prefix += $event_keysym_translate_table[pressed_key] + "-"
-      end
-    }
-
-    # Get char based on keycode
-    # to produce prefixed_key_str "shift-ctrl-a" instead of "shift-ctrl-\x01"
-    key_str2 = key_str
-    if $translate_table.include?(keycode)
-      key_str2 = $translate_table[keycode].downcase
-    end
-    # puts "key_str=|#{key_str}| key_str=|#{key_str.inspect}| key_str2=|#{key_str2}|"
-    prefixed_key_str = key_prefix + key_str2
-
-    # Space is only key in $event_keysym_translate_table
-    # which is representable by single char
-    key_str = " " if key_str == "space" # HACK
+    show_state_trail #TODO: check if changed
 
-    # if keycode == @last_event[0] and event_type == KEY_RELEASE
-    # puts "KEY! key_str=|#{key_str}| prefixed_key_str=|#{prefixed_key_str}|"
-    # end
-
-    if key_str != "" or prefixed_key_str != ""
-      if keycode == @last_event[0] and event_type == KEY_RELEASE
-        # If key is released immediately after pressed with no other events between
-        match_key_conf(key_str + "!", prefixed_key_str + "!", event_type)
-      elsif event_type == KEY_PRESS
-        match_key_conf(key_str, prefixed_key_str, event_type)
-      end
-      @last_event = event #TODO: outside if?
-    end
-
-    # gui_refresh_cursor
-
-    event_handle_time = Time.now - t1
-    debug "RB key event handle time: #{event_handle_time}" if event_handle_time > 1 / 40.0
-    render_buffer($buffer)
-    end_profiler
+    return true
   end
 
   def bindkey(key, action)
@@ -485,7 +409,7 @@ class KeyBindingTree
     m = key.match(/^(\S+)\s(\S.*)$/)
     if m
       modetmp = m[1]
-      puts [key, modetmp, m].inspect
+      debug [key, modetmp, m].inspect
       modes = modetmp.split("") if modetmp.match(/^\p{Lu}+$/) # Uppercase
       modes = [modetmp] if modetmp.match(/^\p{Ll}+$/) # Lowercase
       keydef = m[2]
@@ -561,7 +485,7 @@ class KeyBindingTree
         #   like '20j' => go to next line 20 times.
       end
     rescue SyntaxError
-      debug("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
+      message("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
       # rescue NoMethodError
       # debug("NoMethodError with eval cmd #{action}: " + $!.to_s)
       # rescue NameError

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -1,9 +1,8 @@
-
-bindkey ["VCB M","B m"], :run_last_macro
+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 { $macro.find_macro_gui }, "Find named macro"]
+bindkey "C , m n", [:gui_name_macro, proc { $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
@@ -30,13 +29,13 @@ 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", :gui_select_buffer
+bindkey "C , b", :start_buf_manager
 # 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_word_end
-bindkey  "C d 0", :delete_to_line_start
+bindkey "C d w", :delete_to_word_end
+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
@@ -62,11 +61,11 @@ bindkey "C , g", :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 "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) }, ""]
 
 default_keys = {
 
@@ -84,7 +83,6 @@ default_keys = {
   # "C , , ." => "backup_all_buffers()",
   "VC , , s" => :search_actions,
 
-
   # MOVING
   #    'VC h' => 'buf.move(BACKWARD_CHAR)',
   "VC l" => "buf.move(FORWARD_CHAR)",
@@ -107,7 +105,7 @@ default_keys = {
   "VC F <char>" => "buf.jump_to_next_instance_of_char(<char>,BACKWARD)",
   "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 number=/[0-9]/+ g'=> 'jump_to_line(<number>)',
   #    'VC X=/[0-9]/+ * Y=/[0-9]/+ '=> 'x_times_y(<X>,<Y>)',
@@ -133,6 +131,9 @@ default_keys = {
   "C n" => "$search.jump_to_next()",
   "C N" => "$search.jump_to_previous()",
 
+
+  "C C" => :content_search,
+
   # Debug
   "C , d r p" => "start_ripl",
   "C , D" => "debug_print_buffer",
@@ -191,11 +192,14 @@ default_keys = {
   "V ctrl!" => "buf.end_visual_mode",
   "V y" => "buf.copy_active_selection()",
   "V a y" => "buf.copy_active_selection(:append)",
-  "V g U" => "buf.transform_selection(:upcase)",
-  "V g u" => "buf.transform_selection(:downcase)",
-  "V g c" => "buf.transform_selection(:capitalize)",
-  "V g s" => "buf.transform_selection(:swapcase)",
-  "V g r" => "buf.transform_selection(:reverse)",
+  "V g U" => :selection_upcase,
+  "V g u" => :selection_downcase,
+  "V g c" => :selection_capitalize,
+  "V g s" => :selection_swapcase,
+  "V g r" => :selection_reverse,
+  
+  "VC j" => :forward_line,
+  "VC k" => :backward_line,
 
   "V x" => "buf.delete(SELECTION)",
   # "V ctrl-c" => "buf.comment_selection",
@@ -215,15 +219,15 @@ default_keys = {
   # Macros
   # (experimental, may not work correctly)
   # "C q a" => '$macro.start_recording("a")',
-  "VC q <char>" => '$macro.start_recording(<char>)',
+  "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 @ <char>" => "$macro.run_macro(<char>)",
   "C , m S" => '$macro.save_macro("a")',
-  "C , m s" => '$macro.save',
+  "C , m s" => "$macro.save",
   "C , t r" => "run_tests()",
 
   # "C ." => "repeat_last_action", # TODO
@@ -256,5 +260,3 @@ default_keys = {
 default_keys.each { |key, value|
   bindkey(key, value)
 }
-
-

data/lib/vimamsa/macro.rb

@@ -1,6 +1,6 @@
 
 def gui_find_macro_update_callback(search_str = "")
-  puts "gui_find_macro_update_callback: #{search_str}"
+  debug "gui_find_macro_update_callback: #{search_str}"
   heystack = $macro.named_macros
   return [] if heystack.empty?
   $macro_search_list = []
@@ -14,10 +14,10 @@ def gui_find_macro_update_callback(search_str = "")
 end
 
 def gui_find_macro_select_callback(search_str, idx)
-  puts "gui_find_macro_select_callback"
+  debug "gui_find_macro_select_callback"
   selected = $macro_search_list[idx]
   m = $macro.named_macros[selected[0]].clone
-  puts "SELECTED MACRO:#{selected}, #{m}"
+  debug "SELECTED MACRO:#{selected}, #{m}"
   id = $macro.last_macro
   $macro.recorded_macros[id] = m
   $macro.run_macro(id)
@@ -64,7 +64,7 @@ class Macro
   end
 
   def name_macro(name, id = nil)
-    puts "NAME MACRO #{name}"
+    debug "NAME MACRO #{name}"
     if id.nil?
       id = @last_macro
     end
@@ -134,7 +134,7 @@ class Macro
       # Ripl.start :binding => binding
       for a in acts
         ret = exec_action(a)
-        puts ret
+        debug ret
         if ret == false
           message("Error while running macro")
           break

data/lib/vimamsa/main.rb

@@ -37,15 +37,15 @@ $experimental = false
 
 # Return currently active buffer
 def buf()
-  return $buffer
+  return vma.buf
 end
 
 def bufs()
-  return $buffers
+  return vma.buffers
 end
 
 def buflist()
-  return $buffers
+  return vma.buffers
 end
 
 require "vimamsa/editor.rb"

data/lib/vimamsa/rbvma.rb

@@ -1,13 +1,15 @@
-require "gtk3"
-require "gtksourceview3"
 #require "gtksourceview4"
-require "ripl"
-require "fileutils"
-require "pathname"
 require "date"
-require "ripl/multi_line"
+require "fileutils"
+require "gtk3"
+require "gtksourceview4"
 require "json"
 require "listen"
+require "pathname"
+require "ripl"
+require "ripl/multi_line"
+require "shellwords"
+require "cgi"
 
 require "vimamsa/util"
 require "vimamsa/main"
@@ -16,27 +18,29 @@ require "vimamsa/actions"
 require "vimamsa/key_binding_tree"
 require "vimamsa/key_actions"
 
-
+# Graphical stuff:
 require "vimamsa/gui"
 require "vimamsa/gui_menu"
 require "vimamsa/gui_select_window"
 require "vimamsa/gui_sourceview"
+require "vimamsa/gui_image"
+require "vimamsa/hyper_plain_text"
 
-require "vimamsa/macro"
+require "vimamsa/ack"
 require "vimamsa/buffer"
-require "vimamsa/debug"
+require "vimamsa/buffer_list"
+require "vimamsa/buffer_manager"
 require "vimamsa/constants"
+require "vimamsa/debug"
 require "vimamsa/easy_jump"
+require "vimamsa/encrypt"
+require "vimamsa/file_finder"
+require "vimamsa/file_manager"
 require "vimamsa/hook"
+require "vimamsa/macro"
 require "vimamsa/search"
 require "vimamsa/search_replace"
-require "vimamsa/buffer_list"
-require "vimamsa/file_finder"
-require "vimamsa/hyper_plain_text"
-require "vimamsa/ack"
-require "vimamsa/encrypt"
-require "vimamsa/file_manager"
-
+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"
@@ -48,7 +52,7 @@ def vma()
 end
 
 def unimplemented
-  puts "unimplemented"
+  debug "unimplemented"
 end
 
 
@@ -56,7 +60,7 @@ $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) }
+  indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0)  }
   return indexes
 end
 

data/lib/vimamsa/search.rb

@@ -3,7 +3,7 @@ def execute_search(input_str)
   $search = Search.new
   eval_str="execute_search(#{input_str.dump})"
   $macro.overwrite_current_action(eval_str)
-  return $search.set(input_str, "simple", $buffer)
+  return $search.set(input_str, "simple", vma.buf)
 end
 
 def invoke_search()
@@ -32,7 +32,7 @@ class Search
       @reg = Regexp.new(regex, Regexp::IGNORECASE)
     end
     @search_indexes = scan_indexes(buffer, @reg)
-    puts @search_indexes.inspect
+    debug @search_indexes.inspect
     @cur_search_i = -1
     if @search_indexes.any?
       @cur_search_i = 0