vimamsa 0.1.8 → 0.1.9

data/lib/vimamsa/editor.rb

@@ -70,13 +70,6 @@ class Editor
   end
 
   def start
-    # $highlight = {}
-
-    # GLib::Idle.add
-    # Ripl.start :binding => binding
-    # GLib::Idle.add(proc{ debug "IDLEFUNC"})
-    # GLib::Idle.add(proc { idle_func })
-
     @gui = $vmag #TODO
 
     $hook = Hook.new
@@ -95,13 +88,15 @@ class Editor
     # build_key_bindings_tree
     @kbd = KeyBindingTree.new()
     $kbd = @kbd
-    $kbd.add_mode("C", :command)
-    $kbd.add_mode("I", :insert)
-    $kbd.add_mode("V", :visual)
-    $kbd.add_mode("M", :minibuffer)
-    $kbd.add_mode("R", :readchar)
-    $kbd.add_mode("B", :browse)
-    $kbd.set_default_mode(:command)
+    @kbd.add_mode("C", :command)
+    @kbd.add_mode("I", :insert)
+    @kbd.add_mode("V", :visual)
+    @kbd.add_mode("M", :minibuffer)
+    @kbd.add_mode("R", :readchar)
+    @kbd.add_mode("B", :browse)
+    @kbd.set_default_mode(:command)
+    @kbd.set_mode(:command)
+    @kbd.show_state_trail
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
 
@@ -118,6 +113,14 @@ class Editor
     end
     listener.start
 
+    custom_fn = File.expand_path("~/.vimamsa/custom.rb")
+    if !File.exist?(custom_fn)
+      example_custom = IO.read(ppath("custom_example.rb"))
+      IO.write(custom_fn, example_custom)
+    end
+
+    mkdir_if_not_exists("~/.vimamsa/custom.rb")
+
     $cnf[:theme] = "Twilight_edit"
     $cnf[:syntax_highlight] = true
     settings_path = get_dot_path("settings.rb")
@@ -132,6 +135,9 @@ class Editor
 
     dotfile = read_file("", "~/.vimamsarc")
     eval(dotfile) if dotfile
+    
+    custom_script = read_file("", custom_fn)
+    eval(custom_script) if custom_script
 
     # build_options
 
@@ -141,6 +147,8 @@ class Editor
       if File.exist?(fname_)
         fname = fname_
       end
+    else
+      fname = ppath("demo.txt")
     end
     fname = ARGV[0] if ARGV.size >= 1 and File.file?(File.expand_path(ARGV[0]))
     # vma.add_content_search_path(Dir.pwd)
@@ -189,11 +197,10 @@ class Editor
   def buf()
     return $buffer
   end
-  
+
   def buffers()
     return $buffers
   end
- 
 
   def marshal_save(varname, vardata)
     save_var_to_file(varname, Marshal.dump(vardata))
@@ -256,13 +263,18 @@ class Editor
     @converters[converter_id].apply(txt)
   end
 
+  # Used only by ack module at the moment
   def get_content_search_paths()
     r = @file_content_search_paths.clone
     p = find_project_dir_of_cur_buffer()
+    if p.nil?
+      p = buf.dirname # Search dir of current file by default
+    end
 
     if p and !@file_content_search_paths.include?(p)
       r.insert(0, p)
     end
+
     return r
   end
 
@@ -315,7 +327,7 @@ def set_clipboard(s)
     debug s.inspect
     debug [s, s.class, s.size]
     log_error("s.class != String or s.size == 0")
-    Ripl.start :binding => binding
+    # Ripl.start :binding => binding
     return
   end
   $clipboard << s
@@ -370,10 +382,17 @@ end
 
 def show_key_bindings()
   kbd_s = "❙Key bindings❙\n"
-  kbd_s << "=======================================\n"
+  kbd_s << "\n⦁[Mode] keys : action⦁\n"
+
+  kbd_s << "[B]=Browse, [C]=Command, [I]=Insert, [V]=Visual\n"
+  kbd_s << "key!: Press key once, release before pressing any other keys\n"
+
+  kbd_s << "===============================================\n"
   kbd_s << $kbd.to_s
-  kbd_s << "\n=======================================\n"
-  create_new_file(nil, kbd_s)
+  kbd_s << "===============================================\n"
+  b = create_new_file(nil, kbd_s)
+  gui_set_file_lang(b.id, "hyperplaintext")
+  #
 end
 
 def diff_buffer()
