vimamsa 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a71f8392835d7a5a3245366764eb79f6058ea3ded74cc1a308f021f950881ba
-  data.tar.gz: 590ea0409a43aabafe349cfcff0cb91712e2a269e334b3663b64f6b895ae666f
+  metadata.gz: 6000318b31060bff83029148c2cf47cc6ff8c5939d2fc1d54951a54e8b49a538
+  data.tar.gz: 500cd81fe9bd605276a0802f182980c5a93d77ab5d2221548586673e85a85832
 SHA512:
-  metadata.gz: 1bf328f8cbe0b69e85a9720790c8f4616e1996466ad65f6473cf1cff1173d78b9cec197145c653a5d33804571d383246492e593445da390cbe567fc6ccfbb24a
-  data.tar.gz: 799f836afc3c0e304cac07f44e1b5c96affa3f6b5775b4d654b43a81168f2ab14cb4ee1218a3345ae3189203520885fd6cc1de7ce48205e78386b060c700f8ca
+  metadata.gz: 8b687b1b72df46bd9bc35622b239e9525e2dc15884f1066557e82c474e99c280577a32a3a7f60a776f5b6be0866dc86c79e2b364780413821a491160ad73875f
+  data.tar.gz: d5e8da0e6263f74f27ee84781efdea5126411a68ace27d244da6c5b9203924196d10bbe91541319af91539089c6391dfadfde3f76cbac6f475b2002c1fbaa16c

data/lib/vimamsa/actions.rb

@@ -28,7 +28,7 @@ def reg_act(id, callfunc, name = "", opt = {})
 end
 
 def missing_callfunc
-  puts "missing_callfunc"
+  debug "missing_callfunc"
 end
 
 #TODO: remove
@@ -74,10 +74,10 @@ def search_actions_update_callback(search_str = "")
   item_list = item_list2
 
   a = filter_items(item_list, 0, search_str)
-  puts a.inspect
+  debug a.inspect
 
   r = a.collect { |x| [x[0][0], 0, x] }
-  puts r.inspect
+  debug r.inspect
   $item_list = r
 
   r = a.collect { |x| ["[#{x[0][:key]}] #{x[0][:str]}", 0, x] }
@@ -88,13 +88,13 @@ def search_actions_select_callback(search_str, idx)
   item = $item_list[idx][2]
   acc = item[0][:action]
 
-  puts "Selected:" + acc.to_s
+  debug "Selected:" + acc.to_s
   gui_select_window_close(0)
 
   if acc.class == String
     eval(acc)
   elsif acc.class == Symbol
-    puts "Symbol"
+    debug "Symbol"
     call(acc)
   end
 end
@@ -106,7 +106,7 @@ def filter_items(item_list, item_key, search_str)
     [item, srn_dst(search_str, item[:str])]
   end
   scores.sort_by! { |x| -x[1] }
-  puts scores.inspect
+  debug scores.inspect
   scores = scores[0..30]
 
   return scores

data/lib/vimamsa/buffer.rb

@@ -28,7 +28,7 @@ class Buffer < String
     @id = @@num_buffers
     @@num_buffers += 1
     gui_create_buffer(@id)
-    puts "NEW BUFFER fn=#{fname} ID:#{@id}"
+    debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
     @module = nil
 
@@ -71,6 +71,15 @@ class Buffer < String
     @active_kbd_mode = nil
   end
 
+  def list_str()
+    if @fname.nil?
+      x = @title
+    else
+      x = @fname
+    end
+    return x
+  end
+
   def set_active
     if !@active_kbd_mode.nil?
       $kbd.set_mode(@active_kbd_mode)
@@ -104,7 +113,7 @@ class Buffer < String
     # lang.get_metadata("block-comment-end")
     @lang_nfo = lang
     if !lang.nil? and !lang.id.nil?
-      puts "Guessed LANG: #{lang.id}"
+      debug "Guessed LANG: #{lang.id}"
       @lang = lang.id
     end
 
@@ -113,10 +122,32 @@ class Buffer < String
     end
   end
 
+  def view()
+  	# Get the VSourceView < GtkSource::View object corresponding to this buffer
+    return vma.gui.buffers[@id]
+  end
+
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
-    # insert_txt_at(" ", pos)
-    gui_add_image(imgpath, pos)
+
+    pixbuf = GdkPixbuf::Pixbuf.new(:file => imgpath)
+
+    #  puts GdkPixbuf::InterpType.constants
+    # GdkPixbuf::InterpType::HYPER
+    # https://docs.gtk.org/gdk-pixbuf/enum.InterpType.html#bilinear
+    # https://docs.gtk.org/gdk-pixbuf/method.Pixbuf.scale_simple.html
+    imglimit = view.visible_rect.width - 5
+    if pixbuf.width > imglimit
+      nwidth = imglimit
+      nheight = (pixbuf.height * (imglimit.to_f / pixbuf.width)).to_i
+      pixbuf = pixbuf.scale_simple(nwidth, nheight, GdkPixbuf::InterpType::HYPER)
+    end
+
+    vbuf = view.buffer
+    itr = vbuf.get_iter_at(:offset => pos)
+    itr2 = vbuf.get_iter_at(:offset => pos + 1)
+    vbuf.delete(itr, itr2)
+    vbuf.insert(itr, pixbuf)
   end
 
   def is_legal_pos(pos, op = :read)
@@ -197,20 +228,20 @@ class Buffer < String
     ok = true
     @bt.each_line { |r|
       if lines[i] != r #or true
-        puts "NO MATCH FOR LINE:"
-        puts "i=#{i}["
-        # puts "[orig]pos=#{leaf.pos} |#{leaf.data}|"
-        # puts "spos=#{spos} nchar=#{leaf.nchar} epos=#{epos} a[]=\nr=|#{r}|"
-        puts "fromtree:|#{r}|"
-        puts "frombuf:|#{lines[i]}"
-        puts "]"
+        debug "NO MATCH FOR LINE:"
+        debug "i=#{i}["
+        # debug "[orig]pos=#{leaf.pos} |#{leaf.data}|"
+        # debug "spos=#{spos} nchar=#{leaf.nchar} epos=#{epos} a[]=\nr=|#{r}|"
+        debug "fromtree:|#{r}|"
+        debug "frombuf:|#{lines[i]}"
+        debug "]"
         ok = false
       end
       i += 1
     }
 
-    puts "BT: NO ERRORS" if ok
-    puts "BT: ERRORS" if !ok
+    debug "BT: NO ERRORS" if ok
+    debug "BT: ERRORS" if !ok
   end
 
   def set_content(str)
@@ -429,11 +460,11 @@ class Buffer < String
   end
 
   def update_index(pos, changeamount)
-    # puts "pos #{pos}, changeamount #{changeamount}, @pos #{@pos}"
+    # debug "pos #{pos}, changeamount #{changeamount}, @pos #{@pos}"
     @edit_pos_history.collect! { |x| r = x if x <= pos; r = x + changeamount if x > pos; r }
     # TODO: handle between removal case
     for k in @marks.keys
-      #            puts "change(?): pos=#{pos}, k=#{k}, #{@marks[k]}, #{changeamount}"
+      #            debug "change(?): pos=#{pos}, k=#{k}, #{@marks[k]}, #{changeamount}"
       if @marks[k] > pos
         @marks[k] = @marks[k] + changeamount
       end
@@ -574,7 +605,7 @@ class Buffer < String
     ls = nil
     ls = @line_ends[a] if a != nil
     # if a != nil and ls != @line_ends[a]
-    # puts "NO MATCH @line_ends[a]"
+    # debug "NO MATCH @line_ends[a]"
     # end
 
     if ls == nil
@@ -679,7 +710,7 @@ class Buffer < String
     end
 
     debug "Scan line_end time: #{Time.now - t1}"
-    #puts @line_ends
+    #debug @line_ends
   end
 
   def sanity_check_line_ends()
@@ -696,7 +727,7 @@ class Buffer < String
   end
 
   def update_bufpos_on_change(positions, xpos, changeamount)
-    # puts "xpos=#{xpos} changeamount=#{changeamount}"
+    # debug "xpos=#{xpos} changeamount=#{changeamount}"
     positions.collect { |x|
       r = nil
       r = x if x < xpos
@@ -731,7 +762,7 @@ class Buffer < String
       i_nl = scan_indexes(changestr, /\n/)
       i_nl.collect! { |x| x + pos }
     end
-    #    puts "change:#{changeamount}"
+    #    debug "change:#{changeamount}"
     #TODO: this is the bottle neck in insert_txt action
     @line_ends.collect! { |x|
       r = nil
@@ -879,10 +910,10 @@ class Buffer < String
         range = @pos..wmarks[0]
       end
     elsif range_id == :to_line_end
-      puts "TO LINE END"
+      debug "TO LINE END"
       range = @pos..(@line_ends[@lpos] - 1)
     elsif range_id == :to_line_start
-      puts "TO LINE START: #{@lpos}"
+      debug "TO LINE START: #{@lpos}"
 
       if @cpos == 0
         range = nil
@@ -918,15 +949,15 @@ class Buffer < String
   end
 
   def move(direction)
-    puts "cpos:#{@cpos} lpos:#{@lpos} @larger_cpos:#{@larger_cpos}"
+    debug "cpos:#{@cpos} lpos:#{@lpos} @larger_cpos:#{@larger_cpos}"
     if direction == :forward_page
-      puts "FORWARD PAGE"
+      debug "FORWARD PAGE"
       visible_range = get_visible_area()
       set_pos(visible_range[1])
       top_where_cursor()
     end
     if direction == :backward_page
-      puts "backward PAGE"
+      debug "backward PAGE"
       visible_range = get_visible_area()
       set_pos(visible_range[0])
       bottom_where_cursor()
@@ -1029,7 +1060,7 @@ class Buffer < String
     if wtype == :url
       open_url(word)
     elsif wtype == :linepointer
-      puts word.inspect
+      debug word.inspect
       jump_to_file(word[0], word[1])
     elsif wtype == :textfile
       open_existing_file(word)
@@ -1096,10 +1127,10 @@ class Buffer < String
     word_start = pos if word_start == nil
     word_end = pos if word_end == nil
     word = self[word_start..word_end]
-    puts "'WORD: #{word}'"
+    debug "'WORD: #{word}'"
     message("'#{word}'")
     linep = get_file_line_pointer(word)
-    puts "linep'#{linep}'"
+    debug "linep'#{linep}'"
     path = File.expand_path(word)
     wtype = nil
     if is_url(word)
@@ -1112,7 +1143,7 @@ class Buffer < String
         wtype = :file
       end
       # elsif hpt_check_cur_word(word) #TODO: check only
-      # puts word
+      # debug word
     elsif linep != nil
       wtype = :linepointer
       word = linep
@@ -1140,14 +1171,14 @@ class Buffer < String
     word_start = pos if word_start == nil
     word_end = pos if word_end == nil
     word = self[word_start..word_end]
-    puts "'#{word}'"
+    debug "'#{word}'"
     message("'#{word}'")
-    #puts wm
+    #debug wm
   end
 
   def jump_to_next_instance_of_word()
     if $kbd.last_action == $kbd.cur_action and @current_word != nil
-      # puts "REPEATING *"
+      # debug "REPEATING *"
     else
       start_search = [@pos - 150, 0].max
 
@@ -1246,10 +1277,10 @@ class Buffer < String
 
     if target == FIRST_NON_WHITESPACE
       l = current_line()
-      puts l.inspect
+      debug l.inspect
       @cpos = line(@lpos).size - 1
       a = scan_indexes(l, /\S/)
-      puts a.inspect
+      debug a.inspect
       if a.any?
         @cpos = a[0]
       else
@@ -1358,14 +1389,13 @@ class Buffer < String
       if m
         c = c + " " * m[1].size if m
       end
-      
 
       #if tab indent
       m = /^(\t+)([^\t]+|$)/.match(last_line)
       if m
         c = c + "\t" * m[1].size if m
       end
-      
+
       # debug m.inspect
     end
     if mode == BEFORE
@@ -1379,8 +1409,8 @@ class Buffer < String
 
     #self.insert(insert_pos,c)
     add_delta([insert_pos, INSERT, c.size, c], true)
-    #puts("encoding: #{c.encoding}")
-    #puts "c.size: #{c.size}"
+    #debug("encoding: #{c.encoding}")
+    #debug "c.size: #{c.size}"
     #recalc_line_ends #TODO: optimize?
     calculate_line_and_column_pos
     #need_redraw!
@@ -1454,7 +1484,7 @@ class Buffer < String
         text = $register[register]
       end
     end
-    puts "PASTE: #{text}"
+    debug "PASTE: #{text}"
 
     return if text == ""
 
@@ -1511,7 +1541,7 @@ class Buffer < String
     debug "COPY SELECTION"
     s = self[get_visual_mode_range]
     if x == :append
-      puts "APPEND"
+      debug "APPEND"
       s += "\n" + get_clipboard()
     end
 

data/lib/vimamsa/buffer_list.rb

@@ -23,6 +23,7 @@ end
 class BufferList < Array
   attr_reader :current_buf
 
+
   def <<(_buf)
     super
     $buffer = _buf
@@ -57,6 +58,12 @@ class BufferList < Array
     buf_idx = self.index { |b| b.fname == fname }
     return buf_idx
   end
+  
+   def get_buffer_by_id(id)
+    buf_idx = self.index { |b| b.id == id }
+    return buf_idx
+  end
+ 
 
   def add_current_buf_to_history()
     @recent_ind = 0
@@ -138,7 +145,24 @@ class BufferList < Array
     $buffer_history = bh.reverse
   end
 
+
+  # Close buffer in the background
+  # TODO: if open in another widget
+  def close_other_buffer(buffer_i)
+    return if self.size <= buffer_i
+    return if @current_buf == buffer_i
+    
+    bufname = self[buffer_i].basename
+    message("Closed buffer #{bufname}")
+
+    self.slice!(buffer_i)
+    $buffer_history = $buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
+
+  end
+
+
   def close_buffer(buffer_i, from_recent = false)
+    return if buffer_i.nil?
     return if self.size <= buffer_i
     
     bufname = self[buffer_i].basename

data/lib/vimamsa/buffer_manager.rb

@@ -0,0 +1,83 @@
+class BufferManager
+  attr_reader :buf
+  @@cur = nil # Current object of class
+
+  def self.cur()
+    return @@cur
+  end
+
+  def self.init()
+    vma.kbd.add_minor_mode("bmgr", :buf_mgr, :command)
+    reg_act(:bmgr_select, proc { buf.module.select_line }, "")
+    reg_act(:bmgr_close, proc { buf.module.close_selected }, "")
+
+    reg_act(:start_buf_manager, proc { BufferManager.new.run; vma.kbd.set_mode(:buf_mgr) }, "Buffer manager")
+
+    bindkey "bmgr enter", :bmgr_select
+    bindkey "bmgr c", :bmgr_close
+  end
+
+  def initialize()
+    @buf = nil
+    @line_to_id = {}
+  end
+
+  def buf_of_current_line()
+    l = @buf.lpos - @header.size
+    return nil if l < 0
+    bufid = @line_to_id[l]
+    buf_i = vma.buffers.get_buffer_by_id(bufid)
+    return buf_i
+  end
+
+  def close_selected
+    buf_i = buf_of_current_line()
+    if buf_i.nil?
+      message("buf already closed")
+      return
+    end
+    vma.buffers.close_other_buffer(buf_i)
+  end
+
+  def select_line
+    buf_i = buf_of_current_line()
+    return if buf_i.nil?
+
+    vma.buffers.close_current_buffer()
+    vma.buffers.set_current_buffer(buf_i)
+    @@cur = nil
+  end
+
+  def run
+    if !@@cur.nil? #One instance open already
+      #Close it
+      buf_i = vma.buffers.get_buffer_by_id(@@cur.buf.id)
+      vma.buffers.close_buffer(buf_i)
+    end
+    @@cur = self
+    @header = []
+    @header << "Current buffers:"
+    @header << "keys: <enter> to select, <c> to close buffer"
+    @header << "=" * 40
+
+    s = ""
+    s << @header.join("\n")
+    s << "\n"
+    i = 0
+    for b in vma.buffers.sort_by { |x| x.list_str }
+      x = b.list_str
+      s << "#{x}\n"
+      @line_to_id[i] = b.id
+      i += 1
+    end
+
+    if @buf.nil?
+      @buf = create_new_file(nil, s)
+      @buf.module = self
+      @buf.active_kbd_mode = :buf_mgr
+    else
+      @buf.set_content(s)
+    end
+    @buf.set_line_and_column_pos(@header.size, 0)
+  end
+end

data/lib/vimamsa/conf.rb

@@ -0,0 +1,21 @@
+$cnf = {} # TODO
+
+def conf(id)
+  return $cnf[id]
+end
+
+def set_conf(id, val)
+  $cnf[id] = val
+end
+
+def setcnf(id, val)
+  set_conf(id, val)
+end
+
+setcnf :indent_based_on_last_line, true
+setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
+
+
+setcnf "log.verbose", 1
+setcnf :tab_width, 4
+

data/lib/vimamsa/debug.rb

@@ -21,8 +21,9 @@ def debug_dump_deltas()
 end
 
 $log_messages = []
-def log_message(message)
-  puts message
+
+def log_message(message,vlevel)
+  puts message if conf("log.verbose") >= vlevel
   $log_messages << message
 end
 

data/lib/vimamsa/easy_jump.rb

@@ -41,12 +41,12 @@ class EasyJump
   def easy_jump_input_char(c, event_type)
     return true if event_type != :key_press
     # vma.paint_stack = []
-    puts "EASY JUMP: easy_jump_input_char [#{c}]"
+    debug "EASY JUMP: easy_jump_input_char [#{c}]"
     @easy_jump_input << c.upcase
     if @jump_sequence.include?(@easy_jump_input)
       jshash = Hash[@jump_sequence.map.with_index.to_a]
       nthword = jshash[@easy_jump_input]
-      puts "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
+      debug "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
       buf.set_pos(@easy_jump_wsmarks[nthword])
       # @kbd.set_mode(:command)
       vma.kbd.remove_keyhandling_override
@@ -63,8 +63,8 @@ class EasyJump
   end
 
   def easy_jump_draw()
-    # puts @jump_sequence.inspect
-    # puts @easy_jump_wsmarks.inspect
+    # debug @jump_sequence.inspect
+    # debug @easy_jump_wsmarks.inspect
     vma.gui.start_overlay_draw
     for i in 0..(@easy_jump_wsmarks.size - 1)
       vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i])
@@ -73,12 +73,12 @@ class EasyJump
 
     return
     return if @jump_sequence.empty?
-    puts "EASY JUMP DRAW"
+    debug "EASY JUMP DRAW"
     screen_cord = cpp_function_wrapper(0, [@easy_jump_wsmarks])
     screen_cord = screen_cord[1..@jump_sequence.size]
     screen_cord.each_with_index { |point, i|
       mark_str = @jump_sequence[i]
-      #puts "draw #{point[0]}x#{point[1]}"
+      #debug "draw #{point[0]}x#{point[1]}"
       draw_text(mark_str, point[0] + 3, point[1])
       #break if m > @cpos
     }
@@ -159,7 +159,7 @@ class EasyJump
     }
 
     #printf("Size of sequence: %d\n",sequence.size)
-    #puts sequence.inspect
+    #debug sequence.inspect
     return sequence
   end
 end