vimamsa 0.1.7 → 0.1.10

data/lib/vimamsa/buffer.rb

@@ -10,11 +10,13 @@ $buffer_history = [0]
 
 $update_highlight = false
 
+$ifuncon = false
+
 class Buffer < String
 
   #attr_reader (:pos, :cpos, :lpos)
 
-  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang
+  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images
   attr_writer :call_func, :update_highlight
   attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
 
@@ -24,11 +26,12 @@ class Buffer < String
     debug "Buffer.rb: def initialize"
     super(str)
 
+    @images = []
     @lang = nil
     @id = @@num_buffers
     @@num_buffers += 1
-    gui_create_buffer(@id)
-    puts "NEW BUFFER fn=#{fname} ID:#{@id}"
+    gui_create_buffer(@id, self)
+    debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
     @module = nil
 
@@ -71,6 +74,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 +116,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 +125,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)
+
+    vbuf = view.buffer
+    itr = vbuf.get_iter_at(:offset => pos)
+    itr2 = vbuf.get_iter_at(:offset => pos + 1)
+    vbuf.delete(itr, itr2)
+    anchor = vbuf.create_child_anchor(itr)
+
+    da = ResizableImage.new(imgpath, view)
+    view.add_child_at_anchor(da, anchor)
+    da.signal_connect "draw" do |widget, cr|
+      da.do_draw(widget, cr)
+    end
+
+    da.scale_image
+
+    vma.gui.handle_image_resize
+    @images << { :path => imgpath, :obj => da }
+
+    gui_set_current_buffer(@id)
   end
 
   def is_legal_pos(pos, op = :read)
@@ -148,6 +182,7 @@ class Buffer < String
     b = " \n"
     txt = a + b
     insert_txt_at(txt, lr.end + 1)
+    buf.view.handle_deltas
     imgpos = lr.end + 1 + a.size
     add_image(fname, imgpos)
   end
@@ -197,20 +232,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)
@@ -220,7 +255,7 @@ class Buffer < String
     if str[0..10] == "VMACRYPT001"
       @encrypted_str = str[11..-1]
       callback = proc { |x| decrypt_cur_buffer(x) }
-      gui_one_input_action("Decrypt", "Password:", "decrypt", callback)
+      gui_one_input_action("Decrypt", "Password:", "decrypt", callback, { :hide => true })
       str = "ENCRYPTED"
     else
       # @crypt = nil
@@ -270,6 +305,8 @@ class Buffer < String
     @update_hl_endpos = self.size - 1
 
     gui_set_buffer_contents(@id, self.to_s)
+    @images = [] #TODO: if reload
+    hpt_scan_images(self)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -283,6 +320,7 @@ class Buffer < String
     @dirname = File.dirname(@fname)
     userhome = File.expand_path("~")
     @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+    vma.buffers.last_dir = @dirname
 
     detect_file_language
   end
@@ -429,11 +467,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
@@ -537,8 +575,7 @@ class Buffer < String
 
   def comment_linerange(r)
     com_str = get_com_str()
-    #lines = $buffer[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
-    lines = $buffer[r].lines
+    lines = self[r].lines
     mod = ""
     lines.each { |line|
       m = line.match(/^(\s*)(\S.*)/)
@@ -574,7 +611,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
@@ -600,14 +637,14 @@ class Buffer < String
       elsif op == :uncomment
         uncomment_linerange(first..last)
       end
-      $buffer.end_visual_mode
+      self.end_visual_mode
     end
   end
 
   def uncomment_linerange(r)
     com_str = get_com_str()
-    #r=$buffer.line_range($buffer.lpos, 2)
-    lines = $buffer[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
+    #r=self.line_range(self.lpos, 2)
+    lines = self[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
     mod = lines.collect { |x| x.sub(/^(\s*)(#{com_str}\s?)/, '\1') + "\n" }.join()
     replace_range(r, mod)
   end
@@ -679,7 +716,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 +733,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 +768,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
@@ -755,6 +792,10 @@ class Buffer < String
     return @pos == self.size
   end
 
+  def jump_to_pos(new_pos)
+    set_pos(new_pos)
+  end
+
   def set_pos(new_pos)
     if new_pos >= self.size
       @pos = self.size - 1 # TODO:??right side of last char
@@ -879,10 +920,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 +959,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,14 +1070,17 @@ class Buffer < String
     if wtype == :url
       open_url(word)
     elsif wtype == :linepointer
-      puts word.inspect
-      jump_to_file(word[0], word[1])
+      jump_to_file(word[0], word[1], word[2])
     elsif wtype == :textfile
       open_existing_file(word)
     elsif wtype == :file
       open_with_default_program(word)
     elsif wtype == :hpt_link
       open_existing_file(word)
+    elsif wtype == :help
+      if word == "keybindings"
+        call_action(:show_key_bindings)
+      end
     else
       #TODO
     end
@@ -1096,10 +1140,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}'"
-    message("'#{word}'")
+    debug "'WORD: #{word}'"
+    # message("Open link #{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,10 +1156,12 @@ 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
+    elsif m = word.match(/⟦help:(.*)⟧/)
+      return [m[1], :help]
     else
       fn = hpt_check_cur_word(word)
       if !fn.nil?
@@ -1132,22 +1178,9 @@ class Buffer < String
     handle_word(wnfo)
   end
 
-  def get_cur_word()
-    wem = get_word_end_marks(@pos, @pos + 200)
-    wsm = get_word_start_marks(@pos - 200, @pos)
-    word_start = wsm[-1]
-    word_end = wem[0]
-    word_start = pos if word_start == nil
-    word_end = pos if word_end == nil
-    word = self[word_start..word_end]
-    puts "'#{word}'"
-    message("'#{word}'")
-    #puts 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 +1279,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
@@ -1323,7 +1356,7 @@ class Buffer < String
     d2 = [@pos, INSERT, 1, char]
     add_delta(d1, true)
     add_delta(d2, true)
-    debug "DELTAS:#{$buffer.deltas.inspect} "
+    debug "DELTAS:#{self.deltas.inspect} "
   end
 
   def insert_txt_at(c, pos)
@@ -1358,14 +1391,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 +1411,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!
@@ -1417,7 +1449,6 @@ class Buffer < String
     for d in deltas
       add_delta(d, true, true)
     end
-    # $buffer.update_content(IO.read('test.txt'))
   end
 
   def need_redraw!
@@ -1454,7 +1485,7 @@ class Buffer < String
         text = $register[register]
       end
     end
-    puts "PASTE: #{text}"
+    debug "PASTE: #{text}"
 
     return if text == ""
 
@@ -1511,7 +1542,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
 
@@ -1653,7 +1684,7 @@ class Buffer < String
     # If current file has fname, save to that fname
     # Else search for previously open files and save to the directory of
     # the last viewed file that has a filename
-    # $buffers[$buffer_history.reverse[1]].fname
+    # selffers[$buffer_history.reverse[1]].fname
 
     if @fname
       savepath = File.dirname(@fname)
@@ -1680,21 +1711,23 @@ class Buffer < String
     end
 
     Thread.new {
-      File.open(fpath, mode) do |io|
-        #io.set_encoding(self.encoding)
-
-        begin
-          io.write(contents)
-        rescue Encoding::UndefinedConversionError => ex
-          # this might happen when trying to save UTF-8 as US-ASCII
-          # so just warn, try to save as UTF-8 instead.
-          warn("Saving as UTF-8 because of: #{ex.class}: #{ex}")
-          io.rewind
-
-          io.set_encoding(Encoding::UTF_8)
-          io.write(contents)
-          #self.encoding = Encoding::UTF_8
-        end
+      begin
+        io = File.open(fpath, mode)
+        io.set_encoding(self.encoding)
+        io.write(contents)
+        io.close
+      rescue Encoding::UndefinedConversionError => ex
+        puts "Encoding::UndefinedConversionError"
+        # this might happen when trying to save UTF-8 as US-ASCII
+        # so just warn, try to save as UTF-8 instead.
+        warn("Saving as UTF-8 because of: #{ex.class}: #{ex}")
+        io.rewind
+
+        io.set_encoding(Encoding::UTF_8)
+        io.write(contents)
+      rescue Errno::EACCES => ex
+        message("File #{fpath} not writeable")
+        #TODO: show message box
       end
       sleep 3
     }
@@ -1713,7 +1746,7 @@ class Buffer < String
   def indent()
     file = Tempfile.new("out")
     infile = Tempfile.new("in")
-    file.write($buffer.to_s)
+    file.write(self.to_s)
     file.flush
     bufc = "FOO"
 
@@ -1739,12 +1772,17 @@ class Buffer < String
     else
       return
     end
-    $buffer.update_content(bufc)
+    self.update_content(bufc)
     center_on_current_line #TODO: needed?
     file.close; file.unlink
     infile.close; infile.unlink
   end
 
+  def close()
+    idx = vma.buffers.get_buffer_by_id(@id)
+    vma.buffers.close_buffer(idx)
+  end
+
   def backup()
     fname = @fname
     return if !@fname
@@ -1765,7 +1803,7 @@ end
 #TODO
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
-    IO.write(savepath, $buffer.to_s)
+    IO.write(savepath, self.to_s)
   else
     message("PATH NOT WRITABLE: #{savepath}")
   end
@@ -1780,7 +1818,7 @@ def is_path_writable(fpath)
 end
 
 def backup_all_buffers()
-  for buf in $buffers
+  for buf in selffers
     buf.backup
   end
   message("Backup all buffers")

data/lib/vimamsa/buffer_list.rb

@@ -1,9 +1,8 @@
-
 def save_buffer_list()
   message("Save buffer list")
   buffn = get_dot_path("buffers.txt")
   f = File.open(buffn, "w")
-  bufstr = $buffers.collect { |buf| buf.fname }.inspect
+  bufstr = vma.buffers.collect { |buf| buf.fname }.inspect
   f.write(bufstr)
   f.close()
 end
@@ -21,17 +20,23 @@ def load_buffer_list()
 end
 
 class BufferList < Array
-  attr_reader :current_buf
+  attr_reader :current_buf, :last_dir
+
+  def initialize()
+    @last_dir = File.expand_path(".")
+    super
+  end
 
+  # lastdir = File.expand_path(".") if lastdir.nil?
   def <<(_buf)
     super
-    $buffer = _buf
+    vma.buf = _buf
     @current_buf = self.size - 1
     $buffer_history << @current_buf
     @recent_ind = 0
-    $hook.call(:change_buffer, $buffer)
-    gui_set_current_buffer($buffer.id)
-    gui_set_cursor_pos($buffer.id, $buffer.pos)
+    $hook.call(:change_buffer, vma.buf)
+    gui_set_current_buffer(vma.buf.id)
+    gui_set_cursor_pos(vma.buf.id, vma.buf.pos)
   end
 
   def switch()
@@ -58,6 +63,11 @@ class BufferList < Array
     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
     $buffer_history << @current_buf
@@ -67,11 +77,11 @@ class BufferList < Array
   def set_current_buffer(buffer_i, update_history = true)
     buffer_i = self.size -1 if buffer_i > self.size
     buffer_i = 0 if buffer_i < 0
-    $buffer = self[buffer_i]
-    return if !$buffer
+    vma.buf = self[buffer_i]
+    return if !vma.buf
     @current_buf = buffer_i
     debug "SWITCH BUF2. bufsize:#{self.size}, curbuf: #{@current_buf}"
-    fpath = $buffer.fname
+    fpath = vma.buf.fname
     if fpath and fpath.size > 50
       fpath = fpath[-50..-1]
     end
@@ -80,31 +90,25 @@ class BufferList < Array
       add_current_buf_to_history
     end
 
-    $hook.call(:change_buffer, $buffer)
-    $buffer.set_active
+    $hook.call(:change_buffer, vma.buf)
+    vma.buf.set_active
+
+    gui_set_current_buffer(vma.buf.id)
+    gui_set_window_title(vma.buf.title, vma.buf.subtitle)
 
-    gui_set_current_buffer($buffer.id)
-    gui_set_window_title($buffer.title,$buffer.subtitle)   
+    if vma.buf.fname
+      @last_dir = File.dirname(vma.buf.fname)
+    end
 
     # hpt_scan_images() if $debug # experimental
   end
 
+  def last_dir=(d)
+    @last_dir = d
+  end
+
   def get_last_dir
-    lastdir = nil
-    if $buffer.fname
-      lastdir = File.dirname($buffer.fname)
-    else
-      for bufid in $buffer_history.reverse[1..-1]
-        bf = $buffers[bufid]
-        debug "FNAME:#{bf.fname}"
-        if bf.fname
-          lastdir = File.dirname(bf.fname)
-          break
-        end
-      end
-    end
-    lastdir = File.expand_path(".") if lastdir.nil?
-    return lastdir
+    return @last_dir
   end
 
   def get_recent_buffers()
@@ -138,9 +142,23 @@ 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
     message("Closed buffer #{bufname}")
     recent = get_recent_buffers