vimamsa 0.1.6 → 0.1.9

data/lib/vimamsa/buffer.rb

@@ -1,5 +1,6 @@
 require "digest"
 require "tempfile"
+require "fileutils"
 require "pathname"
 require "openssl"
 require "ripl/multi_line"
@@ -9,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
 
@@ -23,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
 
@@ -70,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)
@@ -79,6 +92,13 @@ class Buffer < String
     # gui_set_current_buffer(@id)
   end
 
+  def set_executable
+    if File.exists?(@fname)
+      FileUtils.chmod("+x", @fname)
+      message("Set executable: #{@fname}")
+    end
+  end
+
   def detect_file_language
     @lang = nil
     @lang = "c" if @fname.match(/\.(c|h|cpp)$/)
@@ -96,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
 
@@ -105,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)
@@ -140,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
@@ -189,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)
@@ -212,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
@@ -262,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
@@ -421,11 +466,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
@@ -451,7 +496,6 @@ class Buffer < String
     return if @edit_pos_history.empty?
     @edit_pos_history_i -= 1
     @edit_pos_history_i = @edit_pos_history.size - 1 if @edit_pos_history_i < 0
-    #        Ripl.start :binding => binding
     debug "@edit_pos_history_i=#{@edit_pos_history_i}"
     set_pos(@edit_pos_history[-@edit_pos_history_i])
     center_on_current_line
@@ -567,8 +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]"
-    # Ripl.start :binding => binding
+    # debug "NO MATCH @line_ends[a]"
     # end
 
     if ls == nil
@@ -580,7 +623,6 @@ class Buffer < String
   end
 
   def get_line_end(pos)
-    #Ripl.start :binding => binding
     return @line_ends.select { |x| x > pos }.min
   end
 
@@ -674,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()
@@ -691,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
@@ -726,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
@@ -750,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
@@ -874,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
@@ -913,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()
@@ -1024,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
@@ -1091,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)
@@ -1107,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?
@@ -1127,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
 
@@ -1241,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
@@ -1328,9 +1366,9 @@ class Buffer < String
     calculate_line_and_column_pos
   end
 
-  def execute_current_line_in_terminal()
+  def execute_current_line_in_terminal(autoclose = false)
     s = get_current_line
-    exec_in_terminal(s)
+    exec_in_terminal(s, autoclose)
   end
 
   def insert_new_line()
@@ -1350,8 +1388,17 @@ class Buffer < String
       # Indent start of new line based on last line
       last_line = line(@lpos)
       m = /^( +)([^ ]+|$)/.match(last_line)
-      debug m.inspect
-      c = c + " " * m[1].size if m
+      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
       insert_pos = @pos
@@ -1364,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!
@@ -1439,7 +1486,7 @@ class Buffer < String
         text = $register[register]
       end
     end
-    puts "PASTE: #{text}"
+    debug "PASTE: #{text}"
 
     return if text == ""
 
@@ -1494,7 +1541,13 @@ class Buffer < String
     return if !@visual_mode
 
     debug "COPY SELECTION"
-    set_clipboard(self[get_visual_mode_range])
+    s = self[get_visual_mode_range]
+    if x == :append
+      debug "APPEND"
+      s += "\n" + get_clipboard()
+    end
+
+    set_clipboard(s)
     end_visual_mode
     return true
   end
@@ -1639,7 +1692,6 @@ class Buffer < String
     else
       savepath = buflist.get_last_dir
     end
-    # Ripl.start :binding => binding
     gui_file_saveas(savepath)
     # calls back to file_saveas
   end
@@ -1660,21 +1712,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
     }

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=1)
+  puts message if conf("log.verbose") >= vlevel
   $log_messages << message
 end