vimamsa 0.1.5 → 0.1.8

data/lib/vimamsa/{default_key_bindings.rb → key_actions.rb}

@@ -1,4 +1,3 @@
-
 def e_move_forward_char
   buf.move(FORWARD_CHAR)
 end
@@ -29,249 +28,133 @@ def is_visual_mode()
   return 0
 end
 
-reg_act(:easy_jump, proc { easy_jump(:visible_area) }, "Easy jump")
-bindkey "VC s", :easy_jump
-
-reg_act(:savedebug, "savedebug", "Save debug info")
-
-# reg_act(:file_finder, "gui_file_finder", "Fuzzy file finder")
-
-reg_act(:open_file_dialog, "open_file_dialog", "Open file")
-reg_act(:create_new_file, "create_new_file", "Create new file")
-reg_act(:backup_all_buffers, "backup_all_buffers", "Backup all buffers")
-reg_act(:invoke_ack_search, "invoke_ack_search", "Invoke ack search")
-reg_act(:e_move_forward_char, "e_move_forward_char", "")
-reg_act(:e_move_backward_char, "e_move_backward_char", "")
-reg_act(:history_switch_backwards, "history_switch_backwards", "")
-reg_act(:history_switch_forwards, "history_switch_forwards", "")
-
-reg_act(:center_on_current_line, "center_on_current_line", "")
-
-# a = Action.new(:transform_upcase, "Transform selection upcase", proc{ buf.transform_selection(:upcase)  } , [:selection]) 
-
-reg_act(:run_last_macro, proc { $macro.run_last_macro }, "Run last recorded or executed macro")
-bindkey ["VCB M","B m"], :run_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"]
-
 
+reg_act(:enable_debug, proc { $debug=true }, "Enable debug")
+reg_act(:disable_debug, proc {$debug=false }, "Disable debug")
+
+reg_act(:easy_jump, proc { EasyJump.start }, "Easy jump")
+reg_act(:savedebug, "savedebug", "Save debug info", { :group => :debug })
+reg_act(:open_file_dialog, "open_file_dialog", "Open file", { :group => :file })
+reg_act(:create_new_file, "create_new_file", "Create new file", { :group => :file })
+reg_act(:backup_all_buffers, proc{backup_all_buffers}, "Backup all buffers", { :group => :file })
+reg_act(:e_move_forward_char, "e_move_forward_char", "", { :group => :move })
+reg_act(:e_move_backward_char, "e_move_backward_char", "", { :group => :move })
+reg_act(:history_switch_backwards, "history_switch_backwards", "", { :group => :file })
+reg_act(:history_switch_forwards, "history_switch_forwards", "", { :group => :file })
+reg_act(:center_on_current_line, "center_on_current_line", "", { :group => :view })
+reg_act(:run_last_macro, proc { $macro.run_last_macro }, "Run last recorded or executed macro", { :group => :macro })
 reg_act(:jump_to_next_edit, "jump_to_next_edit", "")
 reg_act(:jump_to_last_edit, proc { buf.jump_to_last_edit }, "")
-
-
 reg_act(:jump_to_random, proc { buf.jump_to_random_pos }, "")
-bindkey "C , j r", :jump_to_random
-
-reg_act(:insert_new_line, proc { buf.insert_new_line()}, "")
-bindkey "I enter", :insert_new_line
-
+reg_act(:insert_new_line, proc { buf.insert_new_line() }, "")
 reg_act(:show_key_bindings, proc { show_key_bindings }, "Show key bindings")
-bindkey "C , ; s k", :show_key_bindings #TODO: better binding
-
 reg_act(:put_file_path_to_clipboard, proc { buf.put_file_path_to_clipboard }, "Put file path of current file to clipboard")
-bindkey "C , , c b", :put_file_path_to_clipboard #TODO: better binding or remove?
-
 # reg_act(:encrypt_file, proc{buf.set_encrypted},"Set current file to encrypt on save")
 reg_act(:encrypt_file, proc { encrypt_cur_buffer }, "Set current file to encrypt on save")
-bindkey "C , , e", :encrypt_file #TODO: better binding
-
 reg_act(:set_unencrypted, proc { buf.set_unencrypted }, "Set current file to save unencrypted")
-bindkey "C , ; u", :set_unencrypted #TODO: better binding
-
-reg_act(:close_all_buffers, proc { bufs.close_all_buffers()  }, "Close all buffers")
-
+reg_act(:set_executable, proc { buf.set_executable }, "Set current file permissions to executable")
+reg_act(:close_all_buffers, proc { bufs.close_all_buffers() }, "Close all buffers")
 reg_act(:close_current_buffer, proc { bufs.close_current_buffer(true) }, "Close current buffer")
-bindkey "C , c b", :close_current_buffer
-
 reg_act(:comment_selection, proc { buf.comment_selection }, "")
-bindkey "V ctrl-c", :comment_selection
-
 reg_act(:delete_char_forward, proc { buf.delete(CURRENT_CHAR_FORWARD) }, "Delete char forward")
-bindkey "C x", :delete_char_forward
-
 reg_act(:load_theme, proc { load_theme }, "Load theme")
-bindkey "C , , l t", :load_theme
-
 reg_act(:gui_file_finder, proc { vma.FileFinder.start_gui }, "Fuzzy file finder")
-bindkey "C , f", :gui_file_finder
-
-
 reg_act(:gui_file_history_finder, proc { vma.FileHistory.start_gui }, "Fuzzy file history finder")
-bindkey "C , h", :gui_file_history_finder
-
-
 reg_act(:gui_search_replace, proc { gui_search_replace }, "Search and replace")
-bindkey "C , r r", :gui_search_replace
-bindkey "V , r r", :gui_search_replace
-
 reg_act(:set_style_bold, proc { buf.style_transform(:bold) }, "Set text weight to bold")
-bindkey "V , t b", :set_style_bold
-
 reg_act(:set_style_link, proc { buf.style_transform(:link) }, "Set text as link")
-bindkey "V , t l", :set_style_link
-
 reg_act(:V_join_lines, proc { vma.buf.convert_selected_text(:joinlines) }, "Join lines")
-bindkey "V J", :V_join_lines
-
-
 reg_act(:clear_formats, proc { buf.style_transform(:clear) }, "Clear style formats")
-bindkey "V , t c", :clear_formats
-
 reg_act(:set_line_style_heading, proc { buf.set_line_style(:heading) }, "Set style of current line as heading")
-bindkey "C , t h", :set_line_style_heading
-
 reg_act(:set_line_style_h1, proc { buf.set_line_style(:h1) }, "Set cur line as Heading 1")
-bindkey "C , t 1", :set_line_style_h1
 reg_act(:set_line_style_h2, proc { buf.set_line_style(:h2) }, "Set cur line as Heading 1")
-bindkey "C , t 2", :set_line_style_h2
 reg_act(:set_line_style_h3, proc { buf.set_line_style(:h3) }, "Set cur line as Heading 1")
-bindkey "C , t 3", :set_line_style_h3
 reg_act(:set_line_style_h4, proc { buf.set_line_style(:h4) }, "Set cur line as Heading 1")
-bindkey "C , t 4", :set_line_style_h4
-
-
 reg_act(:set_line_style_bold, proc { buf.set_line_style(:bold) }, "Set style of current line as bold")
-bindkey "C , t b", :set_line_style_bold
-
 reg_act(:set_line_style_title, proc { buf.set_line_style(:title) }, "Set style of current line as title")
-bindkey "C , t t", :set_line_style_title
-
 reg_act(:clear_line_styles, proc { buf.set_line_style(:clear) }, "Clear styles of current line")
-bindkey "C , t c", :clear_line_styles
-
 reg_act(:gui_select_buffer, proc { $kbd.set_mode("S"); gui_select_buffer }, "Select buffer")
-bindkey "C , b", :gui_select_buffer
-
 reg_act :open_file_dialog, "open_file_dialog", "Open file"
-# bindkey "C , f o", :open_file_dialog
-bindkey "CI ctrl-o", :open_file_dialog
-
 reg_act :minibuffer_end, proc { minibuffer_end }
-bindkey "M enter", :minibuffer_end
-
 reg_act(:invoke_replace, "invoke_replace", "")
 reg_act(:diff_buffer, "diff_buffer", "")
-
 # reg_act(:invoke_grep_search, proc{invoke_grep_search}, "")
 reg_act(:invoke_grep_search, proc { gui_grep }, "Grep current buffer")
-
-
 reg_act(:ack_search, proc { gui_ack }, "") #invoke_ack_search
-bindkey "C , a", :ack_search
-
 reg_act :update_file_index, proc { update_file_index }, "Update file index"
-
-
 reg_act :delete_to_word_end, proc { buf.delete2(:to_word_end) }, "Delete to file end"
-bindkey  "C d w", :delete_to_word_end
-
 reg_act :delete_to_line_start, proc { buf.delete2(:to_line_start) }, "Delete to line 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
-bindkey "B z", "center_on_current_line();call(:exit_browse_mode)"
-
 reg_act :start_browse_mode, proc { $kbd.set_mode(:browse); $kbd.set_default_mode(:browse) }, "Start browse mode"
-
-reg_act :exit_browse_mode, proc { bufs.add_current_buf_to_history();$kbd.set_mode(:command); $kbd.set_default_mode(:command)
+reg_act :exit_browse_mode, proc {
+  bufs.add_current_buf_to_history(); $kbd.set_mode(:command); $kbd.set_default_mode(:command)
 }, "Exit browse mode"
-#TODO: Need to deside which of these is best:
-bindkey "B enter || B return || B esc || B j || B ctrl!", :exit_browse_mode
-
-reg_act :page_down, proc {page_down}
-reg_act :page_up, proc {page_up}
-bindkey "B s", :page_up
-bindkey "B d", :page_down
-bindkey "B s", :page_up
-bindkey "B d", :page_down
-
-reg_act :jump_to_start_of_buffer, proc{buf.jump(START_OF_BUFFER)}, "Jump to start of buffer"
-reg_act :jump_to_end_of_buffer, proc{buf.jump(END_OF_BUFFER)}, "Jump to end of buffer"
-
-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}
 
+reg_act :page_down, proc { page_down }
+reg_act :page_up, proc { page_up }
+reg_act :jump_to_start_of_buffer, proc { buf.jump(START_OF_BUFFER) }, "Jump to start of buffer"
+reg_act :jump_to_end_of_buffer, proc { buf.jump(END_OF_BUFFER) }, "Jump to end of buffer"
 reg_act(:auto_indent_buffer, proc { buf.indent }, "Auto format buffer")
-bindkey "C , v", :auto_indent_buffer
-bindkey "C , , d", :savedebug
-bindkey "C , , u", :update_file_index
-
-bindkey "C , s a", "buf.save_as()"
-
-
-
-reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminal")
-
+reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminalL")
+reg_act(:execute_current_line_in_terminal_autoclose, proc { buf.execute_current_line_in_terminal(true) }, "Execute current line in terminal. Close after execution.")
 reg_act(:show_images, proc { hpt_scan_images() }, "Show images inserted with ⟦img:file.png⟧ syntax")
-
 reg_act(:delete_current_file, proc { bufs.delete_current_buffer() }, "Delete current file")
 
+act_list = {
+  # File handling
+  :buf_save => { :proc => proc { buf.save },
+                 :desc => "Save buffer", :group => :file },
 
-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)},""]
+  :buf_save_as => { :proc => proc { buf.save_as },
+                    :desc => "Save file as", :group => :file },
+  :buf_new => { :proc => proc { create_new_file() }, :desc => "Create a new file", :group => :file },
+  :buf_revert => { :proc => proc { buf.revert },
+                   :desc => "Reload file from disk", :group => :file },
+  :buf_backup => { :proc => proc { buf.backup() }, :desc => "Backup current file", :group => :file },
 
+  :edit_redo => { :proc => proc { buf.redo },
+                  :desc => "Redo edit", :group => :edit },
 
-# reg_act(:start_file_selector, proc { FileSelector.new.run; $kbd.set_mode(:file_exp) }, "File selector")
-# bindkey "C , j f", :start_file_selector
-# bindkey "C , f", :start_file_selector
+  :edit_undo => { :proc => proc { buf.undo },
+                  :desc => "Undo edit", :group => :edit },
 
-# $kbd.add_minor_mode('fexp', :file_exp, :command)
+  :find_in_buffer => { :proc => proc { invoke_search },
+                  :desc => "Find", :group => :edit },
 
-# bindkey  "fexp l" , [:fexp_right,proc{puts "==fexp_right=="},""]
-# bindkey  "fexp esc" , [:fexp_quit,proc{$kbd.set_mode(:command)},""]
-# bindkey  "fexp enter" , [:fexp_select,proc{buf.module.select_line},""]
 
-# bindkey "C , j j", [:mode_file_exp, proc{$kbd.set_mode(:file_exp)}, "fexp"]
+  # { :proc => proc {  },
+  # :desc => "", :group => : },
 
-#bindkey 'C z h', :history_switch_backwards
-#bindkey 'C z l', :history_switch_forwards
+  :search_actions => { :proc => proc { search_actions },
+                       :desc => "Search actions", :group => :search },
 
+  :quit => { :proc => proc { _quit },
+             :desc => "Quit", :group => :app },
 
-#TODO: Change these evals into  proc{}'s
-default_keys = {
+}
 
-  # File handling
-  "C ctrl-s" => "buf.save",
-  "C W" => "buf.save",
+for k, v in act_list
+  reg_act(k, v[:proc], v[:desc])
+end
+
+act_list_todo = {
 
   # Buffer handling
-  "C B" => "bufs.switch",
-  "C tab" => "bufs.switch_to_last_buf",
+  # : =>  {proc => proc {bufs.switch}, :desc => "", :group => :},
+  :buf_switch_to_last => { :proc => proc { bufs.switch_to_last_buf },
+                           :desc => "", :group => :file },
   #    'C , s'=> 'gui_select_buffer',
-  "C , r v b" => "buf.revert",
-  "C , c b" => "bufs.close_current_buffer",
+  :buf_revert => { :proc => proc { buf.revert },
+                   :desc => "Reload/revert file from disk", :group => :file },
+  :buf_close => { :proc => proc { bufs.close_current_buffer },
+                  :desc => "Close current file", :group => :file },
   #"C , b" => '$kbd.set_mode("S");gui_select_buffer',
-  "C , n b" => "create_new_file()",
-  "C , ." => "buf.backup()",
-  # "C , , ." => "backup_all_buffers()",
-  "VC , , s" => "search_actions()",
 
 
   # MOVING
   #    'VC h' => 'buf.move(BACKWARD_CHAR)',
-  "VC l" => "buf.move(FORWARD_CHAR)",
+  :m_forward_char => { :proc => proc { buf.move(FORWARD_CHAR) },
+                       :desc => "Move cursor one char forward",
+                       :group => :move },
   "VC j" => "buf.move(FORWARD_LINE)",
   "VC k" => "buf.move(BACKWARD_LINE)",
 
@@ -291,7 +174,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>)',
@@ -346,7 +229,6 @@ default_keys = {
   "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
@@ -380,7 +262,7 @@ default_keys = {
   # Visual mode only:
   "V esc" => "buf.end_visual_mode",
   "V ctrl!" => "buf.end_visual_mode",
-  "V y" => "buf.copy_active_selection",
+  "V y" => "buf.copy_active_selection(:foo)",
   "V g U" => "buf.transform_selection(:upcase)",
   "V g u" => "buf.transform_selection(:downcase)",
   "V g c" => "buf.transform_selection(:capitalize)",
@@ -405,20 +287,19 @@ 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
   "VC ;" => "repeat_last_find",
-  "CV Q" => "_quit",
   "CV ctrl-q" => "_quit",
   "CV , R" => "restart_application",
   "I ctrl!" => "$kbd.set_mode(:command)",
@@ -443,6 +324,6 @@ default_keys = {
 #  "I return" => 'buf.insert_new_line()',
 }
 
-default_keys.each { |key, value|
-  bindkey(key, value)
-}
+# default_keys.each { |key, value|
+# bindkey(key, value)
+# }

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,28 +114,34 @@ 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|
       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 key_name == "o"
-      # Ripl.start :binding => binding
-    end
+
 
     if new_state.any? # Match found
       @match_state = new_state
@@ -185,7 +195,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
 
@@ -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
 
@@ -293,20 +305,19 @@ 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}"
+      debug get_state_trail_str()
+      # # debug "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}"
+      # debug "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}"
+      # debug "  #{cstate.to_s} #{act_s}"
       # end
-      # Ripl.start :binding => binding
       # new_state[0].children.collect{|x|x.to_s}
     end
 
@@ -319,7 +330,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
@@ -328,21 +339,21 @@ 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 }
 
       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
@@ -354,7 +365,7 @@ class KeyBindingTree
   # Receive keyboard event from Qt
   def handle_key_event(event)
     start_profiler
-    # puts "GOT KEY EVENT: #{key.inspect}"
+    # debug "GOT KEY EVENT: #{key.inspect}"
     debug "GOT KEY EVENT:: #{event} #{event[2]}"
     debug "|#{event.inspect}|"
     $debuginfo["cur_event"] = event
@@ -381,11 +392,11 @@ class KeyBindingTree
       end
     end
 
-    # puts "----D------------"
-    # puts @modifiers.inspect
-    # puts event.inspect
-    # puts event[4] & ALTMODIFIER
-    # puts "-----------------"
+    # debug "----D------------"
+    # debug @modifiers.inspect
+    # debug event.inspect
+    # debug event[4] & ALTMODIFIER
+    # debug "-----------------"
 
     @modifiers.delete(keycode) if event_type == KEY_RELEASE
 
@@ -411,7 +422,7 @@ class KeyBindingTree
     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}|"
+    # debug "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
@@ -419,7 +430,7 @@ class KeyBindingTree
     key_str = " " if key_str == "space" # HACK
 
     # if keycode == @last_event[0] and event_type == KEY_RELEASE
-    # puts "KEY! key_str=|#{key_str}| prefixed_key_str=|#{prefixed_key_str}|"
+    # debug "KEY! key_str=|#{key_str}| prefixed_key_str=|#{prefixed_key_str}|"
     # end
 
     if key_str != "" or prefixed_key_str != ""
@@ -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
@@ -474,7 +485,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]
@@ -484,6 +495,7 @@ class KeyBindingTree
 
     modes.each { |mode_id|
       mode_bind_key(mode_id, keydef, action)
+      @act_bindings[mode_id][action] = keydef
     }
   end
 
@@ -556,10 +568,10 @@ class KeyBindingTree
       # debug("NameError with eval cmd #{action}: " + $!.to_s)
       # raise
     rescue Exception => e
-      puts "BACKTRACE"
-      puts e.backtrace
-      puts e.inspect
-      puts "BACKTRACE END"
+      debug "BACKTRACE"
+      debug e.backtrace
+      debug e.inspect
+      debug "BACKTRACE END"
       if $!.class == SystemExit
         exit
       else