vimamsa 0.1.7 → 0.1.10

data/lib/vimamsa/search_replace.rb

@@ -50,16 +50,15 @@ class FileSelector
     # puts "def select_line"
     fn = fullp(@buf.get_current_line[0..-2])
     if File.directory?(fn)
-      puts "CHDIR: #{fn}"
+      debug "CHDIR: #{fn}"
       dir_to_buf(fn)
-    # elsif vma.can_open_extension?(fn) #TODO: remove this check?
+      # elsif vma.can_open_extension?(fn) #TODO: remove this check?
       # jump_to_file(fn)
     elsif file_is_text_file(fn)
       jump_to_file(fn)
     else
       open_with_default_program(fn)
     end
-    # puts l.inspect
   end
 end
 
@@ -71,10 +70,10 @@ end
 
 def grep_cur_buffer(search_str, b = nil)
   debug "grep_cur_buffer(search_str)"
-  lines = $buffer.split("\n")
+  lines = vma.buf.split("\n")
   r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
   fpath = ""
-  fpath = $buffer.pathname.expand_path.to_s + ":" if $buffer.pathname
+  fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
   res_str = ""
 
   $grep_matches = []
@@ -85,16 +84,16 @@ def grep_cur_buffer(search_str, b = nil)
       $grep_matches << i + 1 # Lines start from index 1
     end
   }
-  $grep_bufid = $buffers.current_buf
+  $grep_bufid = vma.buffers.current_buf
   b = create_new_file(nil, res_str)
   # set_current_buffer(buffer_i, update_history = true)
   # @current_buf = buffer_i
 
   b.line_action_handler = proc { |lineno|
-    puts "GREP HANDLER:#{lineno}"
+    debug "GREP HANDLER:#{lineno}"
     jumpto = $grep_matches[lineno]
     if jumpto.class == Integer
-      $buffers.set_current_buffer($grep_bufid, update_history = true)
+      vma.buffers.set_current_buffer($grep_bufid, update_history = true)
       buf.jump_to_line(jumpto)
     end
   }
@@ -104,8 +103,8 @@ def invoke_grep_search()
   start_minibuffer_cmd("", "", :grep_cur_buffer)
 end
 
-def gui_one_input_action(title, field_label, button_title, callback)
-  a = OneInputAction.new(nil, title, field_label, button_title, callback)
+def gui_one_input_action(title, field_label, button_title, callback,opt={})
+  a = OneInputAction.new(nil, title, field_label, button_title, callback,opt)
   a.run
   return
 end
@@ -114,7 +113,7 @@ end
 def gui_replace_callback(vals)
   search_str = vals["search"]
   replace_str = vals["replace"]
-  puts "gui_replace_callback: #{search_str} => #{replace_str}"
+  debug "gui_replace_callback: #{search_str} => #{replace_str}"
   gui_select_window_close(0)
   buf_replace(search_str, replace_str)
 end
@@ -137,21 +136,21 @@ def invoke_replace()
 end
 
 def buf_replace(search_str, replace_str)
-  if $buffer.visual_mode?
-    r = $buffer.get_visual_mode_range
-    txt = $buffer[r]
+  if vma.buf.visual_mode?
+    r = vma.buf.get_visual_mode_range
+    txt = vma.buf[r]
     txt.gsub!(search_str, replace_str)
-    $buffer.replace_range(r, txt)
-    $buffer.end_visual_mode
+    vma.buf.replace_range(r, txt)
+    vma.buf.end_visual_mode
   else
-    repbuf = $buffer.to_s.clone
+    repbuf = vma.buf.to_s.clone
     repbuf.gsub!(search_str, replace_str)
-    tmppos = $buffer.pos
-    if repbuf == $buffer.to_s.clone
+    tmppos = vma.buf.pos
+    if repbuf == vma.buf.to_s.clone
       message("NO CHANGE. Replacing #{search_str} with #{replace_str}.")
     else
-      $buffer.set_content(repbuf)
-      $buffer.set_pos(tmppos)
+      vma.buf.set_content(repbuf)
+      vma.buf.set_pos(tmppos)
       message("Replacing #{search_str} with #{replace_str}.")
     end
   end
@@ -263,7 +262,7 @@ class PopupFormGenerator
 end
 
 class OneInputAction
-  def initialize(main_window, title, field_label, button_title, callback)
+  def initialize(main_window, title, field_label, button_title, callback, opt = {})
     @window = Gtk::Window.new(:toplevel)
     # @window.screen = main_window.screen
     # @window.title = title
@@ -292,6 +291,10 @@ class OneInputAction
 
     @entry1 = Gtk::Entry.new
 
+    if opt[:hide]
+      @entry1.visibility = false
+    end
+
     button.signal_connect "clicked" do
       callback.call(@entry1.text)
       @window.destroy

