vimamsa 0.1.26 → 0.1.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/appimage.yml +93 -0
- data/.gitignore +4 -1
- data/Dockerfile +7 -4
- data/README.md +62 -16
- data/custom_example.rb +43 -13
- data/doc/TODO.md +461 -0
- data/doc/bundling_plan.md +569 -0
- data/doc/key_bindings_report_plan.md +168 -0
- data/doc/missing_vim_bindings.md +71 -0
- data/doc/modules_settings_plan.md +433 -0
- data/doc/refactor_dedup_plan.md +117 -0
- data/doc/unused_code_plan.md +120 -0
- data/doc/vim_compatibility_plan.md +296 -0
- data/doc/vimlike_vim_conflicts.md +254 -0
- data/doc/vm_snapshots_plan.md +146 -0
- data/exe/run_tests.rb +117 -3
- data/exe/vimamsa +24 -4
- data/fonts/OFL-Oxanium.txt +93 -0
- data/fonts/Oxanium[wght].ttf +0 -0
- data/icon.png +0 -0
- data/img/demo.gif +0 -0
- data/lang/hyperplaintext.lang +6 -0
- data/lib/vimamsa/ack.rb +11 -1
- data/lib/vimamsa/actions.rb +4 -1
- data/lib/vimamsa/appimage_env.rb +35 -0
- data/lib/vimamsa/audio.rb +2 -5
- data/lib/vimamsa/bookmarks.rb +302 -0
- data/lib/vimamsa/buffer.rb +593 -82
- data/lib/vimamsa/buffer_changetext.rb +102 -42
- data/lib/vimamsa/buffer_cursor.rb +7 -0
- data/lib/vimamsa/buffer_list.rb +4 -0
- data/lib/vimamsa/buffer_manager.rb +4 -1
- data/lib/vimamsa/bundled_fonts.rb +32 -0
- data/lib/vimamsa/clipboard.rb +3 -0
- data/lib/vimamsa/conf.rb +59 -3
- data/lib/vimamsa/constants.rb +3 -0
- data/lib/vimamsa/crash_handler.rb +149 -0
- data/lib/vimamsa/debug.rb +4 -1
- data/lib/vimamsa/desktop_install.rb +96 -0
- data/lib/vimamsa/diff_buffer.rb +39 -10
- data/lib/vimamsa/easy_jump.rb +3 -0
- data/lib/vimamsa/editor.rb +263 -57
- data/lib/vimamsa/encrypt.rb +78 -29
- data/lib/vimamsa/file_finder.rb +4 -19
- data/lib/vimamsa/file_history.rb +3 -0
- data/lib/vimamsa/file_manager.rb +30 -15
- data/lib/vimamsa/fold.rb +226 -0
- data/lib/vimamsa/gui.rb +520 -106
- data/lib/vimamsa/gui_command_line.rb +208 -0
- data/lib/vimamsa/gui_dialog.rb +94 -42
- data/lib/vimamsa/gui_file_panel.rb +356 -25
- data/lib/vimamsa/gui_form_generator.rb +59 -35
- data/lib/vimamsa/gui_func_panel.rb +67 -22
- data/lib/vimamsa/gui_image.rb +3 -0
- data/lib/vimamsa/gui_keylog_panel.rb +246 -0
- data/lib/vimamsa/gui_menu.rb +23 -11
- data/lib/vimamsa/gui_select_window.rb +19 -48
- data/lib/vimamsa/gui_settings.rb +78 -37
- data/lib/vimamsa/gui_sourceview.rb +273 -19
- data/lib/vimamsa/gui_sourceview_autocomplete.rb +319 -90
- data/lib/vimamsa/gui_text.rb +63 -2
- data/lib/vimamsa/gui_theme.rb +606 -0
- data/lib/vimamsa/hook.rb +3 -0
- data/lib/vimamsa/hyper_plain_text.rb +3 -0
- data/lib/vimamsa/key_actions.rb +112 -13
- data/lib/vimamsa/key_binding_tree.rb +242 -215
- data/lib/vimamsa/key_bindings_notepad.rb +43 -0
- data/lib/vimamsa/key_bindings_report.rb +261 -0
- data/lib/vimamsa/key_bindings_vim.rb +354 -0
- data/lib/vimamsa/key_bindings_vimlike.rb +65 -9
- data/lib/vimamsa/langservp.rb +271 -54
- data/lib/vimamsa/macro.rb +3 -0
- data/lib/vimamsa/main.rb +14 -8
- data/lib/vimamsa/rbvma.rb +26 -1
- data/lib/vimamsa/search.rb +3 -0
- data/lib/vimamsa/search_replace.rb +11 -10
- data/lib/vimamsa/string_util.rb +120 -40
- data/lib/vimamsa/terminal.rb +3 -0
- data/lib/vimamsa/test_framework.rb +28 -2
- data/lib/vimamsa/tests.rb +3 -0
- data/lib/vimamsa/text_objects.rb +353 -0
- data/lib/vimamsa/text_transforms.rb +14 -0
- data/lib/vimamsa/util.rb +46 -7
- data/lib/vimamsa/version.rb +1 -1
- data/lib/vimamsa.rb +0 -1
- data/modules/color_highlight/color_highlight.rb +118 -0
- data/modules/color_highlight/color_highlight_info.rb +3 -0
- data/modules/dictation/dictation.rb +1054 -0
- data/modules/dictation/dictation_info.rb +3 -0
- data/modules/dictation/whisper_worker.py +273 -0
- data/modules/ollama/ollama.rb +107 -0
- data/modules/ollama/ollama_info.rb +3 -0
- data/modules/tts/tts.rb +119 -0
- data/modules/tts/tts_info.rb +3 -0
- data/run_e2e_vm.sh +28 -0
- data/run_tests_vm.sh +130 -0
- data/scripts/appimage/AppRun +54 -0
- data/scripts/appimage/Dockerfile +18 -0
- data/scripts/appimage/build.sh +19 -0
- data/scripts/appimage/build_in_container.sh +192 -0
- data/scripts/appimage/smoke_test.sh +27 -0
- data/scripts/demo/demo_steps.txt +59 -0
- data/scripts/demo/record_demo.rb +177 -0
- data/scripts/demo/shapes.rb +28 -0
- data/styles/134272-molokai.xml +3 -0
- data/styles/molokai_cyber.xml +48 -0
- data/styles/molokai_edit.xml +1 -0
- data/tests/support/virtual_keyboard.rb +254 -0
- data/tests/support/virtual_mic.rb +67 -0
- data/tests/test_ack.rb +22 -0
- data/tests/test_auto_format.rb +122 -0
- data/tests/test_autocomplete.rb +211 -0
- data/tests/test_autosave.rb +145 -0
- data/tests/test_basic_editing.rb +33 -3
- data/tests/test_bookmarks.rb +206 -0
- data/tests/test_bracket_match.rb +85 -0
- data/tests/test_bundling.rb +92 -0
- data/tests/test_color_highlight.rb +92 -0
- data/tests/test_command_line.rb +79 -0
- data/tests/test_command_line_file.rb +27 -0
- data/tests/test_context_menu_file.rb +129 -0
- data/tests/test_copy_paste.rb +80 -0
- data/tests/test_crash_handler.rb +39 -0
- data/tests/test_custom_two_phase.rb +92 -0
- data/tests/test_dialog_callback_errors.rb +44 -0
- data/tests/test_dictation.rb +294 -0
- data/tests/test_diff_buffer_name.rb +51 -0
- data/tests/test_double_click.rb +41 -0
- data/tests/test_drag_selection.rb +125 -0
- data/tests/test_e2e_cmdline.rb +116 -0
- data/tests/test_e2e_dictation.rb +98 -0
- data/tests/test_e2e_replace_char.rb +58 -0
- data/tests/test_extract_file_links.rb +55 -0
- data/tests/test_file_format.rb +217 -0
- data/tests/test_file_manager.rb +72 -0
- data/tests/test_file_panel.rb +269 -0
- data/tests/test_flash.rb +78 -0
- data/tests/test_fold.rb +111 -0
- data/tests/test_font_refresh.rb +56 -0
- data/tests/test_func_panel.rb +68 -0
- data/tests/test_grep_apply.rb +46 -0
- data/tests/test_gtk_sync.rb +126 -0
- data/tests/test_hpt_highlight_visible.rb +75 -0
- data/tests/test_hpt_link_highlight.rb +82 -0
- data/tests/test_jump_to_file.rb +41 -0
- data/tests/test_key_bindings.rb +208 -0
- data/tests/test_keylog_panel.rb +101 -0
- data/tests/test_lsp_clangd.rb +281 -0
- data/tests/test_lsp_jump.rb +87 -0
- data/tests/test_lsp_position_encoding.rb +49 -0
- data/tests/test_lsp_symbols.rb +68 -0
- data/tests/test_macro.rb +137 -0
- data/tests/test_markdown_highlight.rb +57 -0
- data/tests/test_mode_badge.rb +41 -0
- data/tests/test_notepad_bindings.rb +67 -0
- data/tests/test_popup_queue.rb +51 -0
- data/tests/test_random_edit.rb +109 -0
- data/tests/test_revert.rb +127 -0
- data/tests/test_startup_file.rb +58 -0
- data/tests/test_status_area.rb +50 -0
- data/tests/test_text_objects.rb +163 -0
- data/tests/test_text_transforms.rb +329 -0
- data/tests/test_tts.rb +68 -0
- data/tests/test_vim_bindings.rb +252 -0
- data/tests/test_vim_conflicts.rb +63 -0
- data/tests/test_window_layout.rb +219 -0
- data/vimamsa.gemspec +3 -1
- data/vm_guest_run.sh +109 -0
- metadata +112 -10
data/lib/vimamsa/gui_image.rb
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
|
|
2
|
+
module Vimamsa
|
|
1
3
|
# Following this example:
|
|
2
4
|
# https://gabmus.org/posts/create_an_auto-resizing_image_widget_with_gtk3_and_python/
|
|
3
5
|
class ResizableImage < Gtk::DrawingArea
|
|
@@ -45,3 +47,4 @@ class ResizableImage < Gtk::DrawingArea
|
|
|
45
47
|
cr.paint
|
|
46
48
|
end
|
|
47
49
|
end
|
|
50
|
+
end # module Vimamsa
|
|
@@ -0,0 +1,246 @@
|
|
|
1
|
+
|
|
2
|
+
module Vimamsa
|
|
3
|
+
# Right-side panel that live-logs pressed key chords and the actions they
|
|
4
|
+
# trigger. Meant for demos and for new users learning the key bindings.
|
|
5
|
+
# Fed by direct calls from KeyBindingTree (log_action / log_pending /
|
|
6
|
+
# log_nomatch); all of them are no-ops unless the panel is shown (@active).
|
|
7
|
+
class KeyLogPanel
|
|
8
|
+
MAX_ENTRIES = 200
|
|
9
|
+
|
|
10
|
+
# Test-visible model: array of hashes, one per row (newest last;
|
|
11
|
+
# displayed newest first). kind: :action | :pending | :insert | :nomatch | :mode
|
|
12
|
+
attr_reader :entries
|
|
13
|
+
|
|
14
|
+
# The highlighted Gtk::ListBoxRow of the newest entry
|
|
15
|
+
attr_reader :newest_row
|
|
16
|
+
|
|
17
|
+
# Insert-mode typing arrives as eval-string actions like buf.insert_txt('h');
|
|
18
|
+
# matched here so consecutive chars can be coalesced into one "typed:" row.
|
|
19
|
+
INSERT_TXT_RE = /\Abuf\.insert_txt\((.+)\)\z/
|
|
20
|
+
|
|
21
|
+
def initialize
|
|
22
|
+
@entries = []
|
|
23
|
+
@rows = [] # Gtk::ListBoxRow per entry, parallel to @entries
|
|
24
|
+
# (newest last, like @entries; displayed newest first)
|
|
25
|
+
@active = false
|
|
26
|
+
@last_mode = nil # last seen mode badge, e.g. "[COMMAND]"
|
|
27
|
+
@newest_row = nil
|
|
28
|
+
|
|
29
|
+
@list = Gtk::ListBox.new
|
|
30
|
+
@list.selection_mode = :none
|
|
31
|
+
|
|
32
|
+
# Highlight for the newest row (color from gui_theme.rb, cnf-backed)
|
|
33
|
+
@row_css = Gtk::CssProvider.new
|
|
34
|
+
@row_css.load(data: keylog_row_css)
|
|
35
|
+
|
|
36
|
+
@sw = Gtk::ScrolledWindow.new
|
|
37
|
+
@sw.set_policy(:never, :automatic)
|
|
38
|
+
@sw.set_child(@list)
|
|
39
|
+
@sw.vexpand = true
|
|
40
|
+
|
|
41
|
+
title = Gtk::Label.new("<span weight='ultrabold' size='large'>Key log</span>")
|
|
42
|
+
title.use_markup = true
|
|
43
|
+
title.xalign = 0.0
|
|
44
|
+
title.hexpand = true
|
|
45
|
+
|
|
46
|
+
clear_btn = Gtk::Button.new(label: "Clear")
|
|
47
|
+
clear_btn.signal_connect("clicked") { clear }
|
|
48
|
+
|
|
49
|
+
header = Gtk::Box.new(:horizontal, 6)
|
|
50
|
+
header.margin_start = 8
|
|
51
|
+
header.margin_end = 6
|
|
52
|
+
header.margin_top = 6
|
|
53
|
+
header.margin_bottom = 4
|
|
54
|
+
header.append(title)
|
|
55
|
+
header.append(clear_btn)
|
|
56
|
+
|
|
57
|
+
# @box is the outermost widget: header on top, scrollable log below.
|
|
58
|
+
@box = Gtk::Box.new(:vertical, 0)
|
|
59
|
+
@box.set_size_request(320, -1)
|
|
60
|
+
@box.add_css_class("side-panel")
|
|
61
|
+
@box.append(header)
|
|
62
|
+
@box.append(@sw)
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
# Returns the outermost widget to embed in the paned layout.
|
|
66
|
+
def widget
|
|
67
|
+
@box
|
|
68
|
+
end
|
|
69
|
+
|
|
70
|
+
def active?
|
|
71
|
+
@active
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
# First row currently displayed (should be the newest); used by tests.
|
|
75
|
+
def top_row
|
|
76
|
+
@list.first_child
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
def set_active(v)
|
|
80
|
+
@active = v
|
|
81
|
+
end
|
|
82
|
+
|
|
83
|
+
# Re-read the newest-row highlight color from cnf and reload it live.
|
|
84
|
+
def refresh_css
|
|
85
|
+
@row_css.load(data: keylog_row_css)
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
def clear
|
|
89
|
+
@entries.clear
|
|
90
|
+
@rows.each { |r| @list.remove(r) }
|
|
91
|
+
@rows.clear
|
|
92
|
+
@last_mode = nil
|
|
93
|
+
@newest_row = nil
|
|
94
|
+
end
|
|
95
|
+
|
|
96
|
+
# ── logging API, called from key_binding_tree.rb ──────────────────────────
|
|
97
|
+
|
|
98
|
+
# A key chord completed and an action is about to execute.
|
|
99
|
+
# trail_str is e.g. "[COMMAND] g g"; action is a Symbol, Proc or eval string.
|
|
100
|
+
def log_action(trail_str, action)
|
|
101
|
+
return unless @active
|
|
102
|
+
if action.class == String && (m = INSERT_TXT_RE.match(action))
|
|
103
|
+
log_insert_char(unquote(m[1]))
|
|
104
|
+
return
|
|
105
|
+
end
|
|
106
|
+
mode_divider(trail_str)
|
|
107
|
+
drop_pending
|
|
108
|
+
desc = vma.actions[action]&.method_name.to_s
|
|
109
|
+
name = action.class == Proc ? "(proc)" : action.to_s
|
|
110
|
+
desc = "" if desc == name
|
|
111
|
+
push(kind: :action, chord: fmt_chord(trail_str), action: action, desc: desc)
|
|
112
|
+
end
|
|
113
|
+
|
|
114
|
+
# A multi-key sequence is in progress (matched a state that has children).
|
|
115
|
+
def log_pending(trail_str)
|
|
116
|
+
return unless @active
|
|
117
|
+
mode_divider(trail_str)
|
|
118
|
+
e = { kind: :pending, chord: fmt_chord(trail_str) }
|
|
119
|
+
if @entries.last && @entries.last[:kind] == :pending
|
|
120
|
+
@entries[-1] = e
|
|
121
|
+
update_last_row(e)
|
|
122
|
+
else
|
|
123
|
+
push(e)
|
|
124
|
+
end
|
|
125
|
+
end
|
|
126
|
+
|
|
127
|
+
# A key press that matched nothing in the binding tree.
|
|
128
|
+
def log_nomatch(c, trail_str)
|
|
129
|
+
return unless @active
|
|
130
|
+
drop_pending
|
|
131
|
+
chord = [trail_str, c].reject { |s| s.to_s.empty? }.join(" ")
|
|
132
|
+
push(kind: :nomatch, chord: fmt_chord(chord))
|
|
133
|
+
end
|
|
134
|
+
|
|
135
|
+
private
|
|
136
|
+
|
|
137
|
+
def log_insert_char(ch)
|
|
138
|
+
if @entries.last && @entries.last[:kind] == :insert
|
|
139
|
+
@entries.last[:text] << ch
|
|
140
|
+
update_last_row(@entries.last)
|
|
141
|
+
else
|
|
142
|
+
push(kind: :insert, text: ch.dup)
|
|
143
|
+
end
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
# A pending row is superseded by the entry that completes or aborts it.
|
|
147
|
+
def drop_pending
|
|
148
|
+
return unless @entries.last && @entries.last[:kind] == :pending
|
|
149
|
+
@entries.pop
|
|
150
|
+
@list.remove(@rows.pop)
|
|
151
|
+
end
|
|
152
|
+
|
|
153
|
+
# Insert a dim divider row whenever the mode badge changes between entries.
|
|
154
|
+
def mode_divider(trail_str)
|
|
155
|
+
mode = trail_str.to_s[/\A\[[^\]]+\]/]
|
|
156
|
+
return if mode.nil?
|
|
157
|
+
push(kind: :mode, text: mode) if @last_mode && mode != @last_mode
|
|
158
|
+
@last_mode = mode
|
|
159
|
+
end
|
|
160
|
+
|
|
161
|
+
def push(e)
|
|
162
|
+
@entries << e
|
|
163
|
+
lbl = Gtk::Label.new
|
|
164
|
+
lbl.use_markup = true
|
|
165
|
+
lbl.xalign = 0.0
|
|
166
|
+
lbl.wrap = true
|
|
167
|
+
# Break inside long words too: an action like
|
|
168
|
+
# buf.jump(END_OF_LINE);buf.insert_txt("\n");... has no spaces, and its
|
|
169
|
+
# width would otherwise become the panel's minimum width
|
|
170
|
+
lbl.wrap_mode = :word_char
|
|
171
|
+
lbl.margin_start = 8
|
|
172
|
+
lbl.margin_end = 8
|
|
173
|
+
lbl.margin_top = 3
|
|
174
|
+
lbl.margin_bottom = 3
|
|
175
|
+
lbl.markup = markup_for(e)
|
|
176
|
+
row = Gtk::ListBoxRow.new
|
|
177
|
+
row.set_child(lbl)
|
|
178
|
+
row.style_context.add_provider(@row_css)
|
|
179
|
+
@list.prepend(row) # newest entry shown at top
|
|
180
|
+
@rows << row
|
|
181
|
+
highlight(row)
|
|
182
|
+
if @entries.size > MAX_ENTRIES
|
|
183
|
+
@entries.shift
|
|
184
|
+
@list.remove(@rows.shift) # oldest row sits at the bottom
|
|
185
|
+
end
|
|
186
|
+
scroll_to_top
|
|
187
|
+
end
|
|
188
|
+
|
|
189
|
+
def update_last_row(e)
|
|
190
|
+
@rows.last.child.markup = markup_for(e)
|
|
191
|
+
scroll_to_top
|
|
192
|
+
end
|
|
193
|
+
|
|
194
|
+
# Mark row as the newest entry, unmarking the previous one.
|
|
195
|
+
def highlight(row)
|
|
196
|
+
@newest_row&.remove_css_class("keylog-newest")
|
|
197
|
+
row.add_css_class("keylog-newest")
|
|
198
|
+
@newest_row = row
|
|
199
|
+
end
|
|
200
|
+
|
|
201
|
+
def markup_for(e)
|
|
202
|
+
case e[:kind]
|
|
203
|
+
when :action
|
|
204
|
+
name = e[:action].class == Proc ? "(proc)" : e[:action].to_s
|
|
205
|
+
s = "<span size='large' weight='bold'>#{esc(e[:chord])}</span>\n"
|
|
206
|
+
s << "<span foreground='#4a90d9' size='large' alpha='60%'>#{esc(e[:desc])}</span>" unless e[:desc].empty?
|
|
207
|
+
s << "\n<span>#{esc(name)}</span>"
|
|
208
|
+
s
|
|
209
|
+
when :pending
|
|
210
|
+
"<span size='large' weight='bold' alpha='55%'>#{esc(e[:chord])} …</span>"
|
|
211
|
+
when :insert
|
|
212
|
+
"<span size='large'>typed: <b>#{esc(e[:text])}</b></span>"
|
|
213
|
+
when :mode
|
|
214
|
+
"<span size='small' alpha='50%'>— #{esc(e[:text])} —</span>"
|
|
215
|
+
when :nomatch
|
|
216
|
+
"<span size='large' alpha='45%'>#{esc(e[:chord])} (no binding)</span>"
|
|
217
|
+
|
|
218
|
+
end
|
|
219
|
+
end
|
|
220
|
+
|
|
221
|
+
# Render key-release notation "ctrl!" as "ctrl↑"
|
|
222
|
+
def fmt_chord(s)
|
|
223
|
+
s.to_s.gsub(/(\S+?)!/) { "#{$1}↑" }
|
|
224
|
+
end
|
|
225
|
+
|
|
226
|
+
def esc(s)
|
|
227
|
+
CGI.escapeHTML(s.to_s)
|
|
228
|
+
end
|
|
229
|
+
|
|
230
|
+
# Extract the character from the quoted arg of buf.insert_txt('x'),
|
|
231
|
+
# undoing the escaping done in match_key_conf.
|
|
232
|
+
def unquote(s)
|
|
233
|
+
s = s.to_s
|
|
234
|
+
s = s[1..-2] if s.size >= 2 && (s[0] == "'" || s[0] == '"') && s[-1] == s[0]
|
|
235
|
+
s.gsub("\\\\'", "'").gsub("\\\\\\\\", "\\\\")
|
|
236
|
+
end
|
|
237
|
+
|
|
238
|
+
def scroll_to_top
|
|
239
|
+
GLib::Idle.add do
|
|
240
|
+
adj = @sw.vadjustment
|
|
241
|
+
adj.value = adj.lower
|
|
242
|
+
false
|
|
243
|
+
end
|
|
244
|
+
end
|
|
245
|
+
end
|
|
246
|
+
end # module Vimamsa
|
data/lib/vimamsa/gui_menu.rb
CHANGED
|
@@ -31,12 +31,14 @@ module Vimamsa
|
|
|
31
31
|
add_to_menu "File.List", { :label => "List open files", :action => :start_buf_manager }
|
|
32
32
|
add_to_menu "File.Close", { :label => "Close file", :action => :close_current_buffer }
|
|
33
33
|
|
|
34
|
+
add_to_menu "File.Restart", { :label => "Restart (reload config and files)", :action => :restart_editor }
|
|
34
35
|
add_to_menu "File.Quit", { :label => "Quit", :action => :quit }
|
|
35
36
|
|
|
36
37
|
add_to_menu "Edit.Undo", { :label => "Undo edit", :action => :edit_undo }
|
|
37
38
|
add_to_menu "Edit.Redo", { :label => "Redo edit", :action => :edit_redo }
|
|
38
39
|
add_to_menu "Edit.SearchReplace", { :label => "Search and replace", :action => :gui_search_replace }
|
|
39
40
|
add_to_menu "Edit.Find", { :label => "Find", :action => :find_in_buffer }
|
|
41
|
+
add_to_menu "Edit.ToggleAutocomplete", { :label => "Toggle autocomplete", :action => :toggle_autocomplete }
|
|
40
42
|
|
|
41
43
|
# add_to_menu "Edit.StartCompletion", { :label => "StartCompletion", :action => :start_autocomplete }
|
|
42
44
|
# add_to_menu "Edit.ShowCompletion", { :label => "ShowCompletion", :action => :show_autocomplete }
|
|
@@ -67,13 +69,19 @@ module Vimamsa
|
|
|
67
69
|
add_to_menu "Actions.debug.ToggleKbdPassthrough", { :label => "Toggle kbd event passthrough", :action => :toggle_kbd_passthrough }
|
|
68
70
|
|
|
69
71
|
add_to_menu "View.BufferManager", { :label => "Show open files", :action => :start_buf_manager }
|
|
72
|
+
add_to_menu "View.Bookmarks", { :label => "Show bookmarks", :action => :bookmark_list }
|
|
73
|
+
add_to_menu "Edit.AddBookmark", { :label => "Add bookmark", :action => :bookmark_add }
|
|
74
|
+
add_to_menu "View.SelectLanguage", { :label => "Set buffer language...", :action => :select_buffer_language }
|
|
70
75
|
add_to_menu "View.TwoColumn", { :label => "Toggle two column mode", :action => :toggle_two_column }
|
|
71
76
|
add_to_menu "View.FilePanel", { :label => "Toggle file panel", :action => :toggle_file_panel }
|
|
72
77
|
add_to_menu "View.FuncPanel", { :label => "Toggle function panel (LSP)", :action => :toggle_func_panel }
|
|
78
|
+
add_to_menu "View.KeyLog", { :label => "Toggle key log panel", :action => :toggle_keylog_panel }
|
|
73
79
|
add_to_menu "View.MsgHistory", { :label => "Message history", :action => :show_message_history }
|
|
74
80
|
|
|
75
81
|
add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
|
|
82
|
+
add_to_menu "Actions.LspRestart", { :label => "Restart LSP server", :action => :lsp_restart }
|
|
76
83
|
add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
|
|
84
|
+
add_to_menu "Help.VimConflicts", { :label => "Vim keys that differ in vimlike", :action => :show_vim_binding_conflicts }
|
|
77
85
|
add_to_menu "Help.InstallDemo", { :action => :install_demo_files }
|
|
78
86
|
|
|
79
87
|
#TODO: :auto_indent_buffer
|
|
@@ -98,6 +106,18 @@ module Vimamsa
|
|
|
98
106
|
end
|
|
99
107
|
end
|
|
100
108
|
|
|
109
|
+
# Markup hint (e.g. " [C] , d") showing the key binding for an action,
|
|
110
|
+
# or "" if the action is unbound. Shared by regular and module menu items.
|
|
111
|
+
def kbd_hint(action)
|
|
112
|
+
for mode_str in ["C", "V"]
|
|
113
|
+
c_kbd = vma.kbd.act_bindings[mode_str][action]
|
|
114
|
+
if c_kbd.class == String
|
|
115
|
+
return " <span foreground='#888888'><span weight='bold'>[#{mode_str}]</span> #{c_kbd}</span>"
|
|
116
|
+
end
|
|
117
|
+
end
|
|
118
|
+
return ""
|
|
119
|
+
end
|
|
120
|
+
|
|
101
121
|
# Add a menu item under the top-level "Modules" menu.
|
|
102
122
|
# Creates the Modules menu the first time it is called.
|
|
103
123
|
def add_module_action(action, label)
|
|
@@ -112,7 +132,8 @@ module Vimamsa
|
|
|
112
132
|
@app.add_action(act)
|
|
113
133
|
act.signal_connect("activate") { call_action(action) }
|
|
114
134
|
|
|
115
|
-
item = Gio::MenuItem.new(label, "app.#{action}")
|
|
135
|
+
item = Gio::MenuItem.new(label + kbd_hint(action), "app.#{action}")
|
|
136
|
+
item.set_attribute_value("use-markup", "true")
|
|
116
137
|
@module_menu.append_item(item)
|
|
117
138
|
@module_actions << action
|
|
118
139
|
end
|
|
@@ -134,16 +155,7 @@ module Vimamsa
|
|
|
134
155
|
def build_menu(nfo, parent)
|
|
135
156
|
menu = Gio::Menu.new
|
|
136
157
|
if nfo[:action]
|
|
137
|
-
|
|
138
|
-
for mode_str in ["C", "V"]
|
|
139
|
-
c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
|
|
140
|
-
if c_kbd.class == String
|
|
141
|
-
kbd_str = " <span foreground='#888888'><span weight='bold'>[#{mode_str}]</span> #{c_kbd}</span>"
|
|
142
|
-
break
|
|
143
|
-
end
|
|
144
|
-
end
|
|
145
|
-
|
|
146
|
-
label_str = nfo[:label] + kbd_str
|
|
158
|
+
label_str = nfo[:label] + kbd_hint(nfo[:action])
|
|
147
159
|
actkey = nfo[:action].to_s
|
|
148
160
|
menuitem = Gio::MenuItem.new(label_str, "app.#{actkey}")
|
|
149
161
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
|
|
2
|
+
module Vimamsa
|
|
1
3
|
def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt = {})
|
|
2
4
|
$selup = SelectUpdateWindow.new(nil, item_list, jump_keys, select_callback, update_callback, opt)
|
|
3
5
|
$selup.run
|
|
@@ -7,6 +9,8 @@ def gui_select_update_window(item_list, jump_keys, select_callback, update_callb
|
|
|
7
9
|
end
|
|
8
10
|
|
|
9
11
|
class SelectUpdateWindow
|
|
12
|
+
include PopupRun
|
|
13
|
+
|
|
10
14
|
COLUMN_JUMP_KEY = 0
|
|
11
15
|
COLUMN_DESCRIPTION = 1
|
|
12
16
|
|
|
@@ -41,25 +45,19 @@ class SelectUpdateWindow
|
|
|
41
45
|
end
|
|
42
46
|
|
|
43
47
|
def initialize(main_window, item_list, jump_keys, select_callback, update_callback, opt = {})
|
|
44
|
-
@window =
|
|
45
|
-
@window.set_transient_for($vmag.window) if $vmag&.window
|
|
46
|
-
# @window.screen = main_window.screen
|
|
47
|
-
@window.title = ""
|
|
48
|
-
if !opt[:title].nil?
|
|
49
|
-
@window.title = opt[:title]
|
|
50
|
-
end
|
|
48
|
+
@window = make_modal_window(opt[:title] || "", modal: false)
|
|
51
49
|
|
|
52
50
|
@selected_row = 0
|
|
53
51
|
@opt = opt
|
|
54
52
|
|
|
55
53
|
debug item_list.inspect
|
|
56
54
|
|
|
57
|
-
if select_callback.class == Method
|
|
55
|
+
if select_callback.class == Method || select_callback.class == Proc
|
|
58
56
|
@select_callback = select_callback
|
|
59
57
|
else
|
|
60
58
|
@select_callback = method(select_callback)
|
|
61
59
|
end
|
|
62
|
-
if update_callback.class == Method
|
|
60
|
+
if update_callback.class == Method || update_callback.class == Proc
|
|
63
61
|
@update_callback = update_callback
|
|
64
62
|
else
|
|
65
63
|
@update_callback = method(update_callback)
|
|
@@ -74,7 +72,7 @@ class SelectUpdateWindow
|
|
|
74
72
|
|
|
75
73
|
if !opt[:desc].nil?
|
|
76
74
|
descl = Gtk::Label.new(opt[:desc])
|
|
77
|
-
|
|
75
|
+
descl.margin = 15
|
|
78
76
|
# vbox.append(descl, :expand => false, :fill => false, :padding => 0)
|
|
79
77
|
vbox.append(descl)
|
|
80
78
|
end
|
|
@@ -99,32 +97,19 @@ class SelectUpdateWindow
|
|
|
99
97
|
# @entry.handle_event(event)
|
|
100
98
|
# end
|
|
101
99
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
keystr = uki.chr("UTF-8")
|
|
111
|
-
debug "keyval=#{keyval}"
|
|
112
|
-
|
|
100
|
+
on_submit_escape(@entry,
|
|
101
|
+
submit: proc {
|
|
102
|
+
path = Gtk::TreePath.new(@selected_row.to_s)
|
|
103
|
+
iter = @model.get_iter(path)
|
|
104
|
+
run_dialog_callback("select") { @select_callback.call(iter[1], @selected_row) }
|
|
105
|
+
@window.destroy
|
|
106
|
+
},
|
|
107
|
+
escape: proc { @window.destroy }) do |keyval|
|
|
113
108
|
if keyval == Gdk::Keyval::KEY_Down
|
|
114
|
-
debug "DOWN"
|
|
115
109
|
set_selected_row(@selected_row + 1)
|
|
116
110
|
true
|
|
117
111
|
elsif keyval == Gdk::Keyval::KEY_Up
|
|
118
112
|
set_selected_row(@selected_row - 1)
|
|
119
|
-
debug "UP"
|
|
120
|
-
true
|
|
121
|
-
elsif keyval == Gdk::Keyval::KEY_Return
|
|
122
|
-
path = Gtk::TreePath.new(@selected_row.to_s)
|
|
123
|
-
iter = @model.get_iter(path)
|
|
124
|
-
ret = iter[1]
|
|
125
|
-
@select_callback.call(ret, @selected_row)
|
|
126
|
-
@window.destroy
|
|
127
|
-
# debug iter[1].inspect
|
|
128
113
|
true
|
|
129
114
|
elsif keyval == Gdk::Keyval::KEY_Delete && @opt[:delete_callback]
|
|
130
115
|
path = Gtk::TreePath.new(@selected_row.to_s)
|
|
@@ -137,9 +122,6 @@ class SelectUpdateWindow
|
|
|
137
122
|
}
|
|
138
123
|
@opt[:delete_callback].call(name, refresh)
|
|
139
124
|
true
|
|
140
|
-
elsif keyval == Gdk::Keyval::KEY_Escape
|
|
141
|
-
@window.destroy
|
|
142
|
-
true
|
|
143
125
|
else
|
|
144
126
|
false
|
|
145
127
|
end
|
|
@@ -147,9 +129,9 @@ class SelectUpdateWindow
|
|
|
147
129
|
|
|
148
130
|
@entry.signal_connect("search-changed") do |widget|
|
|
149
131
|
debug "search changed: #{widget.text || ""}"
|
|
150
|
-
item_list = @update_callback.call(widget.text)
|
|
132
|
+
item_list = run_dialog_callback("select update") { @update_callback.call(widget.text) }
|
|
151
133
|
|
|
152
|
-
update_item_list(item_list)
|
|
134
|
+
update_item_list(item_list) if item_list
|
|
153
135
|
# label.text = widget.text || ""
|
|
154
136
|
end
|
|
155
137
|
@entry.signal_connect("changed") { debug "[changed] " }
|
|
@@ -201,16 +183,5 @@ class SelectUpdateWindow
|
|
|
201
183
|
@window.set_default_size(280, 500)
|
|
202
184
|
debug "SelectUpdateWindow"
|
|
203
185
|
end
|
|
204
|
-
|
|
205
|
-
def run
|
|
206
|
-
if !@window.visible?
|
|
207
|
-
@window.show
|
|
208
|
-
# add_spinner
|
|
209
|
-
else
|
|
210
|
-
@window.destroy
|
|
211
|
-
# GLib::Source.remove(@tiemout) unless @timeout.zero?
|
|
212
|
-
@timeout = 0
|
|
213
|
-
end
|
|
214
|
-
@window
|
|
215
|
-
end
|
|
216
186
|
end
|
|
187
|
+
end # module Vimamsa
|