vimamsa 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3e4fa5b65895cba0a20cae08fad4f422008e786f4cd3ab405d39bf630f52db
-  data.tar.gz: 65b80bb0e663f64d241e51130aac9e13106c58ff20f698c095e5cf43b416ce41
+  metadata.gz: 4603a715f3fd3b549cc38a9744d93617b3a87ba3d95268f77ed2c98c2c04643d
+  data.tar.gz: 26e82f3a6564a78dcd7188a69037f97bae3fb53c43be807560facfab8e70dd51
 SHA512:
-  metadata.gz: 1c056fa3ed552a410b7a9f06ebfb0f2eb1444feba9a5810a520e8012a245b83bd156115566d2965095e8d7bacc184883e1bb16e724efa26c9abd0180c2640050
-  data.tar.gz: 9196b537289ac4a08b09c53dbbdf03ccd5bec1cb50d3de4b40a03352cf64c0fc0776d489803a421d00d72bad72fd96cefc45865f27d1df5f22b67b9906c4edf9
+  metadata.gz: 1f05aad90407dfdd0e9c310f08f5e79274a5901f714d63e353e7291f25c7f4dba3d402163f338cebf01fef4f8fae07522f85a58d62e76086661007f24b14a0bd
+  data.tar.gz: f503976439de2a311778b48a427354fc21a1b42434eb6a0bcfa5e3c00144fc3508abe029a058249c2b433e9f41f983679f44927ae095b1ec4a4eb36fafdbfe93

data/lib/vimamsa/buffer.rb

@@ -93,8 +93,9 @@ class Buffer < String
   end
 
   #Check if this buffer is attached to any windows
-  def is_active
+  def is_active?
     for k in vma.gui.windows.keys
+      next if vma.gui.windows[k][:sw].child.nil?
       return true if vma.gui.windows[k][:sw].child.bufo == self
     end
     return false
@@ -1373,7 +1374,6 @@ class Buffer < String
 
   def end_visual_mode()
     debug "end_visual_mode, #{vma.kbd.get_mode}, #{visual_mode?}", 2
-    vma.kbd.dump_state
     return if vma.kbd.get_mode != :visual
     if !visual_mode?
       debug "end_visual_mode, !visual_mode?"

data/lib/vimamsa/buffer_list.rb

@@ -199,7 +199,7 @@ class BufferList
 
   def get_last_non_active_buffer
     for bu in slist.reverse
-      return bu.id if !bu.is_active
+      return bu.id if !bu.is_active?
     end
     return nil
   end

data/lib/vimamsa/buffer_manager.rb

@@ -34,7 +34,7 @@ class BufferManager
   def close_selected
     idx = buf_of_current_line()
     r = @buf.current_line_range
-    Gui.hilight_range(@buf,r, color:"#666666ff")
+    Gui.hilight_range(@buf, r, color: "#666666ff")
     if idx.nil?
       message("buf already closed")
       return
@@ -68,21 +68,34 @@ class BufferManager
     s << "\n"
     i = 0
     jump_to_line = 0
-    for b in vma.buffers.list.sort_by { |x| x.list_str }
-      if b.id == vma.buf.id # current file
-        # s << "   "
-        jump_to_line = i
+    lastdir = nil
+    bh = {}
+    for b in vma.buffers.list
+      if !b.fname.nil?
+        bname = File.basename(b.fname)
+        dname = File.dirname(b.dirname)
+      else
+        bname = b.list_str
+        dname = "*"
       end
-      x = b.list_str
-      s << "#{x}\n"
-      @line_to_id[i] = b.id
+      bh[dname] ||= []
+      bh[dname] << {bname: bname, buf: b}
+    end
+    for k in bh.keys.sort
+      d = tilde_path(k)
+      s << "📂#{d}:\n" # Note: to close?: 📁 
       i += 1
+      for bnfo in bh[k].sort_by{|x|x[:bname]}
+        s << "╰─#{bnfo[:bname]}\n"
+        
+        @line_to_id[i] = bnfo[:buf].id
+        jump_to_line = i if bnfo[:buf].id == vma.buf.id # current file
+        i += 1
+      end
     end
-
-
-
+    
     if @buf.nil?
-      @buf = create_new_buffer(s,"bufmgr")
+      @buf = create_new_buffer(s, "bufmgr")
       @buf.default_mode = :buf_mgr
       @buf.module = self
       @buf.active_kbd_mode = :buf_mgr

data/lib/vimamsa/gui_menu.rb

@@ -49,6 +49,8 @@ module Vimamsa
       
       add_to_menu "Actions.debug.dumpkbd", { :label => "Dump kbd state", :action => :kbd_dump_state }
       
+      
+      add_to_menu "View.BufferManager", { :label => "Show open files", :action => :start_buf_manager }
       add_to_menu "View.TwoColumn", { :label => "Toggle two column mode", :action => :toggle_two_column }
       
 

data/lib/vimamsa/gui_sourceview.rb

@@ -148,7 +148,7 @@ class VSourceView < GtkSource::View
     @cnt_drag.signal_connect "drag-end" do |gesture, offsetx, offsety|
       debug "drag-end", 2
       if offsetx.abs < 5 and offsety.abs < 5
-        debug "Not enough drag",2
+        debug "Not enough drag", 2
         @range_start = nil
       elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
         # Can't transition from editor wide mode to buffer specific mode
@@ -523,6 +523,22 @@ class VSourceView < GtkSource::View
     end
   end
 
+  def set_cursor_color(ctype)
+    if @ctype != ctype
+      bg = $confh[:mode][ctype][:cursor][:background]
+      if bg.class == String
+        if !@cursor_prov.nil?
+          self.style_context.remove_provider(@cursor_prov)
+        end
+        prov = Gtk::CssProvider.new
+        prov.load(data: ".view text selection { background-color: #{bg}; color: #ffffff; }")
+        self.style_context.add_provider(prov)
+        @cursor_prov = prov
+      end
+      @ctype == ctype
+    end
+  end
+
   def draw_cursor
     # if @tt.nil?
     # @tt = buffer.create_tag("font_tag")
@@ -533,7 +549,8 @@ class VSourceView < GtkSource::View
     ctype = vma.kbd.get_cursor_type
     delete_cursorchar
     vma.gui.remove_overlay_cursor
-    if ctype == :command
+    if [:command, :replace, :browse].include?(ctype)
+      set_cursor_color(ctype)
       if @bufo[@bufo.pos] == "\n"
         # If we are at end of line, it's not possible to draw the cursor by making a selection. I tried to do this by drawing an overlay, but that generates issues. If moving the cursor causes the ScrolledWindow to be scrolled, these errors randomly appear and the whole view shows blank:
         # (ruby:21016): Gtk-WARNING **: 19:52:23.181: Trying to snapshot GtkSourceView 0x55a97524c8c0 without a current allocation
@@ -559,7 +576,9 @@ class VSourceView < GtkSource::View
         buffer.select_range(itr, itr2)
       end
       # elsif @bufo.visual_mode?
+
     elsif ctype == :visual
+      set_cursor_color(ctype)
       # debug "VISUAL MODE"
       (_start, _end) = @bufo.get_visual_mode_range2
       # debug "#{_start}, #{_end}"

data/lib/vimamsa/key_binding_tree.rb

@@ -112,11 +112,11 @@ class KeyBindingTree
 
   def to_previous_mode()
     debug "to_previous_mode",2
-    pp @default_mode_stack
+    debug @default_mode_stack
     if @default_mode_stack.size > 1
       @default_mode_stack.pop
     end
-    pp @default_mode_stack
+    debug @default_mode_stack
     __set_mode(@default_mode_stack[-1])
   end
 

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -4,13 +4,21 @@ vma.kbd.add_mode("V", :visual, :visual)
 vma.kbd.add_mode("M", :minibuffer) #TODO: needed?
 vma.kbd.add_mode("R", :readchar)
 vma.kbd.add_minor_mode("audio", :audio, :command)
-vma.kbd.add_mode("B", :browse, :command, scope: :editor)
-vma.kbd.add_mode("X", :replace, :command, name: "Replace")
+vma.kbd.add_mode("B", :browse, :browse, scope: :editor)
+vma.kbd.add_mode("X", :replace, :replace, name: "Replace")
 vma.kbd.set_default_mode(:command)
 vma.kbd.__set_mode(:command) #TODO:needed?
+# cnf.mode.command.cursor.background = "#fc6f03"
+cnf.mode.command.cursor.background = "#05c5a0"
+cnf.mode.default.cursor.background = "#03fcca"
+# cnf.mode.visual.cursor.background = "#10bd8e"
+# cnf.mode.visual.cursor.background = "#e95420"
+# cnf.mode.visual.cursor.background = "#cb3804"
+cnf.mode.visual.cursor.background = "#bc6040"
+cnf.mode.replace.cursor.background = "#fc0331"
+cnf.mode.browse.cursor.background = "#f803fc"
 # vma.kbd.show_state_trail
 
-
 bindkey ["VCB M", "B m"], :run_last_macro
 
 bindkey "VC s", :easy_jump
@@ -310,6 +318,9 @@ default_keys = {
 #  "I return" => 'buf.insert_new_line()',
 }
 
+bindkey "C , i p", "generate_password_to_buf(15)"
+
+
 default_keys.each { |key, value|
   bindkey(key, value)
 }

data/lib/vimamsa/util.rb

@@ -1,5 +1,34 @@
 require "open3"
 
+VOWELS = %w(a e i o u)
+CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x y z)
+
+def tilde_path(abspath)
+  userhome = File.expand_path("~/")
+  abspath.sub(/^#{Regexp.escape(userhome)}\//, "~/")
+end
+
+def generate_password(length)
+  password = ""
+  while password.size < length
+    i = password.size + 1
+    if i.even?
+      char = CONSONANTS.sample
+    else
+      char = VOWELS.sample
+    end
+    char.upcase! if rand < 0.2
+    password << char
+    password << (1..10).to_a.sample.to_s if rand < 0.25
+  end
+  password
+end
+
+def generate_password_to_buf(length)
+  passw = generate_password(length)
+  vma.buf.insert_txt(passw)
+end
+
 # Get all indexes for start of matching regexp
 def scan_indexes(txt, regex)
   # indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) + 1 }

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler