vimamsa 0.1.9 → 0.1.11

data/lib/vimamsa/rbvma.rb

@@ -1,8 +1,9 @@
-#require "gtksourceview4"
 require "date"
 require "fileutils"
-require "gtk3"
-require "gtksourceview4"
+
+require "gtk4"
+require "gtksourceview5"
+
 require "json"
 require "listen"
 require "pathname"
@@ -10,9 +11,11 @@ require "ripl"
 require "ripl/multi_line"
 require "shellwords"
 require "cgi"
-
+require "uri"
 require "vimamsa/util"
+# exit!
 require "vimamsa/main"
+require "vimamsa/form_generator"
 
 require "vimamsa/actions"
 require "vimamsa/key_binding_tree"

data/lib/vimamsa/search.rb

@@ -3,7 +3,7 @@ def execute_search(input_str)
   $search = Search.new
   eval_str="execute_search(#{input_str.dump})"
   $macro.overwrite_current_action(eval_str)
-  return $search.set(input_str, "simple", $buffer)
+  return $search.set(input_str, "simple", vma.buf)
 end
 
 def invoke_search()
@@ -44,6 +44,8 @@ class Search
     else
       return false
     end
+    
+    return nil
   end
 
   def update_search()
@@ -54,7 +56,6 @@ class Search
     if startpos != nil
       @cur_search_i = @search_indexes.find_index(startpos)
     end
-    # Ripl.start :binding => binding
   end
 
   def jump_to_next()

data/lib/vimamsa/search_replace.rb

@@ -70,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 = []
@@ -84,7 +84,7 @@ 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
@@ -93,18 +93,18 @@ def grep_cur_buffer(search_str, b = nil)
     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
   }
 end
 
-def invoke_grep_search()
-  start_minibuffer_cmd("", "", :grep_cur_buffer)
-end
+# def invoke_grep_search()
+# start_minibuffer_cmd("", "", :grep_cur_buffer)
+# end
 
-def gui_one_input_action(title, field_label, button_title, callback,opt={})
-  a = OneInputAction.new(nil, title, field_label, button_title, callback,opt)
+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
@@ -136,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
@@ -168,121 +168,48 @@ def buf_replace_string(instr)
   buf_replace(a[0], a[1])
 end
 
-# PopupFormGenerator.new().run
-class PopupFormGenerator
-  def submit()
-    ret = {}
-    for id, entry in @vals
-      ret[id] = entry.text
-    end
-    @callback.call(ret)
-    @window.destroy
-  end
-
-  def initialize(params = nil)
-    @window = Gtk::Window.new(:toplevel)
-    # @window.screen = main_window.screen
-    # @window.title = title
-    # params = {}
-    # params["inputs"] = {}
-    # params["inputs"]["search"] = { :label => "Search", :type => :entry }
-    # params["inputs"]["replace"] = { :label => "Replace", :type => :entry }
-    # params["inputs"]["btn1"] = { :label => "Replace all", :type => :button }
-    # params[:callback] = proc { |x| puts "====="; puts x.inspect; puts "=====" }
-
-    @callback = params[:callback]
-    @window.title = ""
-
-    frame = Gtk::Frame.new()
-    frame.margin = 8
-    @window.add(frame)
-
-    # @window.title = params["title"]
-
-    # @callback = params["callback"]
-
-    infolabel = Gtk::Label.new
-    # infolabel.markup = params["title"]
-
-    vbox = Gtk::Box.new(:vertical, 8)
-    vbox.margin = 8
-    frame.add(vbox)
-
-    hbox = Gtk::Box.new(:horizontal, 8)
-    # @window.add(hbox)
-    @vals = {}
-
-    for id, elem in params["inputs"]
-      if elem[:type] == :button
-        button = Gtk::Button.new(:label => elem[:label])
-        hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
-        button.signal_connect "clicked" do
-          submit
-        end
-      elsif elem[:type] == :entry
-        label = Gtk::Label.new(elem[:label])
-        entry = Gtk::Entry.new
-        hbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
-        hbox.pack_start(entry, :expand => false, :fill => false, :padding => 0)
-        @vals[id] = entry
-
-        entry.signal_connect("key_press_event") do |widget, event|
-          if event.keyval == Gdk::Keyval::KEY_Return
-            submit
-            true
-          elsif event.keyval == Gdk::Keyval::KEY_Escape
-            @window.destroy
-            true
-          else
-            false
-          end
-        end
-      end
-    end
-
-    vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
-
-    cancel_button = Gtk::Button.new(:label => "Cancel")
-    cancel_button.signal_connect "clicked" do
-      @window.destroy
+module Gtk
+  class Frame
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
     end
