vimamsa 0.1.4 → 0.1.7

data/lib/vimamsa/key_binding_tree.rb

@@ -53,7 +53,7 @@ end
 
 class KeyBindingTree
   attr_accessor :C, :I, :cur_state, :root, :match_state, :last_action, :cur_action
-  attr_reader :mode_root_state, :state_trail
+  attr_reader :mode_root_state, :state_trail, :act_bindings
 
   def initialize()
     @modes = {}
@@ -67,6 +67,10 @@ class KeyBindingTree
 
     @modifiers = [] # TODO: create a queue
     @last_event = [nil, nil, nil, nil, nil]
+
+    @override_keyhandling_callback = nil
+    # Allows h["foo"]["faa"]=1
+    @act_bindings = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
   end
 
   def set_default_mode(label)
@@ -110,6 +114,14 @@ class KeyBindingTree
     return nil
   end
 
+  def set_keyhandling_override(_callback)
+    @override_keyhandling_callback = _callback
+  end
+
+  def remove_keyhandling_override()
+    @override_keyhandling_callback = nil
+  end
+
   def match(key_name)
     new_state = []
     @match_state.each { |parent|
@@ -129,9 +141,7 @@ class KeyBindingTree
         end
       }
     }
-    if key_name == "o"
-      # Ripl.start :binding => binding
-    end
+
 
     if new_state.any? # Match found
       @match_state = new_state
@@ -242,8 +252,10 @@ class KeyBindingTree
     # $cur_key_dict = $key_bind_dict[$context[:mode]]
     print "MATCH KEY CONF: #{[c, translated_c]}" if $debug
 
-    # Sometimes we get ASCII-8BIT encoding although content actually UTF-8
-    c = c.force_encoding("UTF-8");  # TODO:correct?
+    if !@override_keyhandling_callback.nil?
+      ret = @override_keyhandling_callback.call(c, event_type)
+      return if ret
+    end
 
     eval_s = nil
 
@@ -306,7 +318,6 @@ class KeyBindingTree
       # act_s = cstate.action.to_s if cstate.action != nil
       # puts "  #{cstate.to_s} #{act_s}"
       # end
-      # Ripl.start :binding => binding
       # new_state[0].children.collect{|x|x.to_s}
     end
 
@@ -328,7 +339,7 @@ class KeyBindingTree
 
       printf("\n") if $debug
     else
-    
+
       # Don't execute action if one of the states has children
       state_with_children = new_state.select { |s| s.children.any? }
       s_act = new_state.select { |s| s.action != nil }
@@ -432,7 +443,7 @@ class KeyBindingTree
       @last_event = event #TODO: outside if?
     end
 
