vimamsa 0.1.1 → 0.1.6

data/lib/vimamsa/buffer_list.rb

@@ -30,8 +30,8 @@ class BufferList < Array
     $buffer_history << @current_buf
     @recent_ind = 0
     $hook.call(:change_buffer, $buffer)
-    qt_set_current_buffer($buffer.id)
-    qt_set_cursor_pos($buffer.id, $buffer.pos)
+    gui_set_current_buffer($buffer.id)
+    gui_set_cursor_pos($buffer.id, $buffer.pos)
   end
 
   def switch()
@@ -83,8 +83,8 @@ class BufferList < Array
     $hook.call(:change_buffer, $buffer)
     $buffer.set_active
 
-    set_window_title("Vimamsa - #{fpath}")
-    qt_set_current_buffer($buffer.id)
+    gui_set_current_buffer($buffer.id)
+    gui_set_window_title($buffer.title,$buffer.subtitle)   
 
     # hpt_scan_images() if $debug # experimental
   end

data/lib/vimamsa/debug.rb

@@ -95,16 +95,16 @@ def run_test(test_id)
   $buffer = old_buffer
 end
 
-def qt_sleep(t2)
+#TODO: remove?
+def gui_sleep(t2)
   t1 = Time.now()
   while Time.now < t1 + t2
-    qt_process_events
     sleep(0.02)
   end
 end
 
 def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
-  open_new_file("TODO"); qt_sleep(0.1)
+  open_new_file("TODO"); gui_sleep(0.1)
 
   ttstart = Time.now
   Kernel.srand(1231)
@@ -114,7 +114,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     buf.jump_to_random_pos
     buf.insert_txt("Z") if rand() > 0.25
     buf.reset_highlight() if rand() > 0.1
-    qt_trigger_event
+    gui_trigger_event
 
     # puts "========line:========="
     # puts buf.current_line()
@@ -122,12 +122,12 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
 
     render_buffer($buffer)
 
-    qt_sleep(rand() / 2)
+    gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
       buf.revert
     end
 
-    qt_trigger_event
+    gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
     render_buffer($buffer)
 

data/lib/vimamsa/easy_jump.rb

@@ -1,161 +1,165 @@
-
 # Similar feature as Vim EasyMotion https://github.com/easymotion/vim-easymotion
 class EasyJump
-  def initialize()
-    make_jump_sequence
+  # def self.initialize()
+  # make_jump_sequence
+  # end
+
+  def self.start()
+    @@cur = EasyJump.new
   end
-end
 
-def easy_jump(direction)
-  # message "EASY JUMP"
-  visible_range = get_visible_area()
-  visible_text = $buffer[visible_range[0]..visible_range[1]]
-  wsmarks = scan_word_start_marks(visible_text)
-  line_starts = scan_indexes(visible_text, /^/)
-  lsh = Hash[line_starts.collect { |x| [x, true] }]
-  wsmh = Hash[wsmarks.collect { |x| [x, true] }]
-
-  wsmarks.select! { |x|
-    r = true
-    r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
-    r
-  }
-
-  linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
-  wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
-
-  # All line starts should be accessible with just two key presses, so put them first in order
-  # Other word start positions ordered by distance from current pos
-  wsmarks_buf.sort_by! { |x| (x - $buffer.pos).abs }
-  $easy_jump_wsmarks = linestart_buf + wsmarks_buf
-
-  $jump_sequence = make_jump_sequence($easy_jump_wsmarks.size)
-
-  $input_char_call_func = method(:easy_jump_input_char)
-  $kbd.set_mode(:readchar)
-  $easy_jump_input = ""
-  easy_jump_draw
-end
+  def initialize()
+    # message "EASY JUMP"
+    visible_range = get_visible_area()
+    visible_text = buf[visible_range[0]..visible_range[1]]
+    wsmarks = scan_word_start_marks(visible_text)
+    line_starts = scan_indexes(visible_text, /^/)
+    lsh = Hash[line_starts.collect { |x| [x, true] }]
+    wsmh = Hash[wsmarks.collect { |x| [x, true] }]
+
+    wsmarks.select! { |x|
+      r = true
+      r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
+      r
+    }
+
+    linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
+    wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
+
+    # All line starts should be accessible with just two key presses, so put them first in order
+    # Other word start positions ordered by distance from current pos
+    wsmarks_buf.sort_by! { |x| (x - buf.pos).abs }
+    @easy_jump_wsmarks = linestart_buf + wsmarks_buf
 
