vimamsa 0.1.23 → 0.1.25

data/lib/vimamsa/gui.rb

@@ -126,12 +126,11 @@ def gui_create_buffer(id, bufo)
 
   view.register_signals()
 
-  ssm = GtkSource::StyleSchemeManager.new
-  ssm.set_search_path(ssm.search_path << ppath("styles/"))
-  sty = ssm.get_scheme("molokai_edit")
+  sty = load_vimamsa_scheme
 
   buf1.highlight_matching_brackets = true
   buf1.style_scheme = sty
+  gui_apply_color_mode(sty) if sty
 
   view.set_highlight_current_line(true)
   view.set_show_line_numbers(true)
@@ -165,9 +164,6 @@ def gui_set_file_lang(id, lname)
   view.buffer.highlight_syntax = true
 end
 
-def gui_add_image(imgpath, pos)
-end
-
 # TODO:?
 def gui_select_window_close(arg = nil)
 end
@@ -198,7 +194,7 @@ end
 
 class VMAgui
   attr_accessor :buffers, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :sws, :two_c
-  attr_reader :two_column, :windows, :subtitle, :app, :active_window, :action_trail_label, :file_panel
+  attr_reader :two_column, :windows, :subtitle, :app, :active_window, :action_trail_label, :file_panel, :func_panel
 
   def initialize()
     @two_column = false
@@ -212,6 +208,13 @@ class VMAgui
     @img_resizer_active = false
     @windows = {}
     @app = nil
+    @entry_has_focus = false
+  end
+
+  # Called by embedded widgets (e.g. calculator entries) when a text entry
+  # gains or loses focus, so the vimamsa key handler knows to step aside.
+  def notify_entry_focus(active)
+    @entry_has_focus = active
   end
 
   def run
@@ -320,39 +323,131 @@ class VMAgui
   end
 
   def add_to_minibuf(msg)
-    # return #TODO:gtk4
-    startiter = @minibuf.buffer.get_iter_at(:offset => 0)
-    @minibuf.buffer.insert(startiter, "#{msg}\n")
-    @minibuf.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES), -1, false)
+    @minibuf_messages ||= []
+    @minibuf_messages.unshift(msg)
+    @minibuf_messages = @minibuf_messages.first(50)
+
+    @minibuf_label.label = msg
+    @minibuf_textview.buffer.text = @minibuf_messages.join("\n")
+
+    return if @minibuf_expanded
+
+    @minibuf_stack.visible_child_name = "label"
+    @minibuf_content.visible = true
+
+    @minibuf_vpane.position = @minibuf_vpane.height - 26
+    
+    GLib::Source.remove(@minibuf_hide_source) if @minibuf_hide_source
+    @minibuf_hide_source = GLib::Timeout.add(7000) do
+      @minibuf_content.visible = false
+      @minibuf_hide_source = nil
+      false
+    end
   end
 
-  def init_minibuffer()
-    # Init minibuffer
-    sw = Gtk::ScrolledWindow.new
-    sw.set_policy(:automatic, :automatic)
-    overlay = Gtk::Overlay.new
-    overlay.set_child(sw)
-    @vbox.attach(overlay, 0, 3, 2, 1)
-    sw.set_size_request(-1, 12)
-
-    view = VSourceView.new(nil, nil)
-    view.set_highlight_current_line(false)
-    view.set_show_line_numbers(false)
-    # view.set_buffer(buf1)
-    ssm = GtkSource::StyleSchemeManager.new
-    ssm.set_search_path(ssm.search_path << ppath("styles/"))
-    sty = ssm.get_scheme("molokai_edit")
-    view.buffer.highlight_matching_brackets = false #TODO
-    view.buffer.style_scheme = sty
+  def minibuf_toggle_expanded
+    @minibuf_expanded = !@minibuf_expanded
+    if @minibuf_expanded
+      GLib::Source.remove(@minibuf_hide_source) if @minibuf_hide_source
+      @minibuf_hide_source = nil
+      @minibuf_content.visible = true
+      @minibuf_stack.visible_child_name = "history"
+      run_as_idle proc {
+        pos = @minibuf_vpane.max_position - (@minibuf_history_height || 120)
+        @minibuf_vpane.position = [pos, 0].max
+      }
+    else
+      # Save height before collapsing so next open restores it
+      @minibuf_history_height = @minibuf_vpane.max_position - @minibuf_vpane.position
+      @minibuf_stack.visible_child_name = "label"
+      run_as_idle proc {
+        #TODO: automatic way of resizing doesn't work:
+        # h = [@minibuf_label.height, 24].max + 2
+        # @minibuf_vpane.position = @minibuf_vpane.max_position - h
+        @minibuf_vpane.position = @minibuf_vpane.height - 26
+      }
+      @minibuf_hide_source = GLib::Timeout.add(7000) do
+        @minibuf_content.visible = false
+        @minibuf_expanded = false
+        @minibuf_stack.visible_child_name = "label"
+        @minibuf_hide_source = nil
+        false
+      end
+    end
+  end
+
+  def show_message_history
+    minibuf_toggle_expanded
+  end
+
+  # ── editor-area helpers (delegates to @minibuf_vpane start child) ─────────
+
+  def editor_area
+    @minibuf_vpane.start_child
+  end
+
+  def set_editor_area(w)
+    @minibuf_vpane.set_start_child(w)
+  end
+
+  def init_minibuffer
+    @minibuf_messages = []
+    @minibuf_expanded = false
+    @minibuf_history_height = 120
+
+    css = "label.minibuf, textview.minibuf { color: #cdd6f4; font-family: Monospace; font-size: 10pt; padding: 3px 8px; background-color: #1e1e2e; }"
     provider = Gtk::CssProvider.new
