vimamsa 0.1.22 → 0.1.23

data/lib/vimamsa/gui_settings.rb

@@ -0,0 +1,155 @@
+SETTINGS_DEFS = [
+  {
+    :label => "Tab / Indent",
+    :settings => [
+      { :key => [:tab, :width], :label => "Tab width", :type => :int, :min => 1, :max => 16, :step => 1 },
+      { :key => [:tab, :to_spaces_default], :label => "Use spaces instead of tabs (default)", :type => :bool },
+      { :key => [:indent_based_on_last_line], :label => "Auto-indent based on last line", :type => :bool },
+    ],
+  },
+  {
+    :label => "Font",
+    :settings => [
+      { :key => [:font, :family], :label => "Font family", :type => :string },
+      { :key => [:font, :size], :label => "Font size (pt)", :type => :int, :min => 4, :max => 72, :step => 1 },
+    ],
+  },
+  {
+    :label => "Appearance",
+    :settings => [
+      { :key => [:match, :highlight, :color], :label => "Search highlight color", :type => :string },
+      { :key => [:kbd, :show_prev_action], :label => "Show previous action in toolbar", :type => :bool },
+    ],
+  },
+  {
+    :label => "Behavior",
+    :settings => [
+      { :key => [:lsp, :enabled], :label => "Enable LSP (Language Server)", :type => :bool },
+      { :key => [:experimental], :label => "Enable experimental features", :type => :bool },
+      { :key => [:macro, :animation_delay], :label => "Macro animation delay (sec)", :type => :float, :min => 0.0, :max => 2.0, :step => 0.0001 },
+    ],
+  },
+]
+
+class SettingsDialog
+  def initialize
+    @widgets = {}
+    @window = Gtk::Window.new
+    @window.set_transient_for($vmag.window) if $vmag&.window
+    @window.modal = true
+    @window.title = "Preferences"
+    @window.default_width = 500
+
+    outer = Gtk::Box.new(:vertical, 12)
+    # outer.margin = 16
+    @window.set_child(outer)
+
+    notebook = Gtk::Notebook.new
+    outer.append(notebook)
+
+    SETTINGS_DEFS.each do |section|
+      grid = Gtk::Grid.new
+      grid.row_spacing = 10
+      grid.column_spacing = 16
+      grid.margin_top = 12
+      grid.margin_bottom = 12
+      grid.margin_start = 12
+      grid.margin_end = 12
+
+      section[:settings].each_with_index do |s, row|
+        label = Gtk::Label.new(s[:label])
+        label.halign = :start
+        label.hexpand = true
+
+        widget = make_widget(s)
+        @widgets[s[:key]] = { :widget => widget, :type => s[:type] }
+
+        grid.attach(label, 0, row, 1, 1)
+        grid.attach(widget, 1, row, 1, 1)
+      end
+
+      notebook.append_page(grid, Gtk::Label.new(section[:label]))
+    end
+
+    hbox = Gtk::Box.new(:horizontal, 8)
+    hbox.halign = :end
+
+    cancel_btn = Gtk::Button.new(:label => "Cancel")
+    save_btn = Gtk::Button.new(:label => "Save")
+    cancel_btn.signal_connect("clicked") { @window.destroy }
+    save_btn.signal_connect("clicked") { save_and_close }
+
+    hbox.append(cancel_btn)
+    hbox.append(save_btn)
+    outer.append(hbox)
+
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+    @window.add_controller(press)
+    press.signal_connect("key-pressed") do |_g, keyval, _kc, _y|
+      if keyval == Gdk::Keyval::KEY_Escape
+        @window.destroy
+        true
+      else
+        false
+      end
+    end
+  end
+
+  def make_widget(s)
+    cur = get(s[:key])
+    case s[:type]
+    when :bool
+      w = Gtk::Switch.new
+      w.active = cur == true
+      w.valign = :center
+      w
+    when :int
+      adj = Gtk::Adjustment.new(cur.to_f, s[:min].to_f, s[:max].to_f, s[:step].to_f, s[:step].to_f * 5, 0.0)
+      Gtk::SpinButton.new(adj, s[:step].to_f, 0)
+    when :float
+      adj = Gtk::Adjustment.new(cur.to_f, s[:min].to_f, s[:max].to_f, s[:step].to_f, s[:step].to_f * 5, 0.0)
+      digits = s[:step].to_s.split(".").last.to_s.length
+      digits = 2 if digits < 2
+      Gtk::SpinButton.new(adj, s[:step].to_f, digits)
+    when :string
+      w = Gtk::Entry.new
+      w.text = cur.to_s
+      w
+    end
+  end
+
+  def save_and_close
+    @widgets.each do |key, info|
+      val = case info[:type]
+            when :bool   then info[:widget].active?
+            when :int    then info[:widget].value.to_i
+            when :float  then info[:widget].value.to_f
+            when :string then info[:widget].text
+            end
+      set(key, val)
+    end
+    save_settings_to_file
+    gui_refresh_font
+    @window.destroy
+  end
+
+  def run
+    @window.show
+  end
+end
+
+def show_settings_dialog
+  SettingsDialog.new.run
+end
+
+def gui_refresh_font
+  return unless $vmag
+  provider = Gtk::CssProvider.new
+  provider.load(data: "textview { font-family: #{get(cnf.font.family)}; font-size: #{get(cnf.font.size)}pt; }")
+  for _k, window in $vmag.windows
+    view = window[:sw].child
+    next if view.nil?
+    view.style_context.add_provider(provider)
+  end
+end