-def easy_jump_input_char(c)
-  # vma.paint_stack = []
-  puts "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]]}"
-    $buffer.set_pos($easy_jump_wsmarks[nthword])
-    $kbd.set_mode(:command)
-    $input_char_call_func = nil
-    $jump_sequence = []
-    $vmag.clear_overlay()
+    @jump_sequence = make_jump_sequence(@easy_jump_wsmarks.size)
+
+    vma.kbd.set_keyhandling_override(self.method(:easy_jump_input_char))
+    @easy_jump_input = ""
+    easy_jump_draw
   end
-  if $easy_jump_input.size > 2
-    $kbd.set_mode(:command)
-    $input_char_call_func = nil
-    $jump_sequence = []
-    $vmag.clear_overlay()
+
+  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}]"
+    @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]]}"
+      buf.set_pos(@easy_jump_wsmarks[nthword])
+      # @kbd.set_mode(:command)
+      vma.kbd.remove_keyhandling_override
+      @jump_sequence = []
+      vma.gui.clear_overlay()
+    end
+    if @easy_jump_input.size > 2
+      # @kbd.set_mode(:command)
+      vma.kbd.remove_keyhandling_override
+      @jump_sequence = []
+      vma.gui.clear_overlay()
+    end
+    return true
   end
-end
 
-def easy_jump_draw()
-  # puts $jump_sequence.inspect
-  # puts $easy_jump_wsmarks.inspect
-  $vmag.start_overlay_draw
-  for i in 0..($easy_jump_wsmarks.size - 1)
-    $vmag.overlay_draw_text($jump_sequence[i], $easy_jump_wsmarks[i])
+  def easy_jump_draw()
+    # puts @jump_sequence.inspect
+    # puts @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])
+    end
+    vma.gui.end_overlay_draw
+
+    return
+    return if @jump_sequence.empty?
+    puts "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]}"
+      draw_text(mark_str, point[0] + 3, point[1])
+      #break if m > @cpos
+    }
   end
-  $vmag.end_overlay_draw
-  
-  return
-  return if $jump_sequence.empty?
-  puts "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]}"
-    draw_text(mark_str, point[0] + 3, point[1])
-    #break if m > $cpos
-  }
-end
 
-def make_jump_sequence(num_items)
-  left_hand = "asdfvgbqwertzxc123".upcase.split("")
-  right_hand = "jklhnnmyuiop890".upcase.split("")
+  def make_jump_sequence(num_items)
+    left_hand = "asdfvgbqwertzxc123".upcase.split("")
+    right_hand = "jklhnnmyuiop890".upcase.split("")
 
-  sequence = []
-  left_hand_fast = "asdf".upcase.split("")
-  right_hand_fast = "jkl;".upcase.split("")
+    sequence = []
+    left_hand_fast = "asdf".upcase.split("")
+    right_hand_fast = "jkl;".upcase.split("")
 
-  left_hand_slow = "wergc".upcase.split("") # v
-  right_hand_slow = "uiophnm,".upcase.split("")
+    left_hand_slow = "wergc".upcase.split("") # v
+    right_hand_slow = "uiophnm,".upcase.split("")
 
-  left_hand_slow2 = "tzx23".upcase.split("")
-  right_hand_slow2 = "yb9'".upcase.split("")
+    left_hand_slow2 = "tzx23".upcase.split("")
+    right_hand_slow2 = "yb9'".upcase.split("")
 
-  # Rmoved characters that can be mixed: O0Q, 8B, I1, VY
+    # Rmoved characters that can be mixed: O0Q, 8B, I1, VY
 
-  left_fast_slow = Array.new(left_hand_fast).concat(left_hand_slow)
-  right_fast_slow = Array.new(right_hand_fast).concat(right_hand_slow)
+    left_fast_slow = Array.new(left_hand_fast).concat(left_hand_slow)
+    right_fast_slow = Array.new(right_hand_fast).concat(right_hand_slow)
 
-  left_hand_all = Array.new(left_hand_fast).concat(left_hand_slow).concat(left_hand_slow2)
-  right_hand_all = Array.new(right_hand_fast).concat(right_hand_slow).concat(right_hand_slow2)
+    left_hand_all = Array.new(left_hand_fast).concat(left_hand_slow).concat(left_hand_slow2)
+    right_hand_all = Array.new(right_hand_fast).concat(right_hand_slow).concat(right_hand_slow2)
 
-  left_hand_fast.each { |x|
-    left_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_fast.each { |x|
+      left_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_fast.each { |x|
-    right_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_fast.each { |x|
+      right_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_fast.each { |x|
-    left_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_fast.each { |x|
+      left_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_fast.each { |x|
-    right_hand_fast.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_fast.each { |x|
+      right_hand_fast.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_slow.each { |x|
-    right_fast_slow.each { |y|
-      sequence << "#{x}#{y}"
+    left_hand_slow.each { |x|
+      right_fast_slow.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  right_hand_slow.each { |x|
-    left_fast_slow.each { |y|
-      sequence << "#{x}#{y}"
+    right_hand_slow.each { |x|
+      left_fast_slow.each { |y|
+        sequence << "#{x}#{y}"
+      }
     }
-  }
 
-  left_hand_slow2.each { |x|
-    right_hand_all.each { |y|
-      left_hand_all.each { |z|
-        sequence << "#{x}#{y}#{z}"
+    left_hand_slow2.each { |x|
+      right_hand_all.each { |y|
+        left_hand_all.each { |z|
+          sequence << "#{x}#{y}#{z}"
+        }
       }
     }
-  }
 
-  right_hand_slow2.each { |x|
-    left_hand_all.each { |y|
-      right_hand_all.each { |z|
-        sequence << "#{x}#{y}#{z}"
+    right_hand_slow2.each { |x|
+      left_hand_all.each { |y|
+        right_hand_all.each { |z|
+          sequence << "#{x}#{y}#{z}"
+        }
       }
     }
-  }
 
-  #printf("Size of sequence: %d\n",sequence.size)
-  #puts sequence.inspect
-  return sequence
+    #printf("Size of sequence: %d\n",sequence.size)
+    #puts sequence.inspect
+    return sequence
+  end
 end

data/lib/vimamsa/editor.rb

@@ -19,9 +19,14 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
+def mkdir_if_not_exists(_dirpath)
+  dirpath = File.expand_path(_dirpath)
+  Dir.mkdir(dirpath) unless File.exist?(dirpath)
+end
+
 class Editor
-  attr_reader :file_content_search_paths, :file_name_search_paths
-  attr_accessor :converters, :fh, :paint_stack
+  attr_reader :file_content_search_paths, :file_name_search_paths, :gui
+  attr_accessor :converters, :fh, :paint_stack, :kbd 
   #attr_writer :call_func, :update_highlight
 
   def initialize()
@@ -37,6 +42,25 @@ class Editor
     @converters = {}
     @paint_stack = []
     @_plugins = {}
+
+  end
+
+  def open_file_listener(added)
+    if !added.empty?
+      for fp in added
+        sleep 0.1
+        x = IO.read(fp)
+        File.delete(fp)
+        for f in x.lines
+          f.gsub!("\n", "")
+          if File.exist?(f)
+            if file_is_text_file(f)
+              jump_to_file(f)
+            end
+          end
+        end
+      end
+    end
   end
 
   def start
@@ -47,6 +71,8 @@ class Editor
     # GLib::Idle.add(proc{ puts "IDLEFUNC"})
     # GLib::Idle.add(proc { idle_func })
 
+    @gui = $vmag #TODO
+
     $hook = Hook.new
     register_plugin(:Hook, $hook)
     $macro = Macro.new
@@ -61,7 +87,8 @@ class Editor
 
     debug "ARGV: " + ARGV.inspect
     # build_key_bindings_tree
-    $kbd = KeyBindingTree.new()
+    @kbd = KeyBindingTree.new()
+    $kbd = @kbd
     $kbd.add_mode("C", :command)
     $kbd.add_mode("I", :insert)
     $kbd.add_mode("V", :visual)
@@ -69,13 +96,20 @@ class Editor
     $kbd.add_mode("R", :readchar)
     $kbd.add_mode("B", :browse)
     $kbd.set_default_mode(:command)
-    require "vimamsa/default_key_bindings"
+    require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
 
     FileManager.init
 
-    dot_dir = File.expand_path("~/.vimamsa")
-    Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
+    mkdir_if_not_exists("~/.vimamsa")
+    mkdir_if_not_exists("~/.vimamsa/backup")
+    mkdir_if_not_exists("~/.vimamsa/listen")
+    listen_dir = File.expand_path "~/.vimamsa/listen"
+    listener = Listen.to(listen_dir) do |modified, added, removed|
+      puts(modified: modified, added: added, removed: removed)
+      open_file_listener(added)
+    end
+    listener.start
 
     $cnf[:theme] = "Twilight_edit"
     $cnf[:syntax_highlight] = true
@@ -84,7 +118,7 @@ class Editor
       $cnf = eval(IO.read(settings_path))
     end
 
-    # set_qt_style(1)
+    # set_gui_style(1)
 
     # Limit file search to these extensions:
     $find_extensions = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb"]
@@ -114,7 +148,7 @@ class Editor
     if fname
       buffer = Buffer.new(read_file("", fname), fname)
     else
-      buffer = Buffer.new("INIT\n")
+      buffer = Buffer.new(" \n")
     end
     $buffers << buffer
 
@@ -203,8 +237,7 @@ class Editor
   # Register converter
   def reg_conv(converter, converter_id)
     @converters[converter_id] = converter
-    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", [:selection])
-    # reg_act(converter_id, "$buffer.convert_selected_text(:#{converter_id})", "Converter #{converter_id}", [:selection])
+    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
   end
 
   def apply_conv(converter_id, txt)
@@ -231,10 +264,8 @@ class Editor
 end
 
 def _quit()
-  # Shut down the Qt thread before the ruby thread
   vma.shutdown
-  qt_quit
-  exit
+  Gtk.main_quit
 end
 
 def fatal_error(msg)
@@ -243,14 +274,13 @@ def fatal_error(msg)
 end
 
 def file_saveas(filename)
-  $buffer.set_filename(filename)
-  $buffer.save()
+  buf.save_as_callback(filename)
 end
 
 def open_file_dialog()
   path = ""
   path = $buffer.fname if $buffer.fname
-  qt_open_file_dialog(File.dirname(path))
+  gui_open_file_dialog(File.dirname(path))
 end
 
 def system_clipboard_changed(clipboard_contents)
@@ -384,9 +414,9 @@ def minibuffer_new_char(c)
   #$buffer = $minibuffer
 end
 
-def readchar_new_char(c)
-  $input_char_call_func.call(c)
-end
+# def readchar_new_char(c)
+  # $input_char_call_func.call(c)
+# end
 
 def minibuffer_delete()
   $minibuffer.delete(BACKWARD_CHAR)
@@ -432,7 +462,7 @@ GUESS_ENCODING_ORDER = [
 def create_new_file(filename = nil, file_contents = "\n")
   debug "NEW FILE CREATED"
   buffer = Buffer.new(file_contents)
-  qt_set_current_buffer(buffer.id) #TODO: remove?
+  # gui_set_current_buffer(buffer.id) #TODO: remove?
   $buffers << buffer
   return buffer
 end
@@ -458,7 +488,7 @@ def load_buffer(fname)
   end
   debug("LOAD BUFFER: #{fname}")
   buffer = Buffer.new(read_file("", fname), fname)
-  # qt_set_current_buffer(buffer.id)
+  # gui_set_current_buffer(buffer.id)
   buffer.set_active
   debug("DONE LOAD: #{fname}")
   #buf = filter_buffer(buffer)
@@ -493,7 +523,6 @@ def open_new_file(filename, file_contents = "")
     fname = filename
     load_buffer(fname)
   end
-  set_window_title("Vimamsa - #{File.basename(filename)}")
 end
 
 def scan_word_start_marks(search_str)
@@ -506,10 +535,6 @@ def draw_text(str, x, y)
   vma.paint_stack << [4, x, y, str]
 end
 
-def center_on_current_line__2del()
-  center_where_cursor
-end
-
 def hook_draw()
   # TODO: as hook.register
   # easy_jump_draw()
@@ -527,8 +552,6 @@ def render_buffer(buffer = 0, reset = 0)
   t1 = Time.now
   hook_draw()
 
-  render_text(tmpbuf, pos, selection_start, reset) #TODO: remove?
-
   if $buffer.need_redraw?
     hpt_scan_images() if $debug #experimental
   end