-    # provider.load(data: "textview { font-family: Monospace; font-size: 11pt; }")
-    provider.load(data: "textview { font-family: Arial; font-size: 10pt; color:#eeeeee}")
-    view.style_context.add_provider(provider)
-    view.wrap_mode = :char
-    @minibuf = view
-    # startiter = view.buffer.get_iter_at(:offset => 0)
-    message("STARTUP")
-    sw.set_child(view)
+    provider.load(data: css)
+
+    # Collapsed view: single line, latest message
+    @minibuf_label = Gtk::Label.new("")
+    @minibuf_label.xalign = 0.0
+    @minibuf_label.hexpand = true
+    @minibuf_label.ellipsize = Pango::EllipsizeMode::END
+    @minibuf_label.add_css_class("minibuf")
+    @minibuf_label.style_context.add_provider(provider)
+
+    # Expanded view: scrollable history (fills whatever height the pane gives)
+    @minibuf_textview = Gtk::TextView.new
+    @minibuf_textview.editable = false
+    @minibuf_textview.cursor_visible = false
+    @minibuf_textview.wrap_mode = :word_char
+    @minibuf_textview.add_css_class("minibuf")
+    @minibuf_textview.style_context.add_provider(provider)
+    @minibuf_textview.vexpand = true
+
+    scroll = Gtk::ScrolledWindow.new
+    scroll.set_policy(:never, :automatic)
+    scroll.set_child(@minibuf_textview)
+    scroll.vexpand = true
+
+    @minibuf_stack = Gtk::Stack.new
+    @minibuf_stack.vhomogeneous = false
+    @minibuf_stack.transition_type = :crossfade
+    @minibuf_stack.transition_duration = 100
+    @minibuf_stack.add_named(@minibuf_label, "label")
+    @minibuf_stack.add_named(scroll, "history")
+
+    @minibuf_content = Gtk::Box.new(:vertical, 0)
+    @minibuf_content.append(Gtk::Separator.new(:horizontal))
+    @minibuf_content.append(@minibuf_stack)
+    @minibuf_content.visible = false  # hidden until first message
+
+    # Vertical pane: editor fills top, minibuffer sits at bottom, draggable
+    editor_w = @windows[1][:overlay]
+    @vbox.remove(editor_w)
+
+    @minibuf_vpane = Gtk::Paned.new(:vertical)
+    @minibuf_vpane.vexpand = true
+    @minibuf_vpane.hexpand = true
+    @minibuf_vpane.resize_start_child = true   # editor absorbs window resize
+    @minibuf_vpane.resize_end_child = false    # minibuffer keeps its height
+    @minibuf_vpane.shrink_end_child = true     # allow fully collapsing minibuffer
+    @minibuf_vpane.set_start_child(editor_w)
+    @minibuf_vpane.set_end_child(@minibuf_content)
+
+    @vbox.attach(@minibuf_vpane, 0, 2, 2, 1)
+    @minibuf_hide_source = nil
   end
 
   def make_header_button(action_id, icon, cb)
@@ -373,16 +468,17 @@ class VMAgui
     file_box.style_context.add_class("linked")
     file_box.append(make_header_button("hdr-open", "document-open-symbolic", proc { open_file_dialog }))
     file_box.append(make_header_button("hdr-save", "document-save-symbolic", proc { buf.save }))
-    file_box.append(make_header_button("hdr-new",  "document-new-symbolic",  proc { create_new_file }))
+    file_box.append(make_header_button("hdr-new", "document-new-symbolic", proc { create_new_file }))
     header.pack_start(file_box)
 
     nav_box = Gtk::Box.new(:horizontal, 0)
     nav_box.style_context.add_class("linked")
-    nav_box.append(make_header_button("hdr-prev",  "pan-start-symbolic", proc { history_switch_backwards }))
-    nav_box.append(make_header_button("hdr-next",  "pan-end-symbolic",   proc { history_switch_forwards }))
+    nav_box.append(make_header_button("hdr-prev", "pan-start-symbolic", proc { history_switch_backwards }))
+    nav_box.append(make_header_button("hdr-next", "pan-end-symbolic", proc { history_switch_forwards }))
+    nav_box.append(make_header_button("hdr-close", "window-close-symbolic", proc { bufs.close_current_buffer }))
     header.pack_start(nav_box)
 
-    header.pack_end(make_header_button("hdr-close", "window-close-symbolic", proc { bufs.close_current_buffer }))
+    # header.pack_end()
 
     @window.titlebar = header
   end
@@ -429,6 +525,10 @@ class VMAgui
     @window.add_controller(press)
 
     press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      # Step aside when a text entry widget (e.g. calculator var field) has focus.
+      # @entry_has_focus is set explicitly via notify_entry_focus by those widgets.
+      next false if @entry_has_focus
+      next false if @kbd_passthrough
       name = Gdk::Keyval.to_name(keyval)
       uki = Gdk::Keyval.to_unicode(keyval)
       keystr = uki.chr("UTF-8")
@@ -457,6 +557,8 @@ class VMAgui
     end
 
     press.signal_connect "key-released" do |gesture, keyval, keycode, y|
+      next false if @entry_has_focus
+      next false if @kbd_passthrough
       name = Gdk::Keyval.to_name(keyval)
       uki = Gdk::Keyval.to_unicode(keyval)
       keystr = uki.chr("UTF-8")
@@ -509,8 +611,6 @@ class VMAgui
     @last_debug_idle = Time.now
     app = Gtk::Application.new("net.samiddhi.vimamsa.r#{rand(1000)}", :flags_none)
     @app = app
-    
-    
 
     Gtk::Settings.default.gtk_application_prefer_dark_theme = true
     Gtk::Settings.default.gtk_theme_name = "Adwaita"
@@ -521,6 +621,11 @@ class VMAgui
       @window = Gtk::ApplicationWindow.new(app)
       @window.set_application(app)
 
+      @window.signal_connect("close-request") do
+        vma.shutdown
+        true  # prevent default destroy; shutdown->gui.quit handles it
+      end
+
       @window.title = "Multiple Views"
       @vpaned = Gtk::Paned.new(:vertical)
 
@@ -545,9 +650,9 @@ class VMAgui
       motion_controller.signal_connect("motion") do |controller, x, y|
         # label.set_text("Mouse at: (%.1f, %.1f)" % [x, y])
         # puts "MOVE #{x} #{y}"
-        
+
         # Cursor vanishes when hovering over menubar
-        draw_cursor_bug_workaround if y < 30 
+        draw_cursor_bug_workaround if y < 30
         @last_cursor = [x, y]
         @cursor_move_time = Time.now
       end
@@ -588,10 +693,10 @@ class VMAgui
 
       # TODO: Doesn't work, why?:
       # menubar_bar = Gtk::PopoverMenuBar.new(menu_model: menubar)
-      
+
       menubar_bar = Gtk::PopoverMenuBar.new()
       menubar_bar.set_menu_model(menubar)
-      
+
       menubar_bar.hexpand = true
       @action_trail_label = Gtk::Label.new("")
       @action_trail_label.add_css_class("action-trail")
@@ -604,6 +709,7 @@ class VMAgui
 
       init_header_bar
       file_panel_init
+      func_panel_init
 
       @window.show
 
@@ -672,7 +778,11 @@ class VMAgui
   end
 
   def init_menu
-    Vimamsa::Menu.new(@menubar, @app)
+    @menu = Vimamsa::Menu.new(@menubar, @app)
+  end
+
+  def menu
+    @menu
   end
 
   def toggle_two_column
@@ -696,9 +806,13 @@ class VMAgui
     @pane.set_start_child(nil)
     @pane.set_end_child(nil)
 
-    @vbox.remove(@pane)
-    @vbox.attach(w1[:overlay], 0, 2, 2, 1)
-    # @vbox.attach(@statbox, 1, 1, 1, 1)
+    if @func_panel_shown
+      @func_panel_pane.set_end_child(w1[:overlay])
+    elsif @file_panel_shown
+      @file_panel_pane.set_end_child(w1[:overlay])
+    else
+      set_editor_area(w1[:overlay])
+    end
     @two_column = false
   end
 
@@ -748,14 +862,24 @@ class VMAgui
     w1 = @windows[1]
     w2 = @windows[2]
 
-    # Remove overlay from @vbox and add the Gtk::Paned instead
+    # Remove overlay from its current parent and add the Gtk::Paned instead
     @pane = Gtk::Paned.new(:horizontal)
-    @vbox.remove(w1[:overlay])
-    @pane.set_start_child(w2[:overlay])
-    @pane.set_end_child(w1[:overlay])
-
-    # numbers: left, top, width, height
-    @vbox.attach(@pane, 0, 2, 2, 1)
+    if @func_panel_shown
+      @func_panel_pane.set_end_child(nil)
+      @pane.set_start_child(w2[:overlay])
+      @pane.set_end_child(w1[:overlay])
+      @func_panel_pane.set_end_child(@pane)
+    elsif @file_panel_shown
+      @file_panel_pane.set_end_child(nil)
+      @pane.set_start_child(w2[:overlay])
+      @pane.set_end_child(w1[:overlay])
+      @file_panel_pane.set_end_child(@pane)
+    else
+      @minibuf_vpane.set_start_child(nil)  # unparent w1[:overlay] before re-parenting
+      @pane.set_start_child(w2[:overlay])
+      @pane.set_end_child(w1[:overlay])
+      set_editor_area(@pane)
+    end
 
     w2[:sw].show
     @two_column = true
@@ -925,15 +1049,22 @@ class VMAgui
 
   def show_file_panel
     return if @file_panel_shown
-    inner = @two_column ? @pane : @windows[1][:overlay]
-    @vbox.remove(inner)
+    # If func panel is shown it sits in minibuf_vpane; wrap it too
+    inner = if @func_panel_shown
+      @func_panel_pane
+    elsif @two_column
+      @pane
+    else
+      @windows[1][:overlay]
+    end
+    @minibuf_vpane.set_start_child(nil)  # unparent inner before re-parenting
     @file_panel_pane = Gtk::Paned.new(:horizontal)
     @file_panel_pane.hexpand = true
     @file_panel_pane.vexpand = true
     @file_panel_pane.set_start_child(@file_panel.widget)
     @file_panel_pane.set_end_child(inner)
     @file_panel_pane.set_position(180)
-    @vbox.attach(@file_panel_pane, 0, 2, 2, 1)
+    set_editor_area(@file_panel_pane)
     @file_panel_shown = true
     @file_panel.refresh
   end
@@ -943,12 +1074,65 @@ class VMAgui
     inner = @file_panel_pane.end_child
     @file_panel_pane.set_start_child(nil)
     @file_panel_pane.set_end_child(nil)
-    @vbox.remove(@file_panel_pane)
-    @vbox.attach(inner, 0, 2, 2, 1)
+    set_editor_area(inner)
     @file_panel_shown = false
   end
 
   def toggle_file_panel
     @file_panel_shown ? hide_file_panel : show_file_panel
   end
+
+  def func_panel_init
+    @func_panel = FuncPanel.new
+    @func_panel_shown = false
+  end
+
+  def func_panel_refresh
+    return unless @func_panel_shown
+    @func_panel.refresh
+  end
+
+  def show_func_panel
+    return if @func_panel_shown
+    if @file_panel_shown
+      inner = @file_panel_pane.end_child
+      @file_panel_pane.set_end_child(nil)
+    elsif @two_column
+      inner = @pane
+      @minibuf_vpane.set_start_child(nil)
+    else
+      inner = @windows[1][:overlay]
+      @minibuf_vpane.set_start_child(nil)
+    end
+    @func_panel_pane = Gtk::Paned.new(:horizontal)
+    @func_panel_pane.hexpand = true
+    @func_panel_pane.vexpand = true
+    @func_panel_pane.set_start_child(@func_panel.widget)
+    @func_panel_pane.set_end_child(inner)
+    @func_panel_pane.set_position(160)
+    if @file_panel_shown
+      @file_panel_pane.set_end_child(@func_panel_pane)
+    else
+      set_editor_area(@func_panel_pane)
+    end
+    @func_panel_shown = true
+    @func_panel.refresh
+  end
+
+  def hide_func_panel
+    return unless @func_panel_shown
+    inner = @func_panel_pane.end_child
+    @func_panel_pane.set_start_child(nil)
+    @func_panel_pane.set_end_child(nil)
+    if @file_panel_shown
+      @file_panel_pane.set_end_child(inner)
+    else
+      set_editor_area(inner)
+    end
+    @func_panel_shown = false
+  end
+
+  def toggle_func_panel
+    @func_panel_shown ? hide_func_panel : show_func_panel
+  end
 end