@@ -451,6 +470,7 @@ end
 GUESS_ENCODING_ORDER = [
   Encoding::US_ASCII,
   Encoding::UTF_8,
+  Encoding::ISO_8859_1,
   Encoding::Shift_JIS,
   Encoding::EUC_JP,
   Encoding::EucJP_ms,
@@ -513,11 +533,23 @@ def load_buffer(fname)
   #$buffer_history << $buffers.size - 1
 end
 
-def jump_to_file(filename, linenum = 0)
+def jump_to_file(filename, linenum = nil, charn = nil)
   open_new_file(filename)
-  if linenum > 0
-    $buffer.jump_to_line(linenum)
+
+  # Link to character position
+  if !charn.nil?
+    if charn == "c"
+      buf.jump_to_pos(linenum)
+      center_on_current_line
+      return
+    end
+  end
+
+  # Link to line
+  if !linenum.nil?
+    buf.jump_to_line(linenum)
     center_on_current_line
+    return
   end
 end
 
@@ -547,40 +579,11 @@ def scan_word_start_marks(search_str)
   return wsmarks
 end
 
-def draw_text(str, x, y)
-  vma.paint_stack << [4, x, y, str]
-end
-
 def hook_draw()
   # TODO: as hook.register
   # easy_jump_draw()
 end
 
-#TODO: delete this
-def render_buffer(buffer = 0, reset = 0)
-  tmpbuf = $buffer.to_s
-  debug "pos:#{$buffer.pos} L:#{$buffer.lpos} C:#{$buffer.cpos}"
-  pos = $buffer.pos
-  selection_start = $buffer.selection_start
-
-  if $buffer.need_redraw?
-    reset = 1
-  end
-  t1 = Time.now
-  hook_draw()
-
-  if $buffer.need_redraw?
-    hpt_scan_images() if $debug #experimental
-  end
-
-  $buffer.highlight
-  if Time.now - t1 > 1 / 100.0
-    debug "SLOW render"
-    debug "Render time: #{Time.now - t1}"
-  end
-  $buffer.set_redrawed if reset == 1
-end
-
 def get_dot_path(sfx)
   dot_dir = File.expand_path("~/.vimamsa")
   Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
@@ -591,10 +594,10 @@ end
 def get_file_line_pointer(s)
   #"/code/vimamsa/lib/vimamsa/buffer_select.rb:31:def"
   #    m = s.match(/(~[a-z]*)?\/.*\//)
-  m = s.match(/((~[a-z]*)?\/.*\/\S+):(\d+)/)
+  m = s.match(/((~[a-z]*)?\/.*\/\S+):(c?)(\d+)/)
   if m != nil
     if File.exist?(File.expand_path(m[1]))
-      return [m[1], m[3].to_i]
+      return [m[1], m[4].to_i, m[3]]
     end
   end
   return nil

data/lib/vimamsa/encrypt.rb

@@ -38,7 +38,7 @@ end
 
 def encrypt_cur_buffer()
   callback = proc{|x|encrypt_cur_buffer_callback(x)}
-  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback)
+  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback,{:hide=>true})
 end
 
 def encrypt_cur_buffer_callback(password,b=nil)

data/lib/vimamsa/file_finder.rb

@@ -41,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")

data/lib/vimamsa/gui.rb

@@ -131,32 +131,28 @@ def set_system_clipboard(arg)
   clipboard.text = arg
 end
 
-def 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")
-  # debug 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(conf(:tab_width))
 
-
   $vmag.buffers[id] = view
 end
 
@@ -178,20 +174,13 @@ 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)
   debug "gui_set_buffer_contents(#{id}, txt)"
-
-  $vmag.buffers[id].buffer.set_text(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)
@@ -207,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
 
@@ -227,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"
 
@@ -243,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
@@ -251,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)
@@ -267,7 +296,7 @@ class VMAgui
     # debug "overlay_draw_text #{[x,y]}"
     (x, y) = @view.pos_to_coord(textpos)
     # debug "overlay_draw_text #{[x,y]}"
-    label = Gtk::Label.new("<span background='#00000088' foreground='#ff0000' weight='ultrabold'>#{text}</span>")
+    label = Gtk::Label.new("<span background='#000000ff' foreground='#ff0000' weight='ultrabold'>#{text}</span>")
     label.use_markup = true
     @da.put(label, x, y)
   end
@@ -371,7 +400,7 @@ 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)
@@ -385,7 +414,7 @@ class VMAgui
     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; }")
@@ -406,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")
@@ -482,32 +510,7 @@ 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
@@ -515,10 +518,8 @@ class VMAgui
     @window.set_default_size(650, 850)
     @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)
 
@@ -530,20 +531,21 @@ class VMAgui
     @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)
 
-    # @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 )
+    # 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")
+
+    # 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
 
@@ -555,6 +557,7 @@ class VMAgui
     @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

@@ -45,7 +45,6 @@ module Vimamsa
       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 }
       

data/lib/vimamsa/gui_select_window.rb

@@ -1,6 +1,9 @@
 def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt={})
   $selup = SelectUpdateWindow.new(nil, item_list, jump_keys, select_callback, update_callback, opt)
   $selup.run
+  # opt fields:
+  # :title
+  # :desc
 end
 
 class SelectUpdateWindow

data/lib/vimamsa/gui_sourceview.rb

@@ -1,11 +1,30 @@
 
+
+# class VSourceView < Gtk::TextView
 class VSourceView < GtkSource::View
-  def initialize(title = nil)
+  attr_accessor :bufo 
+  # :highlight_matching_brackets
+  
+  # def set_highlight_current_line(vbool)
+  # end
+  
+  # def set_show_line_numbers(vbool)
+  # end
+  
+  # def highlight_matching_brackets=(vbool)
+  # end
+  
+
+  def initialize(title = nil,bufo=nil)
     # super(:toplevel)
+    @highlight_matching_brackets = true
     super()
+    @bufo = bufo #object of Buffer class buffer.rb
     debug "vsource init"
     @last_keyval = nil
     @last_event = [nil, nil]
+    self.drag_dest_add_image_targets
+    self.drag_dest_add_uri_targets
 
     signal_connect "button-press-event" do |_widget, event|
       if event.button == Gdk::BUTTON_PRIMARY
@@ -19,6 +38,20 @@ class VSourceView < GtkSource::View
       end
     end
 
+    signal_connect("drag-data-received") do |widget, event, x, y, data, info, time|
+      puts "drag-data-received"
+      puts
+      if data.uris.size >= 1
+        imgpath = CGI.unescape(data.uris[0])
+        m = imgpath.match(/^file:\/\/(.*)/)
+        if m
+          fp = m[1]
+          handle_drag_and_drop(fp)
+        end
+      end
+      true
+    end
+
     signal_connect("key_press_event") do |widget, event|
       handle_key_event(event, :key_press_event)
       true
@@ -141,7 +174,7 @@ class VSourceView < GtkSource::View
 
   def handle_deltas()
     any_change = false
-    while d = buf.deltas.shift
+    while d = @bufo.deltas.shift
       any_change = true
       pos = d[0]
       op = d[1]
@@ -157,7 +190,7 @@ class VSourceView < GtkSource::View
       end
     end
     if any_change
-      gui_set_cursor_pos($buffer.id, $buffer.pos) #TODO: only when necessary
+      gui_set_cursor_pos(@bufo.id, @bufo.pos) #TODO: only when necessary
     end
 
     # sanity_check #TODO
@@ -269,26 +302,20 @@ class VSourceView < GtkSource::View
 
   def draw_cursor
     if is_command_mode
-      itr = buffer.get_iter_at(:offset => buf.pos)
-      itr2 = buffer.get_iter_at(:offset => buf.pos + 1)
+      itr = buffer.get_iter_at(:offset => @bufo.pos)
+      itr2 = buffer.get_iter_at(:offset => @bufo.pos + 1)
       $view.buffer.select_range(itr, itr2)
-    elsif buf.visual_mode?
+    elsif @bufo.visual_mode?
       debug "VISUAL MODE"
-      (_start, _end) = buf.get_visual_mode_range2
+      (_start, _end) = @bufo.get_visual_mode_range2
       debug "#{_start}, #{_end}"
       itr = buffer.get_iter_at(:offset => _start)
       itr2 = buffer.get_iter_at(:offset => _end + 1)
       $view.buffer.select_range(itr, itr2)
     else # Insert mode
-      itr = buffer.get_iter_at(:offset => buf.pos)
+      itr = buffer.get_iter_at(:offset => @bufo.pos)
       $view.buffer.select_range(itr, itr)
       debug "INSERT MODE"
     end
   end
-
-  # def quit
-  # destroy
-  # true
-  # end
 end
-