data/lib/vimamsa/gui_sourceview.rb

@@ -2,7 +2,6 @@
 class VSourceView < GtkSource::View
   attr_accessor :bufo, :autocp_active, :cpl_list
 
-
   # def initialize(title = nil,bufo=nil)
   def initialize(title, bufo)
     # super(:toplevel)
@@ -19,6 +18,7 @@ class VSourceView < GtkSource::View
     @tt = nil
 
     # Mainly after page-up or page-down
+
     signal_connect("move-cursor") do |widget, event|
       # if event.name == "GTK_MOVEMENT_PAGES" and (vma.actions.last_action == "page_up" or vma.actions.last_action == "page_down")
       # handle_scrolling()
@@ -174,9 +174,24 @@ class VSourceView < GtkSource::View
       i = coord_to_iter(x, y, true)
       pp i
       @range_start = i
+      @drag_start_x = x
+      @drag_start_y = y
       buf.start_selection
     end
 
+    @cnt_drag.signal_connect "drag-update" do |gesture, offset_x, offset_y|
+      next unless @range_start
+      cur_x = @drag_start_x + offset_x
+      cur_y = @drag_start_y + offset_y
+      debug "drag-update 2 #{cur_x} #{cur_y}"
+      i = coord_to_iter(cur_x, cur_y, true)
+      @bufo.set_pos(i) if !i.nil? and @last_iter != i
+      if !i.nil? and (@range_start - i).abs >= 2
+      vma.kbd.set_mode(:visual)
+      end
+      @last_iter = i
+    end
+
     @cnt_drag.signal_connect "drag-end" do |gesture, offsetx, offsety|
       debug "drag-end", 2
       if offsetx.abs < 5 and offsety.abs < 5
@@ -186,8 +201,7 @@ class VSourceView < GtkSource::View
       elsif vma.kbd.get_scope != :editor
         # Can't transition from editor wide mode to buffer specific mode
         vma.kbd.set_mode(:visual)
-      else
-        buf.end_selection
+      else # The normal case
       end
       @range_start = nil
     end
@@ -199,6 +213,19 @@ class VSourceView < GtkSource::View
     @click = click
 
     @range_start = nil
+
+    # Handle right click
+    rightclick = Gtk::GestureClick.new
+    rightclick.button = 3
+    self.add_controller(rightclick)
+    rightclick.signal_connect "pressed" do |gesture, n_press, x, y, z|
+      puts "SourceView, GestureClick rightclick released button=#{gesture.button} x=#{x} y=#{y}"
+      if gesture.button == 3
+        show_context_menu(x, y)
+        next true
+      end
+    end
+
     click.signal_connect "pressed" do |gesture, n_press, x, y, z|
       debug "SourceView, GestureClick released x=#{x} y=#{y}"
 
@@ -219,11 +246,19 @@ class VSourceView < GtkSource::View
       end
 
       @bufo.set_pos(i) if !i.nil?
+      if n_press == 2
+        #TODO: refactor to have one function for all line actions
+        if @bufo.module&.respond_to?(:select_line)
+          @bufo.module.select_line
+        else
+          @bufo.cur_nonwhitespace_word_action()
+        end
+      end
       true
     end
 
     click.signal_connect "released" do |gesture, n_press, x, y, z|
-      debug "SourceView, GestureClick released x=#{x} y=#{y}"
+      debug "SourceView, GestureClick released x=#{x} y=#{y} button=#{gesture.button}"
 
       xloc = (x - gutter_width).to_i
       yloc = (y + visible_rect.y).to_i
@@ -587,7 +622,7 @@ class VSourceView < GtkSource::View
 
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
-    ctype = :visual if vma.buf.selection_active?
+    ctype = :visual if @bufo.selection_active?
 
     if [:command, :replace, :browse].include?(ctype)
       set_cursor_color(ctype)
@@ -632,5 +667,44 @@ class VSourceView < GtkSource::View
       self.cursor_visible = true
     end
   end #end draw_cursor
-end
 
+  CONTEXT_MENU_ITEMS = [
+    ["Paste", :paste_after_cursor],
+    ["Previous buffer", :history_switch_backwards],
+  ]
+
+  CONTEXT_MENU_ITEMS_SELECTION = [
+    ["Copy", :copy_selection],
+    ["Cut", :cut_selection],
+  ]
+
+  def init_context_menu
+    all_items = CONTEXT_MENU_ITEMS + CONTEXT_MENU_ITEMS_SELECTION
+    all_items.each do |label, action_id|
+      actkey = "ctx_#{action_id}"
+      unless vma.gui.app.lookup_action(actkey)
+        act = Gio::SimpleAction.new(actkey)
+        vma.gui.app.add_action(act)
+        act.signal_connect("activate") do
+          call_action(action_id)
+          after_action
+        end
+      end
+    end
+    @context_menu = Gtk::PopoverMenu.new
+    @context_menu.set_parent(self)
+    @context_menu.has_arrow = false
+  end
+
+  def show_context_menu(x, y)
+    init_context_menu if @context_menu.nil?
+    menu = Gio::Menu.new
+    CONTEXT_MENU_ITEMS.each { |label, action_id| menu.append(label, "app.ctx_#{action_id}") }
+    if @bufo.selection_active?
+      CONTEXT_MENU_ITEMS_SELECTION.each { |label, action_id| menu.append(label, "app.ctx_#{action_id}") }
+    end
+    @context_menu.set_menu_model(menu)
+    @context_menu.set_pointing_to(Gdk::Rectangle.new(x.to_i, y.to_i, 1, 1))
+    @context_menu.popup
+  end
+end

data/lib/vimamsa/key_actions.rb

@@ -35,9 +35,19 @@ reg_act(:lsp_jump_to_definition, proc { vma.buf.lsp_jump_to_def }, "LSP jump to
 
 reg_act(:eval_buf, proc { vma.buf.eval_whole_buf }, "Eval whole current buffer as ruby code (DANGEROUS)")
 
+reg_act(:show_settings, proc { show_settings_dialog }, "Show settings")
+reg_act(:cut_selection, proc { buf.delete(SELECTION) }, "Cut selection to clipboard")
+
+reg_act(:insert_backspace, proc { buf.selection_active? ? buf.delete(SELECTION) : buf.delete(BACKWARD_CHAR) }, "Delete backwards")
+reg_act(:insert_select_up, proc { insert_select_move(BACKWARD_LINE) }, "Select texte upwards")
+reg_act(:insert_select_down, proc { insert_select_move(BACKWARD_CHAR) }, "Select text downwards")
+
+reg_act(:copy_selection, proc { buf.copy_active_selection }, "Copy selection to clipboard")
 reg_act(:enable_debug, proc { cnf.debug = true }, "Enable debug")
 reg_act(:disable_debug, proc { cnf.debug = false }, "Disable debug")
 
+reg_act(:experimental_eval, proc { bindkey "V , e", "vma.buf.convert_selected_text(:eval)" }, "Enable key binding:\"[VISUAL] , e:\" Eval selected text")
+
 reg_act(:easy_jump, proc { EasyJump.start }, "Easy jump")
 reg_act(:gui_ensure_cursor_visible, proc { vma.gui.view.ensure_cursor_visible }, "Scroll to current cursor position")
 reg_act(:gui_refresh_cursor, proc { vma.buf.refresh_cursor }, "Refresh cursor")
@@ -46,17 +56,18 @@ 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, :basic] })
-reg_act(:e_move_backward_char, "e_move_backward_char", "", { :group => [:move, :basic] })
+reg_act(:e_move_forward_char, "e_move_forward_char", "Move forward", { :group => [:move, :basic] })
+reg_act(:e_move_backward_char, "e_move_backward_char", "Move forward", { :group => [:move, :basic] })
 # reg_act(:history_switch_backwards, proc{bufs.history_switch_backwards}, "", { :group => :file })
-reg_act(:history_switch_backwards, proc{bufs.history_switch(-1)}, "", { :group => :file })
-reg_act(:history_switch_forwards, proc{bufs.history_switch(+1)}, "", { :group => :file })
+reg_act(:history_switch_backwards, proc{bufs.history_switch(-1)}, "Prev buffer", { :group => :file })
+reg_act(:history_switch_forwards, proc{bufs.history_switch(+1)}, "Next buffer", { :group => :file })
+reg_act(:print_buffer_access_list, proc { bufs.print_by_access_time }, "Print buffers by access time", { :group => :file })
 reg_act(:center_on_current_line, "center_on_current_line", "", { :group => :view })
 reg_act(:run_last_macro, proc { vma.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_next_edit, "jump_to_next_edit", "Jump to next edit pos")
+reg_act(:jump_to_last_edit, proc { buf.jump_to_last_edit }, "Jump to last edit pos")
 reg_act(:jump_to_random, proc { buf.jump_to_random_pos }, "")
-reg_act(:insert_new_line, proc { buf.insert_new_line() }, "")
+reg_act(:insert_new_line, proc { buf.insert_new_line() }, "Insert new line")
 reg_act(:show_key_bindings, proc { show_key_bindings }, "Show key bindings")
 reg_act(:put_file_path_to_clipboard, proc { buf.put_file_path_to_clipboard }, "Put file path of current file to clipboard")
 reg_act(:put_file_ref_to_clipboard, proc { buf.put_file_ref_to_clipboard }, "Put file ref of current file to clipboard")
@@ -67,11 +78,15 @@ reg_act(:set_unencrypted, proc { buf.set_unencrypted }, "Set current file to sav
 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")
-reg_act(:comment_selection, proc { buf.comment_selection }, "")
+reg_act(:toggle_file_panel, proc { vma.gui.toggle_file_panel }, "Toggle file panel")
+reg_act(:comment_selection, proc { buf.comment_selection }, "Comment selection")
 reg_act(:delete_char_forward, proc { buf.delete(CURRENT_CHAR_FORWARD) }, "Delete char forward", { :group => [:edit, :basic] })
 reg_act(:gui_file_finder, proc { vma.FileFinder.start_gui }, "Fuzzy file finder")
 reg_act(:gui_file_history_finder, proc { vma.FileHistory.start_gui }, "Fuzzy file history finder")
 reg_act(:gui_search_replace, proc { gui_search_replace }, "Search and replace")
+reg_act(:find_next, proc { $search.jump_to_next() }, "Find next")
+
+
 reg_act(:set_style_bold, proc { buf.style_transform(:bold) }, "Set text weight to bold")
 reg_act(:set_style_link, proc { buf.style_transform(:link) }, "Set text as link")
 reg_act(:V_join_lines, proc { vma.buf.convert_selected_text(:joinlines) }, "Join lines")
@@ -87,8 +102,10 @@ reg_act(:clear_line_styles, proc { buf.set_line_style(:clear) }, "Clear styles o
 reg_act(:gui_select_buffer, proc { vma.kbd.set_mode("S"); gui_select_buffer }, "Select buffer")
 reg_act :open_file_dialog, "open_file_dialog", "Open file"
 reg_act :minibuffer_end, proc { minibuffer_end }
-reg_act(:invoke_replace, "invoke_replace", "")
+reg_act(:invoke_replace, "invoke_replace", "Invoke replace")
 reg_act(:diff_buffer, "diff_buffer", "")
+reg_act(:git_diff_buffer, proc { git_diff_buffer }, "Show git diff of current file")
+reg_act(:diff_buffer_jump_to_source, proc { diff_buffer_jump_to_source }, "Jump to corresponding line in source from 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
@@ -98,7 +115,7 @@ reg_act :delete_to_next_word_start, proc { buf.delete2(:to_next_word) }, "Delete
 reg_act :delete_to_line_start, proc { buf.delete2(:to_line_start) }, "Delete to line start", { :group => [:edit, :basic] }
 
 
-reg_act(:ack_search, proc { gui_ack }, "") 
+reg_act(:ack_search, proc { gui_ack }, "Ack") 
 
 reg_act(:copy_cur_line, proc {buf.copy_line}, "Copy the current line") 
 reg_act(:paste_before_cursor, proc {buf.paste(BEFORE)}, "Paste text before the cursor") 
@@ -119,6 +136,8 @@ reg_act(:move_next_line, proc { buf.move(FORWARD_LINE) }, "Move the cursor to th
 reg_act(:move_backward_char, proc { buf.move(BACKWARD_CHAR) }, "Move one character backward")
 reg_act(:start_visual_mode, proc { buf.start_selection;vma.kbd.set_mode(:visual) }, "Enter VISUAL mode (for selections)") 
 reg_act(:jump_last_edit, proc { buf.jump_to_last_edit }, "Jump to the last edit location")
+reg_act(:install_demo_files, proc { install_demo_files }, "Install and show Demo")
+reg_act(:reload_customrb, proc { reload_customrb }, "Reload custom.rb")
 
 
 reg_act :start_browse_mode, proc {
@@ -188,6 +207,9 @@ act_list = {
 
   :backward_line => { :proc => proc { buf.move(BACKWARD_LINE) },
                       :desc => "Move one line backward", :group => [:move, :basic] },
+                                             
+  :increment_word => { :proc => proc { buf.increment_current_word},
+                      :desc => "Increment word", :group => [:edit, :extra] },                                            
 
   # { :proc => proc {  },
   # :desc => "", :group => : },

data/lib/vimamsa/key_binding_tree.rb

@@ -19,7 +19,7 @@
 #
 
 class State
-  attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes, :level, :cursor_type, :keywords
+  attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes, :level, :cursor_type, :keywords, :root, :parent
   attr_reader :cur_mode, :scope
 
   def initialize(key_name, eval_rule = "", ctype = :command, scope: :buffer)
@@ -31,6 +31,8 @@ class State
     @keywords = []
     @action = nil
     @level = 0
+    @root = self # parent of a parent ... until mode root
+    @parent = nil
     @cursor_type = ctype
   end
 
@@ -55,6 +57,7 @@ class KeyBindingTree
     @last_action = nil
     @cur_action = nil
     @method_handles_repeat = false
+    @overwriting_state = nil # A branch which has priority over other branches
 
     @modifiers = { :ctrl => false, :shift => false, :alt => false } # TODO: create a queue
     @last_event = [nil, nil, nil, nil, nil]
@@ -68,8 +71,9 @@ class KeyBindingTree
     return if get_mode == :label
     @match_state = [@modes[label]] # used for matching input
     @mode_root_state = @modes[label]
-    # @default_mode = label
-    @default_mode_stack << label
+    
+    #TODO: should not happen? @default_mode_stack[-1] should be always the same as get_mode ?
+    @default_mode_stack << label if label != @default_mode_stack[-1]
 
     __set_mode(label)
     if !vma.buf.nil?
@@ -258,11 +262,17 @@ class KeyBindingTree
   end
 
   def set_state_to_root
+    # if root state is a minor mode
     if @mode_root_state.major_modes.size == 1
-      modelabel = @mode_root_state.major_modes[0]
-      mmode = @modes[modelabel]
-      @match_state = [@mode_root_state, mmode]
+      modelabel = @mode_root_state.major_modes[0] #TODO: support multiple inheritance?
+      parent_mode = @modes[modelabel]
+      # Have two branches for the matching (both major and minor modes)
+      # @mode_root_state = minor, parent_mode = major
+      @match_state = [@mode_root_state, parent_mode]
+      @overwriting_state = @mode_root_state # States from this branch have priority over others.
     else
+      # if root state is a major mode
+      @overwriting_state = nil
       @match_state = [@mode_root_state]
     end
 
@@ -378,7 +388,13 @@ class KeyBindingTree
           mmid = st.major_modes.first
           trailpfx = "#{@modes[mmid].to_s}>"
         end
-        s_trail << "[#{trailpfx}#{st.to_s}]"
+        mode_str = st.to_s
+        mode_str = "COMMAND" if mode_str == "C"
+        mode_str = "INSERT" if mode_str == "I"
+        mode_str = "VISUAL" if mode_str == "V"
+        mode_str = "BROWSE" if mode_str == "B"
+
+        s_trail << "[#{trailpfx}#{mode_str}]"
       else
         s_trail << " #{st.to_s}"
       end
@@ -491,7 +507,31 @@ class KeyBindingTree
       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?
+      # Multiple matching states/modes (search has forked)
+      if new_state.size > 1
+        # puts "AAA"
+        # Conflict: One of them has actions (matching should stop),
+        # another has children (matching should continue)
+        if s_act.any? and state_with_children.any?
+          # puts "AAA1"
+          a = s_act[0]
+          b = state_with_children[0]
+          # Running major+minor mode. Minor mode overwriting the major mode
+          if a.root == @overwriting_state or b.root == @overwriting_state
+            # puts "AAA3:del"
+            # Remove those states not belonging to the overwriting branch (minor mode)
+            [s_act, state_with_children, new_state].each { |z| z.delete_if { |x| x.root != @overwriting_state } }
+          end
+        end
+      end
+      # new_state[0].root.key_name
+
+      if s_act.any? and state_with_children.any?
+        # debug "Conflict: s_act.any? and state_with_children.any?"
+        # require "pry"; binding.pry
+      end
+
+      if s_act.any? and !state_with_children.any?
         eval_s = s_act.first.action if eval_s == nil
         # if eval_s.to_s.match(/end_recording/)
         # require "pry"; binding.pry
@@ -625,6 +665,8 @@ class KeyBindingTree
         end
         s1 = new_state
         @cur_state.children << new_state
+        new_state.root = @cur_state.root
+        new_state.parent = @cur_state
       end
 
       set_state(key_name, eval_rule) # TODO: check is ok?
@@ -639,6 +681,7 @@ class KeyBindingTree
   end
 
   def handle_key_bindigs_action(action, c)
+    trail_str = get_state_trail_str[0]
     # $acth << action #TODO:needed here?
     @method_handles_repeat = false #TODO:??
     n = 1
@@ -685,6 +728,21 @@ class KeyBindingTree
     if !(action.class == String and action.include?("set_next_command_count"))
       @next_command_count = nil
     end
+
+    if cnf.kbd.show_prev_action? and trail_str.class==String
+      len_limit = 35
+      action_desc = "UNK"
+      if action.class == String && (m = action.match(/\Abuf\.insert_txt\((.+)\)\z/))
+        char_part = m[1].gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
+        action_desc = "insert #{char_part}"
+        puts action_desc.inspect
+      else
+        action_desc = vma.actions[action]&.method_name || action.to_s
+        action_desc = action_desc[0..len_limit] if action_desc.size > len_limit
+      end
+      trail_str = trail_str.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
+      vma.gui.action_trail_label.markup = "<span weight='bold'>#{action_desc}|#{trail_str}</span>"
+    end
   end
 end
 
@@ -734,6 +792,12 @@ def show_key_bindings()
   done.concat(x.lines); kbd_s << x
   kbd_s << "\n"
 
+  kbd_s << "◼ Hyper Plaintext\n"
+  x = vma.kbd.get_by_keywords(modes: ["C"], keywords: ["hyperplaintext"])
+  x2 = vma.kbd.get_by_keywords(modes: ["V"], keywords: ["hyperplaintext"])
+  done.concat(x.lines); kbd_s << x << "\n" << x2
+  kbd_s << "\n"
+
   kbd_s << "◼ Core\n"
   x = vma.kbd.get_by_keywords(modes: [], keywords: ["core"])
   x << vma.kbd.get_by_keywords(modes: ["X"], keywords: ["intro"])