data/lib/vimamsa/text_transforms.rb

@@ -3,7 +3,7 @@ class Converter
     @obj = obj
     @type = type
     if id != nil
-      $vma.reg_conv(self, id)
+      vma.reg_conv(self, id)
     end
   end
 
@@ -30,3 +30,5 @@ Converter.new(lambda { |x|
   x + "\n" + nums.join("+") + "=#{sum}"
 }, :lambda, :sum_of_numbers)
 
+c = Converter.new(lambda { |x| x.scan(/[\w\.]+@[\w\.]+/).join("\n") }, :lambda, :get_emails)
+

data/lib/vimamsa/util.rb

@@ -3,6 +3,40 @@
 # Cross-platform way of finding an executable in the $PATH.
 #
 #   which('ruby') #=> /usr/bin/ruby
+
+
+# Execute proc after wait_time seconds after last .run call.
+# Used for image scaling after window resize
+class DelayExecutioner
+  def initialize(wait_time, _proc)
+    @wait_time = wait_time
+    @proc = _proc
+    @lastt = Time.now
+    @thread_running = false
+  end
+
+  def start_thread
+    Thread.new {
+      while true
+        sleep 0.1
+        if Time.now - @lastt > @wait_time
+          @proc.call
+          @thread_running = false
+          break
+        end
+      end
+    }
+  end
+
+  def run()
+    @lastt = Time.now
+    if @thread_running == false
+      @thread_running = true
+      start_thread
+    end
+  end
+end
+
 def which(cmd)
   exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
   ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.7"
+  VERSION = "0.1.10"
 end

data/lib/vimamsa.rb

@@ -1,4 +1,9 @@
 require "vimamsa/version"
+
+require "gtk3"
+require "gtksourceview4"
+test1 = Gtk::TextView.new
+
 require "vmaext"
 
 require "vimamsa/rbvma"

data/styles/dark.xml

@@ -136,6 +136,7 @@
   <style name="def:heading5"                scale="1.1" bold="true" foreground="heading" />
   <style name="def:heading6"                scale="1.0" bold="true" foreground="heading" />
  
+  <style name="def:bold"                scale="1.5" bold="true" foreground="heading" />
 
   <!-- Language specific -->
   <style name="diff:added-line"             foreground="butter2"/>

data/styles/molokai_edit.xml

@@ -44,6 +44,6 @@
   <style name="def:heading4"                scale="1.175" bold="true" foreground="heading" />
   <style name="def:heading5"                scale="1.1" bold="true" foreground="heading" />
   <style name="def:heading6"                scale="1.0" bold="true" foreground="heading" />
- 
+  <style name="def:bold"                bold="true" />
 </style-scheme>
 

data/vimamsa.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'gdk3', '~> 3.4'
   spec.add_runtime_dependency 'gtk3', '~> 3.4'
   spec.add_runtime_dependency 'differ', '~> 0.1'
-  spec.add_runtime_dependency 'gtksourceview3', '~> 3.4'
-  # spec.add_runtime_dependency 'gtksourceview4'
+  # spec.add_runtime_dependency 'gtksourceview3', '~> 3.4'
+  spec.add_runtime_dependency 'gtksourceview4'
   spec.add_runtime_dependency 'parallel', '~> 1.14'
   spec.add_runtime_dependency 'listen', '~> 3.4'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Sami Sieranoja
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: gtksourceview3
+  name: gtksourceview4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- custom_example.rb
+- demo.txt
 - exe/vimamsa
 - ext/vmaext/extconf.rb
 - ext/vmaext/vmaext.c
@@ -190,6 +192,8 @@ files:
 - lib/vimamsa/actions.rb
 - lib/vimamsa/buffer.rb
 - lib/vimamsa/buffer_list.rb
+- lib/vimamsa/buffer_manager.rb
+- lib/vimamsa/conf.rb
 - lib/vimamsa/constants.rb
 - lib/vimamsa/debug.rb
 - lib/vimamsa/easy_jump.rb
@@ -199,7 +203,7 @@ files:
 - lib/vimamsa/file_history.rb
 - lib/vimamsa/file_manager.rb
 - lib/vimamsa/gui.rb
-- lib/vimamsa/gui_gtk_sourceview.rb
+- lib/vimamsa/gui_image.rb
 - lib/vimamsa/gui_menu.rb
 - lib/vimamsa/gui_select_window.rb
 - lib/vimamsa/gui_sourceview.rb
@@ -216,6 +220,7 @@ files:
 - lib/vimamsa/text_transforms.rb
 - lib/vimamsa/util.rb
 - lib/vimamsa/version.rb
+- sheep.jpg
 - styles/134272-molokai.xml
 - styles/dark.xml
 - styles/molokai_edit.xml
@@ -224,7 +229,7 @@ homepage: https://github.com/SamiSieranoja/vimamsa
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -241,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Vimamsa
 test_files: []

data/lib/vimamsa/gui_gtk_sourceview.rb

@@ -1,294 +0,0 @@
-
-class VSourceView < GtkSource::View
-  def initialize(title = nil)
-    # super(:toplevel)
-    super()
-    puts "vsource init"
-    @last_keyval = nil
-    @last_event = [nil, nil]
-
-    signal_connect "button-press-event" do |_widget, event|
-      if event.button == Gdk::BUTTON_PRIMARY
-        # puts "Gdk::BUTTON_PRIMARY"
-        false
-      elsif event.button == Gdk::BUTTON_SECONDARY
-        # puts "Gdk::BUTTON_SECONDARY"
-        true
-      else
-        true
-      end
-    end
-
-    signal_connect("key_press_event") do |widget, event|
-      handle_key_event(event, :key_press_event)
-      true
-    end
-
-    signal_connect("key_release_event") do |widget, event|
-      handle_key_event(event, :key_release_event)
-      true
-    end
-
-    signal_connect("move-cursor") do |widget, event|
-      $update_cursor = true
-      false
-    end
-
-    signal_connect "button-release-event" do |widget, event|
-      $buffer.set_pos(buffer.cursor_position)
-      false
-    end
-    @curpos_mark = nil
-  end
-
-  def handle_key_event(event, sig)
-    if $update_cursor
-      curpos = buffer.cursor_position
-      puts "MOVE CURSOR: #{curpos}"
-      buf.set_pos(curpos)
-      $update_cursor = false
-    end
-    puts $view.visible_rect.inspect
-
-    puts "key event"
-    puts event
-
-    key_name = event.string
-    if event.state.control_mask?
-      key_name = Gdk::Keyval.to_name(event.keyval)
-      # Gdk::Keyval.to_name()
-    end
-
-    keyval_trans = {}
-    keyval_trans[Gdk::Keyval::KEY_Control_L] = "ctrl"
-    keyval_trans[Gdk::Keyval::KEY_Control_R] = "ctrl"
-
-    keyval_trans[Gdk::Keyval::KEY_Escape] = "esc"
-
-    keyval_trans[Gdk::Keyval::KEY_Return] = "enter"
-    keyval_trans[Gdk::Keyval::KEY_ISO_Enter] = "enter"
-    keyval_trans[Gdk::Keyval::KEY_KP_Enter] = "enter"
-    keyval_trans[Gdk::Keyval::KEY_Alt_L] = "alt"
-    keyval_trans[Gdk::Keyval::KEY_Alt_R] = "alt"
-
-    keyval_trans[Gdk::Keyval::KEY_BackSpace] = "backspace"
-    keyval_trans[Gdk::Keyval::KEY_KP_Page_Down] = "pagedown"
-    keyval_trans[Gdk::Keyval::KEY_KP_Page_Up] = "pageup"
-    keyval_trans[Gdk::Keyval::KEY_Page_Down] = "pagedown"
-    keyval_trans[Gdk::Keyval::KEY_Page_Up] = "pageup"
-    keyval_trans[Gdk::Keyval::KEY_Left] = "left"
-    keyval_trans[Gdk::Keyval::KEY_Right] = "right"
-    keyval_trans[Gdk::Keyval::KEY_Down] = "down"
-    keyval_trans[Gdk::Keyval::KEY_Up] = "up"
-    keyval_trans[Gdk::Keyval::KEY_space] = "space"
-
-    keyval_trans[Gdk::Keyval::KEY_Shift_L] = "shift"
-    keyval_trans[Gdk::Keyval::KEY_Shift_R] = "shift"
-    keyval_trans[Gdk::Keyval::KEY_Tab] = "tab"
-
-    key_trans = {}
-    key_trans["\e"] = "esc"
-    tk = keyval_trans[event.keyval]
-    key_name = tk if !tk.nil?
-
-    key_str_parts = []
-    key_str_parts << "ctrl" if event.state.control_mask? and key_name != "ctrl"
-    key_str_parts << "alt" if event.state.mod1_mask? and key_name != "alt"
-
-    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
-    # $kbd.match_key_conf(key_str, nil, :key_press)
-    # puts "key_str=#{key_str} key_"
-
-    if key_str != "" # or prefixed_key_str != ""
-      if sig == :key_release_event and event.keyval == @last_keyval
-        $kbd.match_key_conf(key_str + "!", nil, :key_release)
-        @last_event = [event, :key_release]
-      elsif sig == :key_press_event
-        $kbd.match_key_conf(key_str, nil, :key_press)
-        @last_event = [event, key_str, :key_press]
-      end
-      @last_keyval = event.keyval #TODO: outside if?
-    end
-
-    handle_deltas
-
-    # set_focus(5)
-    # false
-
-  end
-
-  def pos_to_coord(i)
-    b = buffer
-    iter = b.get_iter_at(:offset => i)
-    iterxy = get_iter_location(iter)
-    winw = parent_window.width
-    view_width = visible_rect.width
-    gutter_width = winw - view_width
-
-    x = iterxy.x + gutter_width
-    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
-    (x, y) = buffer_to_window_coords(Gtk::TextWindowType::TEXT, x, y)
-    # Ripl.start :binding => binding
-
-    return [x, y]
-  end
-
-  def handle_deltas()
-    any_change = false
-    while d = buf.deltas.shift
-      any_change = true
-      pos = d[0]
-      op = d[1]
-      num = d[2]
-      txt = d[3]
-      if op == DELETE
-        startiter = buffer.get_iter_at(:offset => pos)
-        enditer = buffer.get_iter_at(:offset => pos + num)
-        buffer.delete(startiter, enditer)
-      elsif op == INSERT
-        startiter = buffer.get_iter_at(:offset => pos)
-        buffer.insert(startiter, txt)
-      end
-    end
-    if any_change
-      gui_set_cursor_pos($buffer.id, $buffer.pos) #TODO: only when necessary
-    end
-
-    # sanity_check #TODO
-  end
-
-  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 "===================="
-    if a == b
-      puts "Buffers match"
-    else
-      puts "ERROR: Buffer's don't match."
-    end
-  end
-
-  def set_cursor_pos(pos)
-    # return
-    itr = buffer.get_iter_at(:offset => pos)
-    itr2 = buffer.get_iter_at(:offset => pos + 1)
-    buffer.place_cursor(itr)
-
-    # $view.signal_emit("extend-selection", Gtk::MovementStep.new(:PAGES), -1, false)
-
-    within_margin = 0.075 #margin as a [0.0,0.5) fraction of screen size
-    use_align = false
-    xalign = 0.5 #0.0=top 1.0=bottom, 0.5=center
-    yalign = 0.5
-
-    if @curpos_mark.nil?
-      @curpos_mark = buffer.create_mark("cursor", itr, false)
-    else
-      buffer.move_mark(@curpos_mark, itr)
-    end
-    scroll_to_mark(@curpos_mark, within_margin, use_align, xalign, yalign)
-    $idle_scroll_to_mark = true
-    ensure_cursor_visible
-
-    # scroll_to_iter(itr, within_margin, use_align, xalign, yalign)
-
-    # $view.signal_emit("extend-selection", Gtk::TextExtendSelection.new, itr,itr,itr2)
-    # Ripl.start :binding => binding
-    draw_cursor
-
-    return true
-  end
-
-  def cursor_visible_idle_func
-    puts "cursor_visible_idle_func"
-    # From https://picheta.me/articles/2013/08/gtk-plus--a-method-to-guarantee-scrolling.html
-    # vr = visible_rect
-
-    # b = $view.buffer
-    # iter = buffer.get_iter_at(:offset => buffer.cursor_position)
-    # iterxy = get_iter_location(iter)
-
-    sleep(0.01)
-    # intr = iterxy.intersect(vr)
-    if is_cursor_visible == false
-      # set_cursor_pos(buffer.cursor_position)
-
-      itr = buffer.get_iter_at(:offset => buffer.cursor_position)
-
-      within_margin = 0.075 #margin as a [0.0,0.5) fraction of screen size
-      use_align = false
-      xalign = 0.5 #0.0=top 1.0=bottom, 0.5=center
-      yalign = 0.5
-
-      scroll_to_iter(itr, within_margin, use_align, xalign, yalign)
-
-      # return true # Call this func again
-    else
-      return false # Don't call this idle func again
-    end
-  end
-
-  def is_cursor_visible
-    vr = visible_rect
-    iter = buffer.get_iter_at(:offset => buffer.cursor_position)
-    iterxy = get_iter_location(iter)
-    iterxy.width = 1 if iterxy.width == 0
-    iterxy.height = 1 if iterxy.height == 0
-
-    intr = iterxy.intersect(vr)
-    if intr.nil?
-      puts iterxy.inspect
-      puts vr.inspect
-      # Ripl.start :binding => binding
-
-      # exit!
-      return false
-    else
-      return true
-    end
-  end
-
-  def ensure_cursor_visible
-    if is_cursor_visible == false
-      Thread.new {
-        sleep 0.01
-        GLib::Idle.add(proc { cursor_visible_idle_func })
-      }
-    end
-  end
-
-  def draw_cursor
-    if is_command_mode
-      itr = buffer.get_iter_at(:offset => buf.pos)
-      itr2 = buffer.get_iter_at(:offset => buf.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}"
-      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)
-      $view.buffer.select_range(itr, itr)
-      puts "INSERT MODE"
-    end
-  end
-
-  # def quit
-  # destroy
-  # true
-  # end
-end
-