data/lib/vimamsa/gui_file_panel.rb

@@ -7,6 +7,7 @@ class FileTreePanel
     @tree = Gtk::TreeView.new(@store)
     @tree.headers_visible = false
     @tree.activate_on_single_click = true
+    @tree.level_indentation = 7 
 
     renderer = Gtk::CellRendererText.new
     renderer.ellipsize = Pango::EllipsizeMode::START

data/lib/vimamsa/gui_func_panel.rb

@@ -0,0 +1,127 @@
+# Left-side panel that displays LSP-provided functions/methods for the current buffer,
+# grouped by the class or module they belong to.
+class FuncPanel
+  COL_NAME = 0  # Tree column index: display name (class name or function name)
+  COL_LINE = 1  # Tree column index: 1-based line number to jump to; 0 = not a jump target
+
+  def initialize
+    # @store is the data model: a tree (not flat list) so we can nest functions
+    # under their parent class. Two columns: the display string and the line number.
+    @store = Gtk::TreeStore.new(String, Integer)
+
+    # @tree is the GTK widget that renders @store. It holds expand/collapse state
+    # and handles row selection. Backed by @store — clearing @store clears the view.
+    @tree = Gtk::TreeView.new(@store)
+    @tree.headers_visible = false
+    @tree.activate_on_single_click = true
+
+    # Single text column; ellipsize at end so long names don't overflow the panel width.
+    renderer = Gtk::CellRendererText.new
+    renderer.ellipsize = Pango::EllipsizeMode::END
+    col = Gtk::TreeViewColumn.new("", renderer, text: COL_NAME)
+    col.expand = true
+    @tree.append_column(col)
+
+    # Jump to the function's line when a row is clicked.
+    # Class header rows have COL_LINE = 0 and are skipped (no jump).
+    @tree.signal_connect("row-activated") do |_tv, path, _col|
+      iter = @store.get_iter(path)
+      next if iter.nil?
+      line = iter[COL_LINE]
+      next if line <= 0
+      vma.buf.jump_to_line(line)
+    end
+
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:never, :automatic)
+    sw.set_child(@tree)
+    sw.vexpand = true
+
+    header = Gtk::Label.new("<span weight='ultrabold'>Functions</span> (click to jump)")
+    header.use_markup = true
+
+    header.xalign = 0.0
+    header.margin_start = 6
+    header.margin_top = 4
+    header.margin_bottom = 2
+
+    # @box is the outermost widget: header label on top, scrollable tree below.
+    @box = Gtk::Box.new(:vertical, 0)
+    @box.set_size_request(160, -1)
+    @box.append(header)
+    @box.append(sw)
+  end
+
+  # Returns the outermost widget to embed in the paned layout.
+  def widget
+    @box
+  end
+
+  # Asynchronously fetch functions from the LSP server and repopulate @store.
+  # The LSP call runs in a background thread; the GTK update is marshalled back
+  # to the main thread via GLib::Idle.add to avoid threading issues.
+  def refresh
+    buf = vma.buf
+    unless buf&.fname
+      set_placeholder("(no file)")
+      return
+    end
+    lsp = LangSrv.get(buf.lang)
+    unless lsp
+      set_placeholder("(no LSP)")
+      return
+    end
+    fpath = buf.fname
+    Thread.new {
+      # groups: [{name:, line:, functions: [{name:, line:}, ...]}, ...]
+      # name: nil means top-level functions with no enclosing class.
+      groups = lsp.document_functions_grouped(fpath)
+      GLib::Idle.add {
+        @store.clear
+        if groups.nil? || groups.empty?
+          set_placeholder("(no functions)")
+        else
+          populate(groups)
+        end
+        false  # returning false removes this idle callback after one run
+      }
+    }
+  end
+
+  private
+
+  # Fill @store from the grouped function list.
+  # Named groups become collapsible parent rows; top-level functions are root rows.
+  def populate(groups)
+    groups.each do |g|
+      if g[:name]
+        # Class/module header: parent row with the class name (and its own line number
+        # so clicking it jumps to the class definition when line > 0).
+        header = @store.append(nil)
+        header[COL_NAME] = g[:name]
+        header[COL_LINE] = g[:line] || 0
+        g[:functions].each do |f|
+          child = @store.append(header)  # appended under the class header
+          child[COL_NAME] = f[:name]
+          child[COL_LINE] = f[:line]
+        end
+      else
+        # Top-level functions (not inside any class): added as root rows directly.
+        g[:functions].each do |f|
+          row = @store.append(nil)
+          row[COL_NAME] = f[:name]
+          row[COL_LINE] = f[:line]
+        end
+      end
+    end
+    @tree.expand_all  # show all classes expanded by default
+  end
+
+  # Replace the entire store contents with a single non-clickable status message.
+  def set_placeholder(text)
+    @store.clear
+    iter = @store.append(nil)
+    iter[COL_NAME] = text
+    iter[COL_LINE] = 0
+  end
+end

data/lib/vimamsa/gui_menu.rb

@@ -53,6 +53,7 @@ module Vimamsa
 
       add_to_menu "Actions.experimental.Diff", { :label => "Show Diff of\nunsaved changes", :action => :diff_buffer }
       add_to_menu "Actions.experimental.GitDiff", { :label => "Show git diff", :action => :git_diff_buffer }
+      add_to_menu "Actions.experimental.GitDiffW", { :label => "Show git diff -w (repo)", :action => :git_diff_w }
 
       add_to_menu "Actions.experimental.PrintBufferAccessList", { :label => "Print buffers by access time", :action => :print_buffer_access_list }
       add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
@@ -63,10 +64,13 @@ module Vimamsa
       
 
       add_to_menu "Actions.debug.dumpkbd", { :label => "Dump kbd state", :action => :kbd_dump_state }
+      add_to_menu "Actions.debug.ToggleKbdPassthrough", { :label => "Toggle kbd event passthrough", :action => :toggle_kbd_passthrough }
 
       add_to_menu "View.BufferManager", { :label => "Show open files", :action => :start_buf_manager }
       add_to_menu "View.TwoColumn", { :label => "Toggle two column mode", :action => :toggle_two_column }
       add_to_menu "View.FilePanel", { :label => "Toggle file panel", :action => :toggle_file_panel }
+      add_to_menu "View.FuncPanel", { :label => "Toggle function panel (LSP)", :action => :toggle_func_panel }
+      add_to_menu "View.MsgHistory", { :label => "Message history", :action => :show_message_history }
 
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
@@ -81,6 +85,11 @@ module Vimamsa
     def initialize(menubar, _app)
       @app = _app
       @nfo = {}
+      @menubar = menubar
+      # Gio::Menu for the "Modules" top-level menu, created on first use.
+      @module_menu = nil
+      # Ordered list of action symbols in @module_menu, used to find removal positions.
+      @module_actions = []
 
       add_menu_items
 
@@ -89,6 +98,39 @@ module Vimamsa
       end
     end
 
+    # Add a menu item under the top-level "Modules" menu.
+    # Creates the Modules menu the first time it is called.
+    def add_module_action(action, label)
+      if @module_menu.nil?
+        @module_menu = Gio::Menu.new
+        modules_item = Gio::MenuItem.new("Modules", nil)
+        modules_item.submenu = @module_menu
+        @menubar.append_item(modules_item)
+      end
+
+      act = Gio::SimpleAction.new(action.to_s)
+      @app.add_action(act)
+      act.signal_connect("activate") { call_action(action) }
+
+      item = Gio::MenuItem.new(label, "app.#{action}")
+      @module_menu.append_item(item)
+      @module_actions << action
+    end
+
+    # Remove a previously added module menu item.
+    def remove_module_action(action)
+      idx = @module_actions.index(action)
+      return if idx.nil?
+      @module_menu.remove(idx)
+      @module_actions.delete_at(idx)
+      @app.remove_action(action.to_s)
+    end
+
+    # Return true if action was added via add_module_action and not yet removed.
+    def module_action?(action)
+      @module_actions.include?(action)
+    end
+
     def build_menu(nfo, parent)
       menu = Gio::Menu.new
       if nfo[:action]