-    hbox.pack_start(cancel_button, :expand => false, :fill => false, :padding => 0)
-
-    return
   end
 
-  def run
-    if !@window.visible?
-      @window.show_all
-    else
-      @window.destroy
+  class Box
+    def margin=(a)
+      self.margin_bottom = a
+      self.margin_top = a
+      self.margin_end = a
+      self.margin_start = a
     end
-    @window
   end
 end
 
 class OneInputAction
   def initialize(main_window, title, field_label, button_title, callback, opt = {})
-    @window = Gtk::Window.new(:toplevel)
+    @window = Gtk::Window.new()
     # @window.screen = main_window.screen
     # @window.title = title
     @window.title = ""
 
     frame = Gtk::Frame.new()
-    frame.margin = 8
-    @window.add(frame)
+    # frame.margin = 20
+    @window.set_child(frame)
 
     infolabel = Gtk::Label.new
     infolabel.markup = title
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.margin = 8
-    frame.add(vbox)
+    vbox.margin = 10
+    frame.set_child(vbox)
 
     hbox = Gtk::Box.new(:horizontal, 8)
     # @window.add(hbox)
-    vbox.pack_start(infolabel, :expand => false, :fill => false, :padding => 0)
-    vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
+    vbox.pack_end(infolabel, :expand => false, :fill => false, :padding => 0)
+    vbox.pack_end(hbox, :expand => false, :fill => false, :padding => 0)
 
     button = Gtk::Button.new(:label => button_title)
     cancel_button = Gtk::Button.new(:label => "Cancel")
@@ -304,12 +231,15 @@ class OneInputAction
       @window.destroy
     end
 
-    @entry1.signal_connect("key_press_event") do |widget, event|
-      if event.keyval == Gdk::Keyval::KEY_Return
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+    @window.add_controller(press)
+    press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      if keyval == Gdk::Keyval::KEY_Return
         callback.call(@entry1.text)
         @window.destroy
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Escape
+      elsif keyval == Gdk::Keyval::KEY_Escape
         @window.destroy
         true
       else
@@ -317,16 +247,16 @@ class OneInputAction
       end
     end
 
-    hbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
-    hbox.pack_start(@entry1, :expand => false, :fill => false, :padding => 0)
-    hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
-    hbox.pack_start(cancel_button, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(label, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(@entry1, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(button, :expand => false, :fill => false, :padding => 0)
+    hbox.pack_end(cancel_button, :expand => false, :fill => false, :padding => 0)
     return
   end
 
   def run
     if !@window.visible?
-      @window.show_all
+      @window.show
     else
       @window.destroy
     end

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
 

data/lib/vimamsa/util.rb

@@ -1,12 +1,58 @@
 
+class HSafe
+  def initialize(hash)
+    @h = hash
+    @a = []
+  end
+
+  def [](x)
+    @a << x
+    return self
+  end
+
+  def val
+    b = @a.reverse
+    hh = @h
+    while !b.empty?
+      x = b.pop
+      puts "x=#{x}"
+      pp b
+      ok = false
+      if hh.class == Hash or hh.class == Array
+        ok = true
+      else
+        if hh.methods.include?(:[])
+          ok = true
+        end
+      end
+      return nil if !ok
+      if hh[x].nil?
+        return nil
+      else
+        hh = hh[x]
+      end
+    end
+    return hh
+  end
+end
+
+# h= Hash.new
+# h[2] = Hash.new
+# h[2]["sdf"] = Hash.new
+# h[2]["sdf"][:ll] = 2323
+# pp HSafe.new(h)[2]["sdf"][:ll].val
+# pp HSafe.new(h)[2]["sdf"][:llz].val
+# pp HSafe.new(h)["SDFSDFD"]["sdf"][:llz].val
+
+
 # From https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
 # 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

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

data/lib/vimamsa.rb

@@ -1,17 +1,12 @@
 require "vimamsa/version"
 
-require "gtk3"
-require "gtksourceview4"
-test1 = Gtk::TextView.new
-
 require "vmaext"
 
 require "vimamsa/rbvma"
 
 module Vimamsa
-  # Your code goes here...
   def self.test
-    puts "Vimamsa test"
+    puts "Vimamsa c-extension test"
     puts srn_dst("foobar", "baz")
   end
 end

data/styles/molokai_edit.xml

@@ -8,6 +8,9 @@
     </_description>
 
   <color name="heading"                       value="#CF6A4C"/>
+<style name="selection" foreground="#ffffff" background="#10bd8e"/>
+
+
     <style foreground="#AE81FF" name="def:boolean"/>
     <style foreground="#AE81FF" name="def:number"/>
     <style foreground="#E6DB74" name="def:string"/>

data/vimamsa.gemspec

@@ -20,20 +20,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib","ext"]
 
-  spec.add_development_dependency "bundler", "~> 2.2.33"
+  spec.add_development_dependency "bundler", "~> 2.4.21"
   spec.add_development_dependency "rake", "~> 13.0"
   
-  spec.add_runtime_dependency 'rufo', '~> 0.5'
+  spec.add_runtime_dependency 'rufo', '~> 0.16.2'
   
-  spec.add_runtime_dependency 'ripl', '~> 0.7'
+  spec.add_runtime_dependency 'ripl', '~> 0.7.1'
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
-  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 'parallel', '~> 1.14'
-  spec.add_runtime_dependency 'listen', '~> 3.4'
+  spec.add_runtime_dependency 'gdk4', '~> 4.2.0'
+  spec.add_runtime_dependency 'gtk4', '~> 4.2.0'
+  spec.add_runtime_dependency 'differ', '~>  0.1.2'
+  spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.0'
+  spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?
+  spec.add_runtime_dependency 'listen', '~> 3.4'  #TODO: update?
+
 
   spec.extensions = ["ext/vmaext/extconf.rb"]
   spec.licenses    = ['GPL-3.0+']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.33
+        version: 2.4.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.33
+        version: 2.4.21
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: ripl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: ripl-multi_line
   requirement: !ruby/object:Gem::Requirement
@@ -81,61 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: gdk3
+  name: gdk4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: gtk3
+  name: gtk4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: gtksourceview3
+  name: gtksourceview5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ files:
 - lib/vimamsa/file_finder.rb
 - lib/vimamsa/file_history.rb
 - lib/vimamsa/file_manager.rb
+- lib/vimamsa/form_generator.rb
 - lib/vimamsa/gui.rb
 - lib/vimamsa/gui_image.rb
 - lib/vimamsa/gui_menu.rb
@@ -212,6 +213,7 @@ files:
 - lib/vimamsa/key_actions.rb
 - lib/vimamsa/key_binding_tree.rb
 - lib/vimamsa/key_bindings_vimlike.rb
+- lib/vimamsa/langservp.rb
 - lib/vimamsa/macro.rb
 - lib/vimamsa/main.rb
 - lib/vimamsa/rbvma.rb
@@ -245,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Vimamsa