-    # qt_refresh_cursor
+    # 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
@@ -484,6 +495,7 @@ class KeyBindingTree
 
     modes.each { |mode_id|
       mode_bind_key(mode_id, keydef, action)
+      @act_bindings[mode_id][action] = keydef
     }
   end
 

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -0,0 +1,260 @@
+
+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 "C , j r", :jump_to_random
+bindkey "I enter", :insert_new_line
+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 , 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", :gui_select_buffer
+# 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 , , 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
+bindkey "B z", "center_on_current_line();call(: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 s", :page_up
+bindkey "B d", :page_down
+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", :invoke_grep_search
+#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)},""]
+
+default_keys = {
+
+  # File handling
+  "C ctrl-s" => :buf_save,
+
+  # 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 , b" => '$kbd.set_mode("S");gui_select_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)",
+
+  "VC pagedown" => "page_down",
+  "VC pageup" => "page_up",
+
+  "VCI left" => "buf.move(BACKWARD_CHAR)",
+  "VCI right" => "buf.move(FORWARD_CHAR)",
+  "VCI down" => "buf.move(FORWARD_LINE)",
+  "VCI 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)",
+  "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>)',
+  "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)",
+  # 'C 0'=> 'buf.jump(BEGINNING_OF_LINE)',
+  "VC g g" => "buf.jump(START_OF_BUFFER)",
+  "VC g ;" => "buf.jump_to_last_edit",
+  "VC G" => "buf.jump(END_OF_BUFFER)",
+  #    'VC z z' => 'center_on_current_line',
+  "VC *" => "buf.jump_to_next_instance_of_word",
+
+  "C , e" => "invoke_command", # Currently eval
+
+  "VC /" => :find_in_buffer,
+
+  # READCHAR bindings
+
+  "R <char>" => "readchar_new_char(<char>)",
+
+  "C n" => "$search.jump_to_next()",
+  "C N" => "$search.jump_to_previous()",
+
+  # Debug
+  "C , d r p" => "start_ripl",
+  "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",
+  "VC O" => "buf.jump(END_OF_LINE)",
+  "VC $" => "buf.jump(END_OF_LINE)",
+
+  "C o" => 'buf.jump(END_OF_LINE);buf.insert_txt("\n");$kbd.set_mode(:insert)',
+  "C X" => 'buf.jump(END_OF_LINE);buf.insert_txt("\n");',
+  "C A" => "buf.jump(END_OF_LINE);$kbd.set_mode(:insert)",
+  "C I" => "buf.jump(FIRST_NON_WHITESPACE);$kbd.set_mode(:insert)",
+  "C a" => "buf.move(FORWARD_CHAR);$kbd.set_mode(:insert)",
+  "C J" => "buf.join_lines()",
+  "C u" => "buf.undo()",
+
+  "C ^" => "buf.jump(BEGINNING_OF_LINE)",
+  "C /[1-9]/" => "set_next_command_count(<char>)",
+
+  # Command mode only:
+  "C ctrl-r" => "buf.redo()", # TODO:???
+  "C R" => "buf.redo()",
+  "C v" => "buf.start_visual_mode",
+  "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 d k'=> 'delete_line(BACKWARD)', #TODO
+  # 'C d j'=> 'delete_line(FORWARD)', #TODO
+  # 'C d d'=> 'buf.delete_cur_line',
+  "C d e" => "buf.delete2(:to_word_end)",
+  "C d O" => "buf.delete2(:to_line_end)",
+  "C d $" => "buf.delete2(:to_line_end)",
+  #    'C d e'=> 'buf.delete_to_next_word_end',
+  "C d <num> e" => "delete_next_word",
+  "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 , p <char>" => "buf.paste(BEFORE,<char>)", # TODO
+
+  "C ctrl-c" => "buf.comment_line()",
+  "C ctrl-x" => "buf.comment_line(:uncomment)",
+
+  # '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" => "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 x" => "buf.delete(SELECTION)",
+  # "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>)",
+  'CV \' <char>' => "buf.jump_to_mark(<char>)",
+  # "CV ''" =>'jump_to_mark(NEXT_MARK)', #TODO
+
+  "C i" => "$kbd.set_mode(:insert)",
+  "C ctrl!" => "$kbd.set_mode(:insert)",
+
+  # 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 , 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!" => "$kbd.set_mode(:command)",
+  "C shift!" => "buf.save",
+  "I <char>" => "buf.insert_txt(<char>)",
+  "I esc" => "$kbd.set_mode(:command)",
+
+  "I ctrl-d" => "buf.delete2(:to_word_end)",
+
+  # INSERT MODE: Moving
+  "I ctrl-a" => "buf.jump(BEGINNING_OF_LINE)",
+  "I ctrl-b" => "buf.move(BACKWARD_CHAR)",
+  "I ctrl-f" => "buf.move(FORWARD_CHAR)",
+  "I ctrl-n" => "buf.move(FORWARD_LINE)",
+  "I ctrl-p" => "buf.move(BACKWARD_LINE)",
+  "I ctrl-e" => "buf.jump(END_OF_LINE)", # context: mode:I, buttons down: {C}
+  "I alt-f" => "buf.jump_word(FORWARD,WORD_START)",
+  "I alt-b" => "buf.jump_word(BACKWARD,WORD_START)",
+
+  "I tab" => 'buf.insert_txt("	")',
+  "I space" => 'buf.insert_txt(" ")',
+#  "I return" => 'buf.insert_new_line()',
+}
+
+default_keys.each { |key, value|
+  bindkey(key, value)
+}
+
+

data/lib/vimamsa/macro.rb

@@ -58,7 +58,7 @@ class Macro
     $macro_search_list = l
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
 
-    qt_select_update_window(l, $select_keys.collect { |x| x.upcase },
+    gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
                             "gui_find_macro_select_callback",
                             "gui_find_macro_update_callback")
   end

data/lib/vimamsa/main.rb

@@ -28,7 +28,6 @@ $search_dirs = []
 $errors = []
 
 $cur_register = "a"
-$input_char_call_func = nil
 $debuginfo = {}
 
 $jump_sequence = []
@@ -51,7 +50,7 @@ end
 
 require "vimamsa/editor.rb"
 
-# load "qt_funcs.rb"
+# load "gui_funcs.rb"
 
 $vma = Editor.new
 def vma()