vimamsa 0.1.12 → 0.1.14

data/lib/vimamsa/file_manager.rb

@@ -1,8 +1,12 @@
+require "fileutils"
+
 class FileManager
   @@cur
 
   def initialize()
     @buf = nil
+    @cut_files = []
+    @copied_files = []
   end
 
   def self.chdir_parent()
@@ -14,7 +18,7 @@ class FileManager
   end
 
   def self.init()
-    reg_act(:start_file_selector, proc { FileManager.new.run; $kbd.set_mode(:file_exp) }, "File selector")
+    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp); vma.kbd.set_default_mode(:file_exp) }, "File selector")
 
     reg_act(:fexp_chdir_parent, proc { FileManager.chdir_parent }, "File selector")
     reg_act(:fexp_select, proc { buf.module.select_line }, "")
@@ -32,6 +36,19 @@ class FileManager
     bindkey "fexp o m", :fexp_sort_mtime
     bindkey "fexp o f", :fexp_sort_fname
 
+    # These are not yet safe to use
+    if cnf.fexp.experimental?
+      reg_act(:fexp_cut_file, proc { FileManager.cur.cut_file }, "Cut file (to paste elsewhere)")
+      reg_act(:fexp_copy_file, proc { FileManager.cur.copy_file }, "Copy file (to paste elsewhere)")
+      reg_act(:fexp_delete_file, proc { FileManager.cur.delete_file }, "Delete current file")
+      reg_act(:fexp_paste_files, proc { FileManager.cur.paste_files }, "Move previously cut files here")
+
+      bindkey "fexp d d", :fexp_cut_file
+      bindkey "fexp y y", :fexp_copy_file
+      bindkey "fexp d D", :fexp_delete_file
+      bindkey "fexp p p", :fexp_paste_files
+    end
+
     # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
     bindkey "fexp esc", [:fexp_quit, proc { FileManager.cur.quit }, ""]
@@ -63,18 +80,106 @@ class FileManager
     dir_to_buf(@ld)
   end
 
+  def paste_files
+    if !@cut_files.empty?
+      message "MOVE FILES #{@cut_files.join(",")} TO #{@ld} "
+      # Thread.new {
+      for fn in @cut_files
+        FileUtils.move(fn, @ld)
+        puts "FileUtils.move(#{fn}, #{@ld})"
+      end
+    elsif !@copied_files.empty?
+      for fn in @copied_files
+        bn = File.basename(fn)
+        bnwe = File.basename(fn, ".*")
+        ext = File.extname(fn)
+        dst = "#{@ld}/#{bn}"
+        break if !File.exist?(fn)
+        if dst == fn #or File.exist?(dst)
+          i = 1
+          exists = true
+          while File.exist?(dst)
+            dst = "#{@ld}/#{bnwe}_copy#{i}#{ext}"
+            i += 1
+          end
+        elsif File.exist?(dst)
+          message("File #{dst} already exists")
+          break
+          #TODO: confirm if user wants to replace existing file
+        end
+        message "FileUtils.copy_entry(#{fn}, #{dst})"
+        FileUtils.copy_entry(fn, dst, preserve = false, dereference_root = false, remove_destination = false)
+      end
+    else
+      message "Nothing to paste, cut/copy some files first!"
+      return
+    end
+    # }
+    @cut_files = []
+    @copied_files = []
+    refresh
+  end
+
+  def cut_file
+    fn = cur_file
+    debug "CUT FILE #{fn}", 2
+    @cut_files << fn
+    @copied_files = []
+  end
+
+  def copy_file
+    fn = cur_file
+    debug "COPY FILE #{fn}", 2
+    @copied_files << fn
+    @cut_files = []
+  end
+
+  def delete_file_confirmed(*args)
+    debug args, 2
+    fn = @file_to_delete
+    message "Deleting file #{fn}"
+    # FileUtils.remove_file(fn)
+    FileUtils.remove_entry_secure(fn, force = false)
+    refresh
+  end
+
+  def delete_file
+    fn = cur_file
+    if File.file?(fn)
+      @file_to_delete = fn #TODO: set as parameter to confirm_box
+      Gui.confirm("Delete the file? \r #{fn}",
+                  self.method("delete_file_confirmed"))
+    elsif File.directory?(fn)
+      @file_to_delete = fn #TODO: set as parameter to confirm_box
+      Gui.confirm("Delete the directory? \r #{fn}",
+                  self.method("delete_file_confirmed"))
+    else
+      message "Can't delete #{fn}"
+    end
+
+    # TODO: FileUtils.remove_dir
+
+    #TODO:
+  end
+
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
 
+    debug "last file: #{vma.buffers.last_file}", 2
+    lastf = vma.buffers.last_file
+    jumpto = nil
+    if File.dirname(lastf) == dirpath
+      jumpto = File.basename(lastf)
+    end
     vma.buffers.last_dir = dirpath
     dirpath = File.expand_path(dirpath)
     @header = []
     @header << "#{dirpath}"
     @header << "=" * 40
-    @ld = dirpath
+    @ld = dirpath # Path to current directory
     @dlist = Dir.children(@ld).sort
-    @cdirs = []
-    @cfiles = []
+    @cdirs = [] # Dirs in current directory
+    @cfiles = [] # Files in current directory
     for x in @dlist
       fpath = fullp(x)
 
@@ -93,7 +198,6 @@ class FileManager
       end
     end
 
-
     @cfiles.sort_by! { |x| x[1].mtime }.reverse! if @sort_by == :mtime
     @cfiles.sort_by! { |x| x[1].size }.reverse! if @sort_by == :size
     @cfiles.sort_by! { |x| x[0] } if @sort_by == :name
@@ -105,29 +209,54 @@ class FileManager
     s << @cdirs.join("\n")
     s << "\n"
     s << "\n"
+    jumppos = nil
     for f in @cfiles
+      if f[0] == jumpto
+        jumppos = s.size
+      end
       s << "#{f[0]}\n"
       # s << @cfiles.join("\n")
     end
 
     if @buf.nil?
-      @buf = create_new_buffer(s,"filemgr")
+      @buf = create_new_buffer(s, "filemgr")
+      @buf.default_mode = :file_exp
       @buf.module = self
       @buf.active_kbd_mode = :file_exp
     else
       @buf.set_content(s)
     end
-    @buf.set_line_and_column_pos(@header.size, 0)
+    if jumppos
+      @buf.set_pos(jumppos)
+    else
+      @buf.set_line_and_column_pos(@header.size, 0)
+    end
   end
 
   def fullp(fn)
     "#{@ld}/#{fn}"
   end
 
+  def refresh
+    # TODO: only apply diff
+    lpos = @buf.lpos
+    # cpos = @buf.cpos
+    dir_to_buf(@ld)
+    @buf.set_line_and_column_pos(lpos, 0)
+  end
+
+  def cur_file
+    return nil if @buf.lpos < @header.size
+    fn = fullp(@buf.get_current_line[0..-2])
+    return fn
+  end
+
   def select_line
-    return if @buf.lpos < @header.size
+    # return if @buf.lpos < @header.size
     # debug "def select_line"
-    fn = fullp(@buf.get_current_line[0..-2])
+    # fn = fullp(@buf.get_current_line[0..-2])
+    fn = cur_file
+    return if fn.nil?
     if File.directory?(fn)
       debug "CHDIR: #{fn}"
       dir_to_buf(fn)

data/lib/vimamsa/gui.rb

@@ -6,7 +6,6 @@ def gui_open_file_dialog(dirpath)
                                       :buttons => [["Open", :accept],
                                                    ["Cancel", :cancel]])
   dialog.set_current_folder(Gio::File.new_for_path(dirpath))
-  # dialog.set_current_folder(Gio::File.new_for_path("/tmp"))
 
   dialog.signal_connect("response") do |dialog, response_id|
     if response_id == Gtk::ResponseType::ACCEPT
@@ -24,7 +23,7 @@ def gui_file_saveas(dirpath)
                                       :action => :save,
                                       :buttons => [["Save", :accept],
                                                    ["Cancel", :cancel]])
-  # dialog.set_current_folder(dirpath) #TODO:gtk4
+  dialog.set_current_folder(Gio::File.new_for_path(dirpath))
   dialog.signal_connect("response") do |dialog, response_id|
     if response_id == Gtk::ResponseType::ACCEPT
       file_saveas(dialog.file.parse_name)
@@ -36,32 +35,6 @@ def gui_file_saveas(dirpath)
   dialog.show
 end
 
-def idle_func
-  # debug "IDLEFUNC"
-  if $idle_scroll_to_mark
-    # $view.get_visible_rect
-    vr = $view.visible_rect
-
-    # iter = b.get_iter_at(:offset => i)
-
-    b = $view.buffer
-    iter = b.get_iter_at(:offset => b.cursor_position)
-    iterxy = $view.get_iter_location(iter)
-    # debug "ITERXY" + iterxy.inspect
-
-    intr = iterxy.intersect(vr)
-    if intr.nil?
-      $view.set_cursor_pos($view.buffer.cursor_position)
-    else
-      $idle_scroll_to_mark = false
-    end
-
-    sleep(0.1)
-  end
-  sleep(0.01)
-  return true
-end
-
 def center_on_current_line()
   b = $view.buffer
   iter = b.get_iter_at(:offset => b.cursor_position)
@@ -90,37 +63,7 @@ def page_down
   return true
 end
 
-def paste_system_clipboard()
 
-  #TODO: Check if something useful in this old GTK3 code.
-  utf8_string = Gdk::Atom.intern("UTF8_STRING")
-
-  clipboard = Gtk::Clipboard.get_default($vmag.window.display)
-  received_text = ""
-
-  target_string = Gdk::Selection::TARGET_STRING
-  ti = clipboard.request_contents(target_string)
-
-  if clipboard.wait_is_text_available?
-    received_text = clipboard.wait_for_text
-  end
-
-  if received_text != "" and !received_text.nil?
-    max_clipboard_items = 100
-    if received_text != $clipboard[-1]
-      #TODO: HACK
-      $paste_lines = false
-    end
-    $clipboard << received_text
-    # debug $clipboard[-1]
-    $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
-  end
-  return received_text
-end
-
-def set_system_clipboard(arg)
-  vma.gui.window.display.clipboard.set(arg)
-end
 
 def gui_create_buffer(id, bufo)
   debug "gui_create_buffer(#{id})"
@@ -128,7 +71,7 @@ def gui_create_buffer(id, bufo)
   view = VSourceView.new(nil, bufo)
 
   view.register_signals()
-  $debug = true
+  cnf.debug = true
 
   ssm = GtkSource::StyleSchemeManager.new
   ssm.set_search_path(ssm.search_path << ppath("styles/"))
@@ -145,6 +88,7 @@ def gui_create_buffer(id, bufo)
   provider.load(data: "textview { font-family: Monospace; font-size: 11pt; }")
   view.style_context.add_provider(provider)
   view.wrap_mode = :char
+  pp $cnf
   view.set_tab_width(conf(:tab_width))
 
   $vmag.buffers[id] = view
@@ -313,9 +257,15 @@ class VMAgui
   # Run proc after animated scrolling has stopped (e.g. after page down)
   def run_after_scrolling(p)
     Thread.new {
+      # After running
+      #   view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES)
+      # have to wait for animated page down scrolling to actually start
+      # Then have to wait determine that it has stopped if scrolling adjustment stops changing. There should be a better way to do this.
+      sleep 0.1
       while Time.now - @last_adj_time < 0.1
         sleep 0.1
       end
+      debug "SCROLLING ENDED", 2
       run_as_idle p
     }
   end
@@ -346,6 +296,7 @@ class VMAgui
   end
 
   def handle_deltas()
+    view.delete_cursor_char
     while d = buf.deltas.shift
       pos = d[0]
       op = d[1]
@@ -624,6 +575,7 @@ class VMAgui
       @sw = Gtk::ScrolledWindow.new
       @sw.set_policy(:automatic, :automatic)
 
+
       @last_adj_time = Time.now
       @sw.vadjustment.signal_connect("value-changed") { |x|
         # pp x.page_increment

data/lib/vimamsa/gui_dialog.rb

@@ -0,0 +1,113 @@
+module Gui
+  def self.confirm(title, callback)
+    params = {}
+    params["title"] = title
+    params["inputs"] = {}
+    params["inputs"]["yes_btn"] = { :label => "Yes", :type => :button, :default_focus => true }
+    params[:callback] = callback
+    PopupFormGenerator.new(params).run
+  end
+end
+
+module Gtk
+  class Frame
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
+    end
+  end
+
+  class Box
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
+    end
+  end
+end
+
+def set_margin_all(widget, m)
+  widget.margin_bottom = m
+  widget.margin_top = m
+  widget.margin_end = m
+  widget.margin_start = m
+end
+
+class OneInputAction
+  def initialize(main_window, title, field_label, button_title, callback, opt = {})
+    @window = Gtk::Window.new()
+    # @window.screen = main_window.screen
+    # @window.title = title
+    @window.title = ""
+
+    frame = Gtk::Frame.new()
+    # frame.margin = 20
+    @window.set_child(frame)
+
+    infolabel = Gtk::Label.new
+    infolabel.markup = title
+
+    vbox = Gtk::Box.new(:vertical, 8)
+    vbox.margin = 10
+    frame.set_child(vbox)
+
+    hbox = Gtk::Box.new(:horizontal, 8)
+    # @window.add(hbox)
+    vbox.pack_end(infolabel, :expand => false, :fill => false, :padding => 0)
+    vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 0)
+
+    button = Gtk::Button.new(:label => button_title)
+    cancel_button = Gtk::Button.new(:label => "Cancel")
+
+    label = Gtk::Label.new(field_label)
+
+    @entry1 = Gtk::Entry.new
+
+    if opt[:hide]
+      @entry1.visibility = false
+    end
+
+    button.signal_connect "clicked" do
+      callback.call(@entry1.text)
+      @window.destroy
+    end
+
+    cancel_button.signal_connect "clicked" do
+      @window.destroy
+    end
+
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+    @window.add_controller(press)
+    press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      if keyval == Gdk::Keyval::KEY_Return
+        callback.call(@entry1.text)
+        @window.destroy
+        true
+      elsif keyval == Gdk::Keyval::KEY_Escape
+        @window.destroy
+        true
+      else
+        false
+      end
+    end
+
+    hbox.pack_end(label, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(@entry1, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(button, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(cancel_button, :expand => false, :fill => false, :padding => 0)
+    return
+  end
+
+  def run
+    if !@window.visible?
+      @window.show
+    else
+      @window.destroy
+    end
+    @window
+  end
+end

data/lib/vimamsa/gui_select_window.rb

@@ -69,13 +69,19 @@ class SelectUpdateWindow
 
     @window.add(vbox)
 
+    if !opt[:desc].nil?
+      descl = Gtk::Label.new(opt[:desc])
+      set_margin_all(descl,15)
+      # vbox.append(descl, :expand => false, :fill => false, :padding => 0)
+      vbox.append(descl)
+    end
+
     @entry = Gtk::SearchEntry.new
     @entry.width_chars = 45
     container = Gtk::Box.new(:horizontal, 10)
     # container.halign = :start
     container.halign = :center
-    container.pack_start(@entry,
-                         :expand => false, :fill => false, :padding => 0)
+    container.append(@entry)
 
     # create tree view
     @model = Gtk::ListStore.new(String, String)
@@ -135,11 +141,6 @@ class SelectUpdateWindow
     @entry.signal_connect("changed") { debug "[changed] " }
     @entry.signal_connect("next-match") { debug "[next-match] " }
 
-    if !opt[:desc].nil?
-      descl = Gtk::Label.new(opt[:desc])
-      vbox.pack_start(descl, :expand => false, :fill => false, :padding => 0)
-    end
-
     # label = Gtk::Label.new(<<-EOF)
     # Search:
     # EOF
@@ -147,7 +148,7 @@ class SelectUpdateWindow
     # label = Gtk::Label.new("Input:")
     # vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-    vbox.pack_start(container, :expand => false, :fill => false, :padding => 0)
+    vbox.append(container)
     sw = Gtk::ScrolledWindow.new(nil, nil)
     # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)