vimamsa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e99c11af9802815672e7b3cc220668fe9a0d6837760ff1cd5ca8b029ca04bc
-  data.tar.gz: b61f32cdaebc0cce856e832567787da9a9d041ed46000463d226959aee492373
+  metadata.gz: 4f68b029a6b5f374740c9afa2cb7c4ac628db4c4b9295b7e64db8294dac89659
+  data.tar.gz: c7c72c69ec7cd513e976caff3b0b1f2e619d890d8d84e616fcd747e4ab1193be
 SHA512:
-  metadata.gz: d26574ac402e3f2de520d84db614c26a8760bbbae75fa422dd44d0af2145df2ffcfea8fd8c5f8d45735c0367f36ab85d895660822d7f471a6ba7db2bd5e3513a
-  data.tar.gz: 3e95a3a334284bf3143e67283354c064e23afe2b3332cb5c2f4fc98fe4f80adeee2c4ee39b3759f95b72ff543269e8705d54162e8b04acc5448e41e522360600
+  metadata.gz: 892b4011a44310ad05becbf108fce73d4cdda3a25d6241435b03519ad0dd264daa856502956f02f47386bce251aef3e0296cc682fc35b01fefa375fbffd5ee4a
+  data.tar.gz: 25c97fde0e225c7cb273bc0fa97d0db4d74376ea2ddca2baea8823dbb1e01d31334fabbaa8e319cc37d40eca23d37b3d64f2cbbbdcbbce88f7d30435cfb44a6f

data/exe/vimamsa

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
-require 'ripl/multi_line'
+require "ripl/multi_line"
+require "tempfile"
 # Ripl.config[:multi_line_prompt] = ' > '
 require "pathname"
 
@@ -7,28 +8,33 @@ ENV["GTK_THEME"] = "Adwaita:dark"
 
 selfpath = __FILE__
 selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
-scriptdir = File.expand_path(File.dirname(selfpath)+"/..")
-puts scriptdir
-# Ripl.start :binding => binding
-
-# binpath = "#{scriptdir}/vimamsa"
-# argexp = [binpath]
-
-# for arg in ARGV
-  # puts arg
-  # argexp << Pathname(arg).expand_path.to_s
-# end
-
-Dir.chdir(scriptdir)
-# exec(*argexp)
-
-$LOAD_PATH.unshift(File.expand_path("lib")) 
-$LOAD_PATH.unshift(File.expand_path("ext")) 
+scriptdir = File.expand_path(File.dirname(selfpath) + "/..")
+
+
+# If process is already running, open the parameter file in the running process and exit.
+listen_dir = File.expand_path("~/.vimamsa/listen")
+if File.exist?(listen_dir) and !ARGV[0].nil?
+  tmpf = Tempfile.new("vmarun", listen_dir)
+  fp = tmpf.path
+  tmpf.write(ARGV[0])
+  tmpf.close
+  tstart = Time.new
+  timeout = false
+  while File.exist?(fp)
+    sleep 0.001
+    if Time.new - tstart > 0.5
+      timeout = true
+      break
+    end
+  end
+  exit(0) if !timeout
+end
+
+$LOAD_PATH.unshift(File.expand_path("lib"))
+$LOAD_PATH.unshift(File.expand_path("ext"))
 
 require "vimamsa"
-# Ilib:ext 
+# Ilib:ext
 # r rbvma -e "puts VMA.new.run"
 $vmag = VMAg.new()
 $vmag.run
-
-

data/ext/vmaext/vmaext.c

@@ -3,11 +3,8 @@
 #include "ruby/ruby.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
