vimamsa 0.1.10 → 0.1.12

data/lib/vimamsa/file_finder.rb

@@ -1,12 +1,26 @@
 require "parallel"
+
+# Limit file search to these extensions:
+$find_extensions = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb"]
+$search_dirs = []
+
 class FileFinder
+  def self.update_index()
+    message("Start updating file index")
+    Thread.new {
+      recursively_find_files()
+      message("Finnish updating file index")
+    }
+  end
+
   def initialize()
-    $hook.register(:shutdown, self.method("save"))
-    $dir_list = vma.marshal_load("file_index")
+    vma.hook.register(:shutdown, self.method("save"))
+    @@dir_list = vma.marshal_load("file_index")
   end
 
   def save()
-    vma.marshal_save("file_index", $dir_list)
+   debug "SAVE FILE INDEX", 2
+    vma.marshal_save("file_index", @@dir_list)
   end
 
   def start_gui()
@@ -16,85 +30,69 @@ class FileFinder
     end
     l = []
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-    if $dir_list == nil
-      Thread.new { recursively_find_files() }
+    if @@dir_list == nil
+      Thread.new { FileFinder.recursively_find_files() }
     end
 
+    # select_callback = proc { |search_str, idx| gui_file_finder_select_callback(search_str, idx) }
+    select_callback = self.method("gui_file_finder_select_callback")
+    update_callback = self.method("gui_file_finder_update_callback")
+
     gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                            "gui_file_finder_select_callback",
-                            "gui_file_finder_update_callback")
+                             # "gui_file_finder_select_callback",
+                             select_callback,
+                             update_callback)
   end
-end
 
-def update_file_index()
-  message("Start updating file index")
-  Thread.new {
-    recursively_find_files()
-    message("Finnish updating file index")
-  }
-end
-
-def recursively_find_files()
-  debug("START find files")
-  dlist = []
-
-  for d in $search_dirs
-    debug("FIND FILEs IN #{d}")
-    dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
-         debug("FIND FILEs IN #{d} END")   end   #$dir_list = Dir.glob('./**/*').select { |e| File.file? e }
-  debug("END find files2")
-  $dir_list = dlist
-  debug("END find files")
-  return $dir_list
-end
-
-def filter_files(search_str)
-  dir_hash = {}
-  scores = Parallel.map($dir_list, in_threads: 8) do |file|
-    [file, srn_dst(search_str, file)]
-  end
-  for s in scores
-    dir_hash[s[0]] = s[1] if s[1] > 0
+  def gui_file_finder_update_callback(search_str = "")
+    debug "FILE FINDER UPDATE CALLBACK: #{search_str}"
+    if (search_str.size > 1)
+      files = filter_files(search_str)
+      @file_search_list = files
+      return files
+      #debug files.inspect
+      #return files.values
+    end
+    return []
   end
-  # debug scores
-  dir_hash = dir_hash.sort_by { |k, v| -v }
-  dir_hash = dir_hash[0..20]
-  dir_hash.map do |file, d|
-    debug "D:#{d} #{file}"
+
+  def gui_file_finder_select_callback(search_str, idx)
+    selected_file = @file_search_list[idx][0]
+    debug "FILE FINDER SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
+    gui_select_window_close(0)
+    open_new_file(selected_file)
   end
-  return dir_hash
-end
 
-def gui_file_finder_update_callback(search_str = "")
-  debug "FILE FINDER UPDATE CALLBACK: #{search_str}"
-  if (search_str.size > 1)
-    files = filter_files(search_str)
-    $file_search_list = files
-    return files
-    #debug files.inspect
-    #return files.values
+  def self.recursively_find_files()
+    debug("START find files")
+    dlist = []
+
+    for d in $search_dirs
+      debug("FIND FILEs IN #{d}")
+      dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
+      debug("FIND FILEs IN #{d} END")
+    end
+    @@dir_list = dlist
+    debug("END find files")
+    return @@dir_list
   end
-  return []
-end
 
-def gui_file_finder_select_callback(search_str, idx)
-  selected_file = $file_search_list[idx][0]
-  debug "FILE FINDER SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
-  gui_select_window_close(0)
-  open_new_file(selected_file)
-end
+  def filter_files(search_str)
+    dir_hash = {}
 
-def gui_file_finder_handle_char(c)
-  debug "BUFFER SELECTOR INPUT CHAR: #{c}"
-  buffer_i = $select_keys.index(c)
-  if buffer_i != nil
-    gui_file_finder_callback(buffer_i)
+    scores = Parallel.map(@@dir_list, in_threads: 8) do |file|
+      [file, srn_dst(search_str, file)]
+    end
+    for s in scores
+      dir_hash[s[0]] = s[1] if s[1] > 0
+    end
+    # debug scores
+    dir_hash = dir_hash.sort_by { |k, v| -v }
+    dir_hash = dir_hash[0..20]
+    dir_hash.map do |file, d|
+      debug "D:#{d} #{file}"
+    end
+    return dir_hash
   end
 end
 
-# TODO: delete?
-def gui_file_finder_init()
-  $kbd.add_mode("Z", :filefinder)
-  bindkey "Z enter", "$kbd.set_mode(:command)"
-  bindkey "Z return", "$kbd.set_mode(:command)"
-end

data/lib/vimamsa/file_history.rb

@@ -8,8 +8,8 @@ class FileHistory
     # x = self.method("update")
     # x.call("ASFASF")
 
-    $hook.register(:change_buffer, self.method("update"))
-    $hook.register(:shutdown, self.method("save"))
+    vma.hook.register(:change_buffer, self.method("update"))
+    vma.hook.register(:shutdown, self.method("save"))
 
     reg_act(:fhist_remove_nonexisting, proc { remove_nonexisting }, "Cleanup history, remove non-existing files")
 
@@ -98,7 +98,6 @@ def gui_file_history_update_callback(search_str = "")
 end
 
 def gui_file_history_select_callback(search_str, idx)
-  # selected_file = $file_search_list[idx][0]
   selected_file = $search_list[idx][0]
 
   debug "FILE HISTORY SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"

data/lib/vimamsa/file_manager.rb

@@ -111,7 +111,7 @@ class FileManager
     end
 
     if @buf.nil?
-      @buf = create_new_file(nil, s)
+      @buf = create_new_buffer(s,"filemgr")
       @buf.module = self
       @buf.active_kbd_mode = :file_exp
     else

data/lib/vimamsa/form_generator.rb

@@ -0,0 +1,122 @@
+# PopupFormGenerator.new().run
+class PopupFormGenerator
+  def submit()
+    for id, entry in @vals
+      @ret[id] = entry.text
+    end
+    if !@callback.nil?
+      @callback.call(@ret)
+    end
+    @window.destroy
+  end
+
+  def initialize(params = nil)
+    @ret = {}
+    @window = Gtk::Window.new()
+    # @window.screen = main_window.screen
+    # @window.title = title
+    # params = {}
+    # params["inputs"] = {}
+    # params["inputs"]["search"] = { :label => "Search", :type => :entry }
+    # params["inputs"]["replace"] = { :label => "Replace", :type => :entry }
+    # params["inputs"]["btn1"] = { :label => "Replace all", :type => :button }
+    # params[:callback] = proc { |x| puts "====="; puts x.inspect; puts "=====" }
+
+
+    @callback = params[:callback]
+    @window.title = ""
+
+    frame = Gtk::Frame.new()
+    frame.margin_bottom = 8
+    frame.margin_top = 8
+    frame.margin_end = 8
+    frame.margin_start = 8
+
+    @window.set_child(frame)
+
+    # @window.title = params["title"]
+
+    # @callback = params["callback"]
+
+    vbox = Gtk::Box.new(:vertical, 8)
+    vbox.margin_bottom = 8
+    vbox.margin_top = 8
+    vbox.margin_end = 8
+    vbox.margin_start = 8
+
+    frame.set_child(vbox)
+
+    if params.has_key?("title")
+      infolabel = Gtk::Label.new
+      infolabel.markup = params["title"]
+      #TODO:gtk4
+      # vbox.pack_start(infolabel, :expand => false, :fill => false, :padding => 0)
+      vbox.pack_end(infolabel, :expand => false, :fill => false, :padding => 0)
+    end
+
+    hbox = Gtk::Box.new(:horizontal, 8)
+    @vals = {}
+    @default_button = nil
+
+    for id, elem in params["inputs"]
+      if elem[:type] == :button
+        button = Gtk::Button.new(:label => elem[:label])
+        hbox.pack_end(button, :expand => false, :fill => false, :padding => 0)
+        if elem[:default_focus] == true
+          @default_button = button
+        end
+        button.signal_connect "clicked" do
+          @ret[id] = "submit"
+          submit
+        end
+      elsif elem[:type] == :entry
+        label = Gtk::Label.new(elem[:label])
+        entry = Gtk::Entry.new
+        if elem.has_key?(:initial_text)
+          entry.text = elem[:initial_text]
+        end
+        hbox.pack_end(label, :expand => false, :fill => false, :padding => 0)
+        hbox.pack_end(entry, :expand => false, :fill => false, :padding => 0)
+        @vals[id] = entry
+
+        press = Gtk::EventControllerKey.new
+        press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+        entry.add_controller(press)
+        press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+          if keyval == Gdk::Keyval::KEY_Return
+            submit
+            true
+          elsif keyval == Gdk::Keyval::KEY_Escape
+            @window.destroy
+            true
+          else
+            false
+          end
+        end
+      end
+    end
+
+    vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 0)
+
+    cancel_button = Gtk::Button.new(:label => "Cancel")
+    cancel_button.signal_connect "clicked" do
+      @window.destroy
+    end
+    hbox.pack_end(cancel_button, :expand => false, :fill => false, :padding => 0)
+    @cancel_button = cancel_button
+    return
+  end
+
+  def run
+    if !@window.visible?
+      @window.show
+    else
+      @window.destroy
+    end
+    if !@default_button.nil?
+      @default_button.grab_focus
+    end
+    @window.set_focus_visible(true)
+    @window
+  end
+end