vimamsa 0.1.7 → 0.1.10

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
@@ -8,7 +11,7 @@ class SelectUpdateWindow
   COLUMN_DESCRIPTION = 1
 
   def update_item_list(item_list)
-    # puts item_list.inspect
+    # debug item_list.inspect
     @model.clear
     for item in item_list
       iter = @model.append
@@ -17,7 +20,7 @@ class SelectUpdateWindow
       else
         v = ["", item[0]]
       end
-      puts v.inspect
+      debug v.inspect
       iter.set_values(v)
     end
 
@@ -46,10 +49,10 @@ class SelectUpdateWindow
     @selected_row = 0
     @opt = opt
 
-    puts item_list.inspect
+    debug item_list.inspect
     @update_callback = method(update_callback)
     @select_callback = method(select_callback)
-    # puts @update_callback_m.call("").inspect
+    # debug @update_callback_m.call("").inspect
 
     vbox = Gtk::Box.new(:vertical, 8)
     vbox.margin = 8
@@ -72,21 +75,21 @@ class SelectUpdateWindow
     update_item_list(item_list)
 
     @window.signal_connect("key-press-event") do |_widget, event|
-      # puts "KEYPRESS 1"
+      # debug "KEYPRESS 1"
       @entry.handle_event(event)
     end
 
     @entry.signal_connect("key_press_event") do |widget, event|
-      # puts "KEYPRESS 2"
+      # debug "KEYPRESS 2"
       if event.keyval == Gdk::Keyval::KEY_Down
-        puts "DOWN"
+        debug "DOWN"
         set_selected_row(@selected_row + 1)
         # fixed = iter[COLUMN_FIXED]
 
         true
       elsif event.keyval == Gdk::Keyval::KEY_Up
         set_selected_row(@selected_row - 1)
-        puts "UP"
+        debug "UP"
         true
       elsif event.keyval == Gdk::Keyval::KEY_Return
         path = Gtk::TreePath.new(@selected_row.to_s)
@@ -94,7 +97,7 @@ class SelectUpdateWindow
         ret = iter[1]
         @select_callback.call(ret, @selected_row)
         @window.destroy
-        # puts iter[1].inspect
+        # debug iter[1].inspect
         true
       elsif event.keyval == Gdk::Keyval::KEY_Escape
         @window.destroy
@@ -105,14 +108,14 @@ class SelectUpdateWindow
     end
 
     @entry.signal_connect("search-changed") do |widget|
-      puts "search changed: #{widget.text || ""}"
+      debug "search changed: #{widget.text || ""}"
       item_list = @update_callback.call(widget.text)
 
       update_item_list(item_list)
       # label.text = widget.text || ""
     end
-    @entry.signal_connect("changed") { puts "[changed] " }
-    @entry.signal_connect("next-match") { puts "[next-match] " }
+    @entry.signal_connect("changed") { debug "[changed] " }
+    @entry.signal_connect("next-match") { debug "[next-match] " }
 
     if !opt[:desc].nil?
       descl = Gtk::Label.new(opt[:desc])
@@ -160,7 +163,7 @@ class SelectUpdateWindow
     end
 
     @window.set_default_size(280, 500)
-    puts "SelectUpdateWindow"
+    debug "SelectUpdateWindow"
   end
 
   def run

data/lib/vimamsa/gui_sourceview.rb

@@ -1,24 +1,58 @@
 
+
+# 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)
+  def initialize(title,bufo)
     # super(:toplevel)
+    @highlight_matching_brackets = true
     super()
-    puts "vsource init"
+    @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
-        # puts "Gdk::BUTTON_PRIMARY"
+        # debug "Gdk::BUTTON_PRIMARY"
         false
       elsif event.button == Gdk::BUTTON_SECONDARY
-        # puts "Gdk::BUTTON_SECONDARY"
+        # debug "Gdk::BUTTON_SECONDARY"
         true
       else
         true
       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
@@ -35,7 +69,7 @@ class VSourceView < GtkSource::View
     end
 
     signal_connect "button-release-event" do |widget, event|
-      $buffer.set_pos(buffer.cursor_position)
+      vma.buf.set_pos(buffer.cursor_position)
       false
     end
     @curpos_mark = nil
@@ -44,14 +78,14 @@ class VSourceView < GtkSource::View
   def handle_key_event(event, sig)
     if $update_cursor
       curpos = buffer.cursor_position
-      puts "MOVE CURSOR: #{curpos}"
+      debug "MOVE CURSOR: #{curpos}"
       buf.set_pos(curpos)
       $update_cursor = false
     end
-    puts $view.visible_rect.inspect
+    debug $view.visible_rect.inspect
 
-    puts "key event"
-    puts event
+    debug "key event"
+    debug event
 
     key_name = event.string
     if event.state.control_mask?
@@ -98,9 +132,9 @@ class VSourceView < GtkSource::View
     key_str_parts << key_name
     key_str = key_str_parts.join("-")
     keynfo = { :key_str => key_str, :key_name => key_name, :keyval => event.keyval }
-    puts keynfo.inspect
+    debug keynfo.inspect
     # $kbd.match_key_conf(key_str, nil, :key_press)
-    # puts "key_str=#{key_str} key_"
+    # debug "key_str=#{key_str} key_"
 
     if key_str != "" # or prefixed_key_str != ""
       if sig == :key_release_event and event.keyval == @last_keyval
@@ -132,7 +166,7 @@ class VSourceView < GtkSource::View
     y = iterxy.y
 
     # buffer_to_window_coords(Gtk::TextWindowType::TEXT, iterxy.x, iterxy.y).inspect
-    # puts buffer_to_window_coords(Gtk::TextWindowType::TEXT, x, y).inspect
+    # debug buffer_to_window_coords(Gtk::TextWindowType::TEXT, x, y).inspect
     (x, y) = buffer_to_window_coords(Gtk::TextWindowType::TEXT, x, y)
     # Ripl.start :binding => binding
 
@@ -141,7 +175,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 +191,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
@@ -166,15 +200,15 @@ class VSourceView < GtkSource::View
   def sanity_check()
     a = buffer.text
     b = buf.to_s
-    # puts "===================="
-    # puts a.lines[0..10].join()
-    # puts "===================="
-    # puts b.lines[0..10].join()
-    # puts "===================="
+    # debug "===================="
+    # debug a.lines[0..10].join()
+    # debug "===================="
+    # debug b.lines[0..10].join()
+    # debug "===================="
     if a == b
-      puts "Buffers match"
+      debug "Buffers match"
     else
-      puts "ERROR: Buffer's don't match."
+      debug "ERROR: Buffer's don't match."
     end
   end
 
@@ -210,7 +244,7 @@ class VSourceView < GtkSource::View
   end
 
   def cursor_visible_idle_func
-    puts "cursor_visible_idle_func"
+    debug "cursor_visible_idle_func"
     # From https://picheta.me/articles/2013/08/gtk-plus--a-method-to-guarantee-scrolling.html
     # vr = visible_rect
 
@@ -247,8 +281,8 @@ class VSourceView < GtkSource::View
 
     intr = iterxy.intersect(vr)
     if intr.nil?
-      puts iterxy.inspect
-      puts vr.inspect
+      debug iterxy.inspect
+      debug vr.inspect
       # Ripl.start :binding => binding
 
       # exit!
@@ -269,26 +303,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?
-      puts "VISUAL MODE"
-      (_start, _end) = buf.get_visual_mode_range2
-      puts "#{_start}, #{_end}"
+    elsif @bufo.visual_mode?
+      debug "VISUAL MODE"
+      (_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)
-      puts "INSERT MODE"
+      debug "INSERT MODE"
     end
   end
-
-  # def quit
-  # destroy
-  # true
-  # end
 end
-

data/lib/vimamsa/hyper_plain_text.rb

@@ -1,19 +1,16 @@
-
-
-def hpt_open_link()
-end
-
 def hpt_check_cur_word(w)
-  puts "check_cur_word(w)"
+  debug "check_cur_word(w)"
   m = w.match(/⟦(.*)⟧/)
   if m
     fpfx = m[1]
-    if $buffer.fname
-      dn = File.dirname($buffer.fname)
+    if vma.buf.fname
+      dn = File.dirname(vma.buf.fname)
 
       fcands = []
-      fcands << "#{dn}/#{fpfx}"
-      fcands << "#{dn}/#{fpfx}.txt"
+      if fpfx[0] != "/"
+        fcands << "#{dn}/#{fpfx}"
+        fcands << "#{dn}/#{fpfx}.txt"
+      end
       fcands << File.expand_path("#{fpfx}")
       fcands << File.expand_path("#{fpfx}.txt")
 
@@ -38,24 +35,46 @@ def hpt_check_cur_word(w)
   return nil
 end
 
-def hpt_scan_images()
-  return if !buf.fname
-  return if !buf.fname.match(/.*txt$/)
-  imgpos = scan_indexes(buf, /⟦img:.+?⟧/)
-  imgtags = buf.scan(/(⟦img:(.+?)⟧)/)
-  # i = 0
+def translate_path(fn, bf)
+  if File.exist?(fn)
+    outfn = fn
+  elsif fn[0] == "$"
+    outfn = ppath(fn[1..-1]) # Path to source location
+  elsif fn[0] == "~"
+    outfn = File.expand_path(fn)
+  elsif !bf.fname.nil?
+    pd = File.dirname(bf.fname)
+    outfn = "#{pd}/#{fn}"
+  else
+    outfn = File.expand_path(fn)
+  end
+  return outfn
+end
+
+# Scan images inserted with ⟦img:filepath⟧ syntax
+def hpt_scan_images(bf = nil)
+  bf = buf() if bf.nil?
+  return if bf.nil?
+  return if !bf.fname
+  return if !bf.fname.match(/.*txt$/)
+  imgpos = scan_indexes(bf, /⟦img:.+?⟧/)
+  imgtags = bf.scan(/(⟦img:(.+?)⟧)/)
   c = 0
   imgpos.each.with_index { |x, i|
     a = imgpos[i]
     t = imgtags[i]
     insert_pos = a + t[0].size + c
-    imgfn = File.expand_path(t[1])
-    # Ripl.start :binding => binding
+    fn = t[1]
+    imgfn = translate_path(fn, bf)
     next if !File.exist?(imgfn)
-    if buf[insert_pos..(insert_pos + 2)] != "\n \n"
-      buf.insert_txt_at("\n \n", insert_pos)
+    # Show as image in gui, handle as empty space in txt file
+
+    if bf[insert_pos..(insert_pos + 2)] != "\n \n"
+      bf.insert_txt_at("\n \n", insert_pos)
+      bf.view.handle_deltas
       c += 3
     end
-    buf.add_image(imgfn, insert_pos + 1)
+    bf.add_image(imgfn, insert_pos + 1)
   }
+  vma.gui.delex.run
 end

data/lib/vimamsa/key_actions.rb

@@ -28,13 +28,16 @@ def is_visual_mode()
   return 0
 end
 
+reg_act(:enable_debug, proc { $debug = true }, "Enable debug")
+reg_act(:disable_debug, proc { $debug = false }, "Disable debug")
+
 reg_act(:easy_jump, proc { EasyJump.start }, "Easy jump")
 reg_act(:savedebug, "savedebug", "Save debug info", { :group => :debug })
 reg_act(:open_file_dialog, "open_file_dialog", "Open file", { :group => :file })
 reg_act(:create_new_file, "create_new_file", "Create new file", { :group => :file })
-reg_act(:backup_all_buffers, proc{backup_all_buffers}, "Backup all buffers", { :group => :file })
-reg_act(:e_move_forward_char, "e_move_forward_char", "", { :group => :move })
-reg_act(:e_move_backward_char, "e_move_backward_char", "", { :group => :move })
+reg_act(:backup_all_buffers, proc { backup_all_buffers }, "Backup all buffers", { :group => :file })
+reg_act(:e_move_forward_char, "e_move_forward_char", "", { :group => [:move, :basic] })
+reg_act(:e_move_backward_char, "e_move_backward_char", "", { :group => [:move, :basic] })
 reg_act(:history_switch_backwards, "history_switch_backwards", "", { :group => :file })
 reg_act(:history_switch_forwards, "history_switch_forwards", "", { :group => :file })
 reg_act(:center_on_current_line, "center_on_current_line", "", { :group => :view })
@@ -52,7 +55,7 @@ reg_act(:set_executable, proc { buf.set_executable }, "Set current file permissi
 reg_act(:close_all_buffers, proc { bufs.close_all_buffers() }, "Close all buffers")
 reg_act(:close_current_buffer, proc { bufs.close_current_buffer(true) }, "Close current buffer")
 reg_act(:comment_selection, proc { buf.comment_selection }, "")
-reg_act(:delete_char_forward, proc { buf.delete(CURRENT_CHAR_FORWARD) }, "Delete char forward")
+reg_act(:delete_char_forward, proc { buf.delete(CURRENT_CHAR_FORWARD) }, "Delete char forward", { :group => [:edit, :basic] })
 reg_act(:load_theme, proc { load_theme }, "Load theme")
 reg_act(:gui_file_finder, proc { vma.FileFinder.start_gui }, "Fuzzy file finder")
 reg_act(:gui_file_history_finder, proc { vma.FileHistory.start_gui }, "Fuzzy file history finder")
@@ -78,19 +81,19 @@ reg_act(:diff_buffer, "diff_buffer", "")
 reg_act(:invoke_grep_search, proc { gui_grep }, "Grep current buffer")
 reg_act(:ack_search, proc { gui_ack }, "") #invoke_ack_search
 reg_act :update_file_index, proc { update_file_index }, "Update file index"
-reg_act :delete_to_word_end, proc { buf.delete2(:to_word_end) }, "Delete to file end"
-reg_act :delete_to_line_start, proc { buf.delete2(:to_line_start) }, "Delete to line start"
+reg_act :delete_to_word_end, proc { buf.delete2(:to_word_end) }, "Delete to file end", { :group => [:edit, :basic] }
+reg_act :delete_to_line_start, proc { buf.delete2(:to_line_start) }, "Delete to line start", { :group => [:edit, :basic] }
 reg_act :start_browse_mode, proc { $kbd.set_mode(:browse); $kbd.set_default_mode(:browse) }, "Start browse mode"
 reg_act :exit_browse_mode, proc {
   bufs.add_current_buf_to_history(); $kbd.set_mode(:command); $kbd.set_default_mode(:command)
 }, "Exit browse mode"
 
-reg_act :page_down, proc { page_down }
-reg_act :page_up, proc { page_up }
+reg_act :page_down, proc { page_down }, "Page down", :group => [:move, :basic]
+reg_act :page_up, proc { page_up }, "Page up", :group => [:move, :basic]
 reg_act :jump_to_start_of_buffer, proc { buf.jump(START_OF_BUFFER) }, "Jump to start of buffer"
 reg_act :jump_to_end_of_buffer, proc { buf.jump(END_OF_BUFFER) }, "Jump to end of buffer"
 reg_act(:auto_indent_buffer, proc { buf.indent }, "Auto format buffer")
-reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminalL")
+reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminal")
 reg_act(:execute_current_line_in_terminal_autoclose, proc { buf.execute_current_line_in_terminal(true) }, "Execute current line in terminal. Close after execution.")
 reg_act(:show_images, proc { hpt_scan_images() }, "Show images inserted with ⟦img:file.png⟧ syntax")
 reg_act(:delete_current_file, proc { bufs.delete_current_buffer() }, "Delete current file")
@@ -114,8 +117,28 @@ act_list = {
                   :desc => "Undo edit", :group => :edit },
 
   :find_in_buffer => { :proc => proc { invoke_search },
-                  :desc => "Find", :group => :edit },
+                       :desc => "Find", :group => :edit },
+
+  :selection_upcase => { :proc => proc { buf.transform_selection(:upcase) },
+                         :desc => "Transform text: upcase", :group => :edit },
+
+  :selection_downcase => { :proc => proc { buf.transform_selection(:downcase) },
+                           :desc => "Transform text: downcase", :group => :edit },
+
+  :selection_capitalize => { :proc => proc { buf.transform_selection(:capitalize) },
+                             :desc => "Transform text: capitalize", :group => :edit },
+
+  :selection_swapcase => { :proc => proc { buf.transform_selection(:swapcase) },
+                           :desc => "Transform text: swapcase", :group => :edit },
 
+  :selection_reverse => { :proc => proc { buf.transform_selection(:reverse) },
+                          :desc => "Transform text: reverse", :group => :edit },
+
+  :forward_line => { :proc => proc { buf.move(FORWARD_LINE) },
+                     :desc => "Move one line forward", :group => [:move, :basic] },
+
+  :backward_line => { :proc => proc { buf.move(BACKWARD_LINE) },
+                      :desc => "Move one line backward", :group => [:move, :basic] },
 
   # { :proc => proc {  },
   # :desc => "", :group => : },
@@ -123,6 +146,9 @@ act_list = {
   :search_actions => { :proc => proc { search_actions },
                        :desc => "Search actions", :group => :search },
 
+  :content_search => { :proc => proc { FileContentSearch.start_gui },
+                       :desc => "Search content of files", :group => :search },
+
   :quit => { :proc => proc { _quit },
              :desc => "Quit", :group => :app },
 
@@ -145,14 +171,13 @@ act_list_todo = {
                   :desc => "Close current file", :group => :file },
   #"C , b" => '$kbd.set_mode("S");gui_select_buffer',
 
-
   # MOVING
   #    'VC h' => 'buf.move(BACKWARD_CHAR)',
   :m_forward_char => { :proc => proc { buf.move(FORWARD_CHAR) },
                        :desc => "Move cursor one char forward",
                        :group => :move },
-  "VC j" => "buf.move(FORWARD_LINE)",
-  "VC k" => "buf.move(BACKWARD_LINE)",
+  # "VC j" => "buf.move(FORWARD_LINE)",
+  # "VC k" => "buf.move(BACKWARD_LINE)",
 
   "VC pagedown" => "page_down",
   "VC pageup" => "page_up",