-#warning "C Preprocessor got here!"
-
 typedef struct node {
 int i;
 void * next;

data/lib/vimamsa.rb

@@ -1,42 +1,12 @@
 require "vimamsa/version"
 require "vmaext"
 
-
-# require "vimamsa/constants"
-# require "vimamsa/debug"
-# require "vimamsa/actions"
-# require "vimamsa/key_binding_tree"
-# require "vimamsa/default_key_bindings"
-
-# require "vimamsa/ack"
-# require "vimamsa/buffer"
-# require "vimamsa/buffer_list"
-
-
-# require "vimamsa/easy_jump"
-# require "vimamsa/editor"
-# require "vimamsa/encrypt"
-# require "vimamsa/file_finder"
-# require "vimamsa/file_history"
-# require "vimamsa/file_manager"
-# require "vimamsa/hook"
-# require "vimamsa/hyper_plain_text"
-# require "vimamsa/macro"
-# require "vimamsa/rbvma"
-# require "vimamsa/search"
-# require "vimamsa/search_replace"
-# require "vimamsa/text_transforms"
-# require "vimamsa/util"
-# # require "version"
-
-# require "vimamsa/main"
-
 require "vimamsa/rbvma"
 
 module Vimamsa
   # Your code goes here...
   def self.test
     puts "Vimamsa test"
-    puts srn_dst("foobar","baz")
+    puts srn_dst("foobar", "baz")
   end
 end

data/lib/vimamsa/buffer.rb

@@ -15,7 +15,7 @@ class Buffer < String
 
   attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang
   attr_writer :call_func, :update_highlight
-  attr_accessor :qt_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :qt_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode
+  attr_accessor :qt_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :qt_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
 
   @@num_buffers = 0
 
@@ -29,7 +29,6 @@ class Buffer < String
     qt_create_buffer(@id)
     puts "NEW BUFFER fn=#{fname} ID:#{@id}"
 
-    #
     @module = nil
 
     @crypt = nil
@@ -47,7 +46,21 @@ class Buffer < String
     @hl_queue = []
     @line_action_handler = nil
 
+    @dirname = nil
+    @title = "*buf-#{@id}*"
+    @subtitle = ""
+
+    if @fname
+      @title = File.basename(@fname)
+      @dirname = File.dirname(@fname)
+      userhome = File.expand_path("~")
+      @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+    end
+
     t1 = Time.now
+    qt_set_current_buffer(@id)
+    gui_set_window_title(@title, @subtitle)
+
     set_content(str)
     debug "init time:#{Time.now - t1}"
 
@@ -63,7 +76,7 @@ class Buffer < String
     else
       $kbd.set_mode_to_default
     end
-    qt_set_current_buffer(@id)
+    # qt_set_current_buffer(@id)
   end
 
   def detect_file_language
@@ -73,6 +86,20 @@ class Buffer < String
     @lang = "ruby" if @fname.match(/\.(rb)$/)
     @lang = "hyperplaintext" if @fname.match(/\.(txt)$/)
     @lang = "php" if @fname.match(/\.(php)$/)
+
+    lm = GtkSource::LanguageManager.new
+
+    lm.set_search_path(lm.search_path << ppath("lang/"))
+    lang = lm.guess_language(@fname)
+    # lang.get_metadata("line-comment-start")
+    # lang.get_metadata("block-comment-start")
+    # lang.get_metadata("block-comment-end")
+    @lang_nfo = lang
+    if !lang.nil? and !lang.id.nil?
+      puts "Guessed LANG: #{lang.id}"
+      @lang = lang.id
+    end
+
     if @lang
       gui_set_file_lang(@id, @lang)
     end
@@ -134,21 +161,7 @@ class Buffer < String
   end
 
   def get_file_type()
-    # We cant detect syntax if no filename
-    if !@fname
-      @syntax_detect_failed = true
-      return ""
-    end
-    if @ftype == nil
-      @ftype = VER::Syntax::Detector.detect(@fname)
-      if @ftype == nil
-        @syntax_detect_failed = true
-      else
-        @syntax_detect_failed = false
-      end
-    end
-    debug "ftype=#{@ftype.inspect}"
-    return @ftype
+    return @lang
   end
 
   def revert()
@@ -488,16 +501,26 @@ class Buffer < String
   end
 
   def get_com_str()
-    return nil if @syntax_detect_failed
+    # return nil if @syntax_detect_failed
 
     com_str = nil
-    if get_file_type() == "C" or get_file_type() == "Javascript"
-      com_str = "//"
-    elsif get_file_type() == "Ruby"
-      com_str = "#"
-    else
-      com_str = "//"
+    # if get_file_type() == "c" or get_file_type() == "java"
+    # com_str = "//"
+    # elsif get_file_type() == "ruby"
+    # com_str = "#"
+    # else
+    # com_str = "//"
+    # end
+
+    if !@lang_nfo.nil?
+      com_str = @lang_nfo.get_metadata("line-comment-start")
     end
+
+    # lang.get_metadata("block-comment-start")
+    # lang.get_metadata("block-comment-end")
+
+    com_str = "//" if com_str.nil?
+
     return com_str
   end
 
@@ -1262,6 +1285,7 @@ class Buffer < String
   end
 
   def jump_to_next_instance_of_char(char, direction = FORWARD)
+
     #return if at_end_of_line?
     if direction == FORWARD
       position_of_next_char = self.index(char, @pos + 1)
@@ -1618,12 +1642,7 @@ class Buffer < String
     # TODO:?
   end
 
-  def save()
-    if !@fname
-      save_as()
-      return
-    end
-    message("Saving file #{@fname}")
+  def write_contents_to_file(fpath)
     if @crypt != nil
       mode = "wb+"
       contents = "VMACRYPT001" + @crypt.encrypt(self.to_s)
@@ -1633,7 +1652,7 @@ class Buffer < String
     end
 
     Thread.new {
-      File.open(@fname, mode) do |io|
+      File.open(fpath, mode) do |io|
         #io.set_encoding(self.encoding)
 
         begin
@@ -1653,6 +1672,15 @@ class Buffer < String
     }
   end
 
+  def save()
+    if !@fname
+      save_as()
+      return
+    end
+    message("Saving file #{@fname}")
+    write_contents_to_file(@fname)
+  end
+
   # Indents whole buffer using external program
   def indent()
     file = Tempfile.new("out")
@@ -1665,7 +1693,7 @@ class Buffer < String
 
     message("Auto format #{@fname}")
 
-    if get_file_type() == "C" or get_file_type() == "C++"
+    if ["chdr", "c", "cpp"].include?(get_file_type())
 
       #C/C++/Java/JavaScript/Objective-C/Protobuf code
       system("clang-format -style='{BasedOnStyle: LLVM, ColumnLimit: 100,  SortIncludes: false}' #{file.path} > #{infile.path}")
@@ -1675,7 +1703,7 @@ class Buffer < String
       debug cmd
       system(cmd)
       bufc = IO.read(infile.path)
-    elsif get_file_type() == "Ruby"
+    elsif get_file_type() == "ruby"
       cmd = "rufo #{file.path}"
       debug cmd
       system(cmd)
@@ -1700,13 +1728,14 @@ class Buffer < String
     savepath = "#{spath}/#{spfx}_#{datetime}"
     if is_path_writable(savepath)
       debug "BACKUP BUFFER TO: #{savepath}"
-      IO.write(savepath, self.to_s) if @crypt == nil #TODO: For encrypted
+      write_contents_to_file(savepath)
     else
       message("PATH NOT WRITABLE: #{savepath}")
     end
   end
 end
 
+#TODO
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
     IO.write(savepath, $buffer.to_s)

data/lib/vimamsa/buffer_list.rb

@@ -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_window_title($buffer.title,$buffer.subtitle)   
 
     # hpt_scan_images() if $debug # experimental
   end

data/lib/vimamsa/default_key_bindings.rb

@@ -289,6 +289,9 @@ default_keys = {
   #    'C '=> 'buf.jump_word(BACKWARD,END)',#TODO
   "VC f <char>" => "buf.jump_to_next_instance_of_char(<char>)",
   "VC F <char>" => "buf.jump_to_next_instance_of_char(<char>,BACKWARD)",
+  "VC f space" => "buf.jump_to_next_instance_of_char(' ')",
+  "VC F space" => "buf.jump_to_next_instance_of_char(' ',BACKWARD)",
+ 
   "VC /[1-9]/" => "set_next_command_count(<char>)",
   #    'VC number=/[0-9]/+ g'=> 'jump_to_line(<number>)',
   #    'VC X=/[0-9]/+ * Y=/[0-9]/+ '=> 'x_times_y(<X>,<Y>)',
@@ -435,7 +438,7 @@ default_keys = {
   "I alt-f" => "buf.jump_word(FORWARD,WORD_START)",
   "I alt-b" => "buf.jump_word(BACKWARD,WORD_START)",
 
-  "I tab" => 'buf.insert_txt("  ")',
+  "I tab" => 'buf.insert_txt("	")',
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
 }

data/lib/vimamsa/editor.rb

@@ -39,6 +39,24 @@ class Editor
     @_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
     # $highlight = {}
 
@@ -76,6 +94,13 @@ class Editor
 
     dot_dir = File.expand_path("~/.vimamsa")
     Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
+    listen_dir = File.expand_path("~/.vimamsa/listen")
+    Dir.mkdir(listen_dir) unless File.exist?(dot_dir)
+    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
@@ -231,9 +256,7 @@ class Editor
 end
 
 def _quit()
-  # Shut down the Qt thread before the ruby thread
   vma.shutdown
-  qt_quit
   exit
 end
 
@@ -432,7 +455,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?
+  # qt_set_current_buffer(buffer.id) #TODO: remove?
   $buffers << buffer
   return buffer
 end
@@ -493,7 +516,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)

data/lib/vimamsa/rbvma.rb

@@ -7,6 +7,7 @@ require "pathname"
 require "date"
 require "ripl/multi_line"
 require "json"
+require "listen"
 
 puts "INIT rbvma"
 
@@ -326,9 +327,9 @@ end
 def qt_select_window_close(arg = nil)
 end
 
-def set_window_title(str)
-  unimplemented
-end
+# def set_window_title(str)
+  # unimplemented
+# end
 
 def render_text(tmpbuf, pos, selection_start, reset)
   unimplemented
@@ -371,12 +372,16 @@ def qt_set_current_buffer(id)
   # itr = view.buffer.get_iter_at(:offset => 0)
   # view.buffer.place_cursor(itr)
 
-  wtitle = ""
-  wtitle = buf.fname if !buf.fname.nil?
-  $vmag.window.title = wtitle
+  # wtitle = ""
+  # wtitle = buf.fname if !buf.fname.nil?
   $vmag.sw.show_all
 end
 
+def gui_set_window_title(wtitle,subtitle="")
+  $vmag.window.title = wtitle
+  $vmag.window.titlebar.subtitle = subtitle
+end
+
 def unimplemented
   puts "unimplemented"
 end
@@ -469,6 +474,18 @@ class VSourceView < GtkSource::View
     @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
@@ -943,14 +960,15 @@ class VMAg
   end
 
   def init_header_bar()
-    # @window = Gtk::Window.new(:toplevel)
-    # @window.screen = main_window.screen
-    # @window.set_default_size(600, 400)
 
     header = Gtk::HeaderBar.new
+    @header = header
     header.show_close_button = true
-    header.title = "Welcome to Facebook - Log in, sign up or learn more"
-    header.has_subtitle = false
+    header.title = ""
+    header.has_subtitle = true
+    header.subtitle = ""
+    # Ripl.start :binding => binding
+
 
     # icon = Gio::ThemedIcon.new("mail-send-receive-symbolic")
     # icon = Gio::ThemedIcon.new("document-open-symbolic")
@@ -958,17 +976,43 @@ class VMAg
 
     #edit-redo edit-paste edit-find-replace edit-undo edit-find edit-cut edit-copy
     #document-open document-save document-save-as document-properties document-new
+    # document-revert-symbolic
+    #
+    
+    #TODO:
+    # button = Gtk::Button.new
+    # icon = Gio::ThemedIcon.new("open-menu-symbolic")
+    # image = Gtk::Image.new(:icon => icon, :size => :button)
+    # button.add(image)
+    # header.pack_end(button)
+
     button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("open-menu-symbolic")
+    icon = Gio::ThemedIcon.new("document-open-symbolic")
     image = Gtk::Image.new(:icon => icon, :size => :button)
     button.add(image)
     header.pack_end(button)
 
+    button.signal_connect "clicked" do |_widget|
+      open_file_dialog
+    end
+
+    button = Gtk::Button.new
+    icon = Gio::ThemedIcon.new("document-save-symbolic")
+    image = Gtk::Image.new(:icon => icon, :size => :button)
+    button.add(image)
+    header.pack_end(button)
+    button.signal_connect "clicked" do |_widget|
+      buf.save
+    end
+
     button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("document-revert-symbolic")
+    icon = Gio::ThemedIcon.new("document-new-symbolic")
     image = Gtk::Image.new(:icon => icon, :size => :button)
     button.add(image)
     header.pack_end(button)
+    button.signal_connect "clicked" do |_widget|
+      create_new_file
+    end
 
     box = Gtk::Box.new(:horizontal, 0)
     box.style_context.add_class("linked")
@@ -977,11 +1021,26 @@ class VMAg
     image = Gtk::Image.new(:icon_name => "pan-start-symbolic", :size => :button)
     button.add(image)
     box.add(button)
+    button.signal_connect "clicked" do |_widget|
+      history_switch_backwards
+    end
 
     button = Gtk::Button.new
     image = Gtk::Image.new(:icon_name => "pan-end-symbolic", :size => :button)
     button.add(image)
     box.add(button)
+    button.signal_connect "clicked" do |_widget|
+      history_switch_forwards
+    end
+
+    button = Gtk::Button.new
+    icon = Gio::ThemedIcon.new("window-close-symbolic")
+    image = Gtk::Image.new(:icon => icon, :size => :button)
+    button.add(image)
+    box.add(button)
+    button.signal_connect "clicked" do |_widget|
+      bufs.close_current_buffer
+    end
 
     header.pack_start(box)
     @window.titlebar = header

data/lib/vimamsa/util.rb

@@ -43,7 +43,7 @@ def read_file(text, path)
 
   #TODO: Should put these as option:
   content.gsub!(/\r\n/, "\n")
-  content.gsub!(/\t/, "    ")
+  # content.gsub!(/\t/, "    ")
   content.gsub!(/\b/, "")
 
   #    content = filter_buffer(content)

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/vimamsa.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   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.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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby
   and GTK.
 email: