vimamsa 0.1.7 → 0.1.10

data/lib/vimamsa/file_finder.rb

@@ -1,5 +1,4 @@
 require "parallel"
-
 class FileFinder
   def initialize()
     $hook.register(:shutdown, self.method("save"))
@@ -42,9 +41,7 @@ def recursively_find_files()
   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("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")
@@ -59,22 +56,22 @@ def filter_files(search_str)
   for s in scores
     dir_hash[s[0]] = s[1] if s[1] > 0
   end
-  # puts scores
+  # debug scores
   dir_hash = dir_hash.sort_by { |k, v| -v }
   dir_hash = dir_hash[0..20]
   dir_hash.map do |file, d|
-    puts "D:#{d} #{file}"
+    debug "D:#{d} #{file}"
   end
   return dir_hash
 end
 
 def gui_file_finder_update_callback(search_str = "")
-  puts "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
-    #puts files.inspect
+    #debug files.inspect
     #return files.values
   end
   return []
@@ -88,7 +85,7 @@ def gui_file_finder_select_callback(search_str, idx)
 end
 
 def gui_file_finder_handle_char(c)
-  puts "BUFFER SELECTOR INPUT CHAR: #{c}"
+  debug "BUFFER SELECTOR INPUT CHAR: #{c}"
   buffer_i = $select_keys.index(c)
   if buffer_i != nil
     gui_file_finder_callback(buffer_i)

data/lib/vimamsa/file_history.rb

@@ -21,7 +21,7 @@ class FileHistory
   # end
 
   def update(buf)
-    puts "FileHistory.update(buf=#{buf.fname})"
+    debug "FileHistory.update(buf=#{buf.fname})"
     return if !buf.fname
     @history[buf.fname] if !@history[buf.fname]
     if !@history[buf.fname]
@@ -29,7 +29,7 @@ class FileHistory
     else
       @history[buf.fname] += 1
     end
-    puts @history
+    debug @history
 
     # puts "FileHistory.update(buf=#{buf})"
   end
@@ -83,7 +83,7 @@ def fuzzy_filter(search_str, list, maxfinds)
 end
 
 def gui_file_history_update_callback(search_str = "")
-  puts "gui_file_history_update_callback: #{search_str}"
+  debug "gui_file_history_update_callback: #{search_str}"
   return [] if $vma.fh.history.empty?
   $search_list = []
   files = $vma.fh.history.keys.sort.collect { |x| [x, 0] }

data/lib/vimamsa/file_manager.rb

@@ -27,14 +27,14 @@ class FileManager
 
     # bindkey "C o", :delete_state
 
-    $kbd.add_minor_mode("fexp", :file_exp, :command)
-    
+    vma.kbd.add_minor_mode("fexp", :file_exp, :command)
+
     bindkey "fexp o m", :fexp_sort_mtime
-    bindkey "fexp o f", :fexp_sort_fname   
+    bindkey "fexp o f", :fexp_sort_fname
 
-    # bindkey "fexp l", [:fexp_right, proc { puts "==fexp_right==" }, ""]
+    # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
-    bindkey "fexp esc", [:fexp_quit, proc { $kbd.set_mode(:command) }, ""]
+    bindkey "fexp esc", [:fexp_quit, proc { FileManager.cur.quit }, ""]
     bindkey "fexp enter", :fexp_select
     bindkey "fexp l", :fexp_select
 
@@ -49,7 +49,7 @@ class FileManager
     @@cur = self
     ld = buflist.get_last_dir
     dir_to_buf(ld)
-    # puts "ld=#{ld}"
+    # debug "ld=#{ld}"
     # dlist = Dir["#{ld}/*"]
   end
 
@@ -65,6 +65,8 @@ class FileManager
 
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
+
+    vma.buffers.last_dir = dirpath
     dirpath = File.expand_path(dirpath)
     @header = []
     @header << "#{dirpath}"
@@ -83,7 +85,7 @@ class FileManager
         next
       end
       next if x[0] == "."
-      if File.directory?(fpath) 
+      if File.directory?(fpath)
         # if f.directory?(fpath)
         @cdirs << x
       else
@@ -91,9 +93,7 @@ class FileManager
       end
     end
 
-    # sort_by = :mtime
-    # sort_by = :name
-    # Ripl.start :binding => binding
+
     @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
@@ -126,10 +126,10 @@ class FileManager
 
   def select_line
     return if @buf.lpos < @header.size
-    # puts "def select_line"
+    # debug "def select_line"
     fn = fullp(@buf.get_current_line[0..-2])
     if File.directory?(fn)
-      puts "CHDIR: #{fn}"
+      debug "CHDIR: #{fn}"
       dir_to_buf(fn)
       # elsif vma.can_open_extension?(fn)
       # jump_to_file(fn)
@@ -139,6 +139,9 @@ class FileManager
     else
       open_with_default_program(fn)
     end
-    # puts l.inspect
+  end
+
+  def quit
+    @buf.close
   end
 end

data/lib/vimamsa/gui.rb

@@ -10,7 +10,7 @@ def gui_open_file_dialog(dirpath)
   dialog.signal_connect("response") do |dialog, response_id|
     if response_id == Gtk::ResponseType::ACCEPT
       open_new_file(dialog.filename)
-      # puts "uri = #{dialog.uri}"
+      # debug "uri = #{dialog.uri}"
     end
     dialog.destroy
   end
@@ -34,7 +34,7 @@ def gui_file_saveas(dirpath)
 end
 
 def idle_func
-  # puts "IDLEFUNC"
+  # debug "IDLEFUNC"
   if $idle_scroll_to_mark
     # Ripl.start :binding => binding
     # $view.get_visible_rect
@@ -45,7 +45,7 @@ def idle_func
     b = $view.buffer
     iter = b.get_iter_at(:offset => b.cursor_position)
     iterxy = $view.get_iter_location(iter)
-    # puts "ITERXY" + iterxy.inspect
+    # debug "ITERXY" + iterxy.inspect
     # Ripl.start :binding => binding
 
     intr = iterxy.intersect(vr)
@@ -103,7 +103,7 @@ def paste_system_clipboard()
 
   # clipboard.request_contents(target_string) do |_clipboard, selection_data|
   # received_text = selection_data.text
-  # puts "received_text=#{received_text}"
+  # debug "received_text=#{received_text}"
   # end
   if clipboard.wait_is_text_available?
     received_text = clipboard.wait_for_text
@@ -116,7 +116,7 @@ def paste_system_clipboard()
       $paste_lines = false
     end
     $clipboard << received_text
-    # puts $clipboard[-1]
+    # debug $clipboard[-1]
     $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
   end
   return received_text
@@ -131,30 +131,27 @@ def set_system_clipboard(arg)
   clipboard.text = arg
 end
 
-def gui_create_buffer(id)
-  puts "gui_create_buffer(#{id})"
+def gui_create_buffer(id, bufo)
+  debug "gui_create_buffer(#{id})"
   buf1 = GtkSource::Buffer.new()
-  view = VSourceView.new()
-
-  view.set_highlight_current_line(true)
-  view.set_show_line_numbers(true)
-  view.set_buffer(buf1)
+  view = VSourceView.new(nil, bufo)
 
   ssm = GtkSource::StyleSchemeManager.new
   ssm.set_search_path(ssm.search_path << ppath("styles/"))
-  #  sty = ssm.get_scheme("dark")
   sty = ssm.get_scheme("molokai_edit")
-  # puts ssm.scheme_ids
 
-  view.buffer.highlight_matching_brackets = true
-  view.buffer.style_scheme = sty
+  buf1.highlight_matching_brackets = true
+  buf1.style_scheme = sty
+
+  view.set_highlight_current_line(true)
+  view.set_show_line_numbers(true)
+  view.set_buffer(buf1)
 
   provider = Gtk::CssProvider.new
   provider.load(data: "textview { font-family: Monospace; font-size: 11pt; }")
-  # provider.load(data: "textview { font-family: Arial; font-size: 12pt; }")
   view.style_context.add_provider(provider)
   view.wrap_mode = :char
-  view.set_tab_width(4) #TODO:add as setting
+  view.set_tab_width(conf(:tab_width))
 
   $vmag.buffers[id] = view
 end
@@ -177,25 +174,18 @@ end
 def gui_select_window_close(arg = nil)
 end
 
-# def set_window_title(str)
-# unimplemented
-# end
-
 def gui_set_buffer_contents(id, txt)
-  # $vbuf.set_text(txt)
-  puts "gui_set_buffer_contents(#{id}, txt)"
-
-  $vmag.buffers[id].buffer.set_text(txt)
+  debug "gui_set_buffer_contents(#{id}, txt)"
+  vma.gui.buffers[id].buffer.set_text(txt)
 end
 
 def gui_set_cursor_pos(id, pos)
-  $view.set_cursor_pos(pos)
-  # Ripl.start :binding => binding
+  vma.buf.view.set_cursor_pos(pos)
 end
 
 def gui_set_current_buffer(id)
   view = $vmag.buffers[id]
-  puts "gui_set_current_buffer(#{id}), view=#{view}"
+  debug "gui_set_current_buffer(#{id}), view=#{view}"
   buf1 = view.buffer
   $vmag.view = view
   $vmag.buf1 = buf1
@@ -206,17 +196,9 @@ def gui_set_current_buffer(id)
   $vmag.sw.add(view)
 
   view.grab_focus
-  #view.set_focus(10)
   view.set_cursor_visible(true)
-  #view.move_cursor(1, 1, false)
   view.place_cursor_onscreen
 
-  #TODO:
-  # itr = view.buffer.get_iter_at(:offset => 0)
-  # view.buffer.place_cursor(itr)
-
-  # wtitle = ""
-  # wtitle = buf.fname if !buf.fname.nil?
   $vmag.sw.show_all
 end
 
@@ -226,7 +208,7 @@ def gui_set_window_title(wtitle, subtitle = "")
 end
 
 class VMAgui
-  attr_accessor :buffers, :sw, :view, :buf1, :window
+  attr_accessor :buffers, :sw, :view, :buf1, :window, :delex, :statnfo
 
   VERSION = "1.0"
 
@@ -242,6 +224,22 @@ class VMAgui
     @buffers = {}
     @view = nil
     @buf1 = nil
+    @img_resizer_active = false
+    imgproc = proc {
+      GLib::Idle.add(proc {
+        if !buf.images.empty?
+          vma.gui.scale_all_images
+
+          w = Gtk::Window.new(:toplevel)
+          w.set_default_size(1, 1)
+          w.show_all
+          Thread.new { sleep 0.1; w.destroy }
+        end
+
+        false
+      })
+    }
+    @delex = DelayExecutioner.new(1, imgproc)
   end
 
   def run
@@ -250,6 +248,38 @@ class VMAgui
     Gtk.main
   end
 
+  def delay_scale()
+    if Time.now - @dtime > 2.0
+    end
+  end
+
+  def scale_all_images
+    # puts "scale all"
+    for img in buf.images
+      if !img[:obj].destroyed?
+        img[:obj].scale_image
+      end
+    end
+  end
+
+  def handle_image_resize
+    return if @img_resizer_active == true
+    @dtime = Time.now
+
+    $gcrw = 0
+    vma.gui.window.signal_connect "configure-event" do |widget, cr|
+      # Ripl.start :binding => binding
+
+      if $gcrw != cr.width
+        @delex.run
+      end
+      $gcrw = cr.width
+      false
+    end
+
+    @img_resizer_active = true
+  end
+
   def start_overlay_draw()
     @da = Gtk::Fixed.new
     @overlay.add_overlay(@da)
@@ -263,10 +293,10 @@ class VMAgui
   end
 
   def overlay_draw_text(text, textpos)
-    # puts "overlay_draw_text #{[x,y]}"
+    # debug "overlay_draw_text #{[x,y]}"
     (x, y) = @view.pos_to_coord(textpos)
-    # puts "overlay_draw_text #{[x,y]}"
-    label = Gtk::Label.new("<span background='#00000088' foreground='#ff0000' weight='ultrabold'>#{text}</span>")
+    # debug "overlay_draw_text #{[x,y]}"
+    label = Gtk::Label.new("<span background='#000000ff' foreground='#ff0000' weight='ultrabold'>#{text}</span>")
     label.use_markup = true
     @da.put(label, x, y)
   end
@@ -301,7 +331,7 @@ class VMAgui
     # istart = @view.get_iter_at_y(vr.y)
     # startpos = @view.get_iter_at_position_raw(vr.x,vr.y)[1].offset
     # endpos = @view.get_iter_at_position_raw(vr.x+vr.width,vr.y+vr.height)[1].offset
-    # puts "startpos,endpos:#{[startpos, endpos]}"
+    # debug "startpos,endpos:#{[startpos, endpos]}"
 
     da = @da
     if false
@@ -335,7 +365,7 @@ class VMAgui
       da.put(label, x, y)
     end
 
-    # puts @view.pos_to_coord(300).inspect
+    # debug @view.pos_to_coord(300).inspect
 
     @da.show_all
   end
@@ -370,21 +400,21 @@ class VMAgui
     overlay = Gtk::Overlay.new
     overlay.add(sw)
     # @vpaned.pack2(overlay, :resize => false)
-    @vbox.attach(overlay, 0, 2, 1, 1)
+    @vbox.attach(overlay, 0, 2, 2, 1)
     # overlay.set_size_request(-1, 50)
     # $ovrl = overlay
     # $ovrl.set_size_request(-1, 30)
     $sw2 = sw
     sw.set_size_request(-1, 12)
 
-    view = VSourceView.new()
+    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
+    view.buffer.highlight_matching_brackets = false #TODO
     view.buffer.style_scheme = sty
     provider = Gtk::CssProvider.new
     # provider.load(data: "textview { font-family: Monospace; font-size: 11pt; }")
@@ -405,7 +435,6 @@ class VMAgui
     header.title = ""
     header.has_subtitle = true
     header.subtitle = ""
-    # Ripl.start :binding => binding
 
     # icon = Gio::ThemedIcon.new("mail-send-receive-symbolic")
     # icon = Gio::ThemedIcon.new("document-open-symbolic")
@@ -481,69 +510,46 @@ class VMAgui
 
     header.pack_start(box)
     @window.titlebar = header
-    @window.add(Gtk::TextView.new)
-  end
-
-  def create_menu_item(label, depth)
-    menuitem = Gtk::MenuItem.new(:label => label)
-    menuitem.submenu = create_menu(depth)
-    @menubar.append(menuitem)
-  end
-
-  def create_menu(depth)
-    return nil if depth < 1
-
-    menu = Gtk::Menu.new
-    last_item = nil
-    (0..5).each do |i|
-      j = i + 1
-      label = "item #{depth} - #{j}"
-      menu_item = Gtk::RadioMenuItem.new(nil, label)
-      menu_item.join_group(last_item) if last_item
-      last_item = menu_item
-      menu.append(menu_item)
-      menu_item.sensitive = false if i == 3
-      menu_item.submenu = create_menu(depth - 1)
-    end
-
-    menu
+    # @window.add(Gtk::TextView.new)
   end
 
   def init_window
     @window = Gtk::Window.new(:toplevel)
-    @window.set_default_size(650, 850)
+    sh = @window.screen.height
+    sw = @window.screen.width
+    # TODO:Maximise vertically
+    @window.set_default_size((sw * 0.45).to_i, sh - 20)
+
     @window.title = "Multiple Views"
     @window.show_all
-    # vpaned = Gtk::Paned.new(:horizontal)
     @vpaned = Gtk::Paned.new(:vertical)
-    #@vpaned = Gtk::Box.new(:vertical, 0)
-    # @vbox = Gtk::Box.new(:vertical, 0)
+
     @vbox = Gtk::Grid.new()
     @window.add(@vbox)
 
     @menubar = Gtk::MenuBar.new
     @menubar.expand = false
-    
 
     @sw = Gtk::ScrolledWindow.new
     @sw.set_policy(:automatic, :automatic)
     @overlay = Gtk::Overlay.new
     @overlay.add(@sw)
 
-    # @vpaned.pack1(@overlay, :resize => true)
-    # @vpaned.pack2(@menubar, :resize => false)
-    # @vbox.add(@menubar, :resize => false)
-
     init_header_bar
 
-    # @window.show_all
+    @statnfo = Gtk::Label.new
+    provider = Gtk::CssProvider.new
+    provider.load(data: "textview {   background-color:#353535; font-family: Monospace; font-size: 10pt; margin-top:4px;}")
+    @statnfo.style_context.add_provider(provider)
+
+    # Deprecated, but found no other way to do it. css doesn't work.
+    # TODO: should select color automatically from theme
+    @statnfo.override_background_color(Gtk::StateFlags::NORMAL, "#353535")
 
-    # @vbox.pack_start(@menubar, :expand => false, :fill => false, :padding => 0 )
-    # @vbox.pack_start(@menubar)
-    # @vbox.pack_start(@overlay, :expand => true, :fill => true, :padding => 0 )
-    # @vbox.pack_start(@overlay, :expand => true, :fill => true, :padding => 0 )
+    # column, row, width height
     @vbox.attach(@menubar, 0, 0, 1, 1)
-    @vbox.attach(@overlay, 0, 1, 1, 1)
+    @vbox.attach(@statnfo, 1, 0, 1, 1)
+    @vbox.attach(@overlay, 0, 1, 2, 1)
     @overlay.vexpand = true
     @overlay.hexpand = true
 
@@ -552,11 +558,10 @@ class VMAgui
 
     init_minibuffer
 
-
     @window.show_all
     vma.start
     Vimamsa::Menu.new(@menubar)
+
     @window.show_all
-    
   end
 end

data/lib/vimamsa/gui_image.rb

@@ -0,0 +1,43 @@
+
+# Following this example:
+# https://gabmus.org/posts/create_an_auto-resizing_image_widget_with_gtk3_and_python/
+class ResizableImage < Gtk::DrawingArea
+  attr_accessor :fpath, :pixbuf, :oldimg, :draw_image, :view
+
+  def initialize(fpath, view)
+    @fpath = fpath
+    @pixbuf = GdkPixbuf::Pixbuf.new(:file => fpath)
+    @oldimg = @pixbuf
+    @draw_image = @pixbuf
+    @view = view
+
+    super()
+  end
+
+  # Scale to fit window width
+  def scale_image()
+    pb = @pixbuf
+    view = @view
+    imglimit = view.visible_rect.width - 10
+
+    if @oldimg.width > imglimit or @oldimg.width < imglimit - 10
+      nwidth = imglimit
+      nwidth = pb.width if pb.width < imglimit
+      nheight = (pb.height * (nwidth.to_f / pb.width)).to_i
+      pb = pb.scale_simple(nwidth, nheight, GdkPixbuf::InterpType::HYPER)
+    else
+      pb = @oldimg
+    end
+    @draw_image = pb
+    @oldimg = pb
+    self.set_size_request(pb.width, pb.height)
+
+  end
+
+  def do_draw(da, cr)
+    # puts @fpath
+    cr.set_source_pixbuf(@draw_image, 0, 0)
+    cr.paint
+  end
+end
+

data/lib/vimamsa/gui_menu.rb

@@ -4,7 +4,7 @@ module Vimamsa
       mpath = _mpath.split(".")
       curnfo = @nfo
       for y in mpath
-        puts curnfo.inspect
+        debug(curnfo.inspect)
         if y.equal?(mpath.last)
           curnfo[y] = x
         elsif curnfo[y].nil?
@@ -16,12 +16,15 @@ module Vimamsa
     end
 
     def add_menu_items()
+    
+      add_to_menu "File.Example", { :label => "<span foreground='#888888'>Action, [mode] key binding</span>", :action => nil }
       add_to_menu "File.Save", { :label => "Save", :action => :buf_save }
       add_to_menu "File.Save as", { :label => "Save As...", :action => :buf_save_as }
       add_to_menu "File.Open", { :label => "Open", :action => :open_file_dialog }
 
       add_to_menu "File.New", { :label => "New file", :action => :buf_new }
       add_to_menu "File.Revert", { :label => "Reload file from disk", :action => :buf_revert }
+      add_to_menu "File.List", { :label => "List open files", :action => :start_buf_manager }
 
       add_to_menu "File.Quit", { :label => "Quit", :action => :quit }
 
@@ -37,8 +40,14 @@ module Vimamsa
       add_to_menu "Actions.FileHistoryFinder", { :label => "Search files in history", :action => :gui_file_history_finder }
 
       add_to_menu "Actions.experimental.Diff", { :label => "Show Diff of\nunsaved changes", :action => :diff_buffer }
-
+      
+      add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
+      add_to_menu "Actions.experimental.DisableDebug", { :label => "Disable debug", :action => :disable_debug }
+      add_to_menu "Actions.experimental.ShowImages", { :label => "Show images ⟦img:path⟧", :action => :show_images }
+      
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
+      add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
+      
 
       #TODO: :auto_indent_buffer