vimamsa 0.1.5 → 0.1.8

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
 
@@ -95,16 +96,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 +115,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 +123,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 = []
+    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]
+      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
+      @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()
+    # 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])
+    end
+    vma.gui.end_overlay_draw
+
+    return
+    return if @jump_sequence.empty?
+    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]
+      #debug "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)
+    #debug sequence.inspect
+    return sequence
+  end
 end