vimamsa 0.1.9 → 0.1.11

data/lib/vimamsa/gui_image.rb

@@ -1,4 +1,3 @@
-
 # Following this example:
 # https://gabmus.org/posts/create_an_auto-resizing_image_widget_with_gtk3_and_python/
 class ResizableImage < Gtk::DrawingArea
@@ -18,26 +17,33 @@ class ResizableImage < Gtk::DrawingArea
   def scale_image()
     pb = @pixbuf
     view = @view
-    imglimit = view.visible_rect.width - 10
+    if view.visible_rect.width > 0
+      imglimit = view.visible_rect.width - 50
+    else
+      imglimit = 500
+    end
 
     if @oldimg.width > imglimit or @oldimg.width < imglimit - 10
       nwidth = imglimit
       nwidth = pb.width if pb.width < imglimit
       nheight = (pb.height * (nwidth.to_f / pb.width)).to_i
+      # Ripl.start :binding => binding
+
       pb = pb.scale_simple(nwidth, nheight, GdkPixbuf::InterpType::HYPER)
     else
       pb = @oldimg
     end
     @draw_image = pb
     @oldimg = pb
-    self.set_size_request(pb.width, pb.height)
-
+    #TODO: Should be better way to compensate for the gutter
+    self.set_size_request(pb.width+@view.gutter_width, pb.height)
   end
 
   def do_draw(da, cr)
     # puts @fpath
-    cr.set_source_pixbuf(@draw_image, 0, 0)
+    # Ripl.start :binding => binding
+
+    cr.set_source_pixbuf(@draw_image, @view.gutter_width, 0)
     cr.paint
   end
 end
-

data/lib/vimamsa/gui_menu.rb

@@ -16,7 +16,6 @@ module Vimamsa
     end
 
     def add_menu_items()
-    
       add_to_menu "File.Example", { :label => "<span foreground='#888888'>Action, [mode] key binding</span>", :action => nil }
       add_to_menu "File.Save", { :label => "Save", :action => :buf_save }
       add_to_menu "File.Save as", { :label => "Save As...", :action => :buf_save_as }
@@ -40,14 +39,13 @@ module Vimamsa
       add_to_menu "Actions.FileHistoryFinder", { :label => "Search files in history", :action => :gui_file_history_finder }
 
       add_to_menu "Actions.experimental.Diff", { :label => "Show Diff of\nunsaved changes", :action => :diff_buffer }
-      
+
       add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
       add_to_menu "Actions.experimental.DisableDebug", { :label => "Disable debug", :action => :disable_debug }
       add_to_menu "Actions.experimental.ShowImages", { :label => "Show images ⟦img:path⟧", :action => :show_images }
-      
+
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
-      
 
       #TODO: :auto_indent_buffer
 
@@ -55,26 +53,19 @@ module Vimamsa
 
     end
 
-    def initialize(menubar)
-      # nfo["file"] = { :items => {}, :label => "File" }
-      # nfo["actions"] = { :items => {}, :label => "Actions" }
-      # nfo["help"] = { :items => {}, :label => "Help" }
-
+    def initialize(menubar, _app)
+      @app = _app
       @nfo = {}
 
       add_menu_items
 
-      # add_to_menu("help.extra.keybindings", { :label => "Show keybindings" })
-      # add_to_menu("help.extra.nfo.keybindings", { :label => "Show keybindings" })
-      # add_to_menu("help.keybindings", { :label => "Show keybindings <span foreground='#888888'  >C ? k</span>" }) #font='12' weight='ultrabold'
-
       for k, v in @nfo
         build_menu(v, menubar)
       end
     end
 
     def build_menu(nfo, parent)
-      menu = Gtk::Menu.new
+      menu = Gio::Menu.new
       if nfo[:action]
         kbd_str = ""
         for mode_str in ["C", "V"]
@@ -86,24 +77,38 @@ module Vimamsa
         end
 
         label_str = nfo[:label] + kbd_str
-        menuitem = Gtk::MenuItem.new(:label => label_str)
-        menuitem.children[0].set_markup(label_str)
-
-        menuitem.signal_connect("activate") do
+        actkey = nfo[:action].to_s
+        menuitem = Gio::MenuItem.new(label_str, "app.#{actkey}")
+        
+        # This worked in GTK3:
+        # But seems there is no way to access the Label object in GTK4
+        # menuitem.children[0].set_markup(label_str)
+
+        act = Gio::SimpleAction.new(actkey)
+        @app.add_action(act)
+        act.signal_connect "activate" do |_simple_action, _parameter|
           call_action(nfo[:action])
         end
       else
-        menuitem = Gtk::MenuItem.new(:label => nfo[:label])
-        menuitem.children[0].set_markup(nfo[:label])
+        menuitem = Gio::MenuItem.new(nfo[:label], nil)
       end
 
+      # Apparently requires Gtk 4.6 to work.
+      # According to instructions in: https://discourse.gnome.org/t/gtk4-and-pango-markup-in-menu-items/16082
+      # Boolean true here should work but doesn't yet in GTK 4.6. The string version does work.
+      menuitem.set_attribute_value("use-markup", "true")
+      # menuitem.set_attribute_value("use-markup", true)
+      # This might change in the future(?), but the string version still works in gtk-4.13.0 (gtk/gtkmenutrackeritem.c)
+
+
       if !nfo[:items].nil? and !nfo[:items].empty?
         for k2, item in nfo[:items]
           build_menu(item, menu)
         end
         menuitem.submenu = menu
       end
-      parent.append(menuitem)
+      o = parent.append_item(menuitem)
+
     end
   end #end class
 end

data/lib/vimamsa/gui_select_window.rb

@@ -1,4 +1,4 @@
-def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt={})
+def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt = {})
   $selup = SelectUpdateWindow.new(nil, item_list, jump_keys, select_callback, update_callback, opt)
   $selup.run
   # opt fields:
@@ -39,7 +39,7 @@ class SelectUpdateWindow
   end
 
   def initialize(main_window, item_list, jump_keys, select_callback, update_callback, opt = {})
-    @window = Gtk::Window.new(:toplevel)
+    @window = Gtk::Window.new()
     # @window.screen = main_window.screen
     @window.title = ""
     if !opt[:title].nil?
@@ -50,12 +50,23 @@ class SelectUpdateWindow
     @opt = opt
 
     debug item_list.inspect
-    @update_callback = method(update_callback)
-    @select_callback = method(select_callback)
+
+    if select_callback.class == Method
+      @select_callback = select_callback
+    else
+      @select_callback = method(select_callback)
+    end
+    if update_callback.class == Method
+      @update_callback = update_callback
+    else
+      @update_callback = method(update_callback)
+    end
     # debug @update_callback_m.call("").inspect
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.margin = 8
+    vbox.margin_bottom = 8
+    vbox.margin_top = 8
+
     @window.add(vbox)
 
     @entry = Gtk::SearchEntry.new
@@ -74,24 +85,31 @@ class SelectUpdateWindow
     # item_list = @update_callback.call("")
     update_item_list(item_list)
 
-    @window.signal_connect("key-press-event") do |_widget, event|
-      # debug "KEYPRESS 1"
-      @entry.handle_event(event)
-    end
+    # @window.signal_connect("key-press-event") do |_widget, event| #TODO:gtk4
+    # debug "KEYPRESS 1"
+    # @entry.handle_event(event)
+    # end
+
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
 
-    @entry.signal_connect("key_press_event") do |widget, event|
-      # debug "KEYPRESS 2"
-      if event.keyval == Gdk::Keyval::KEY_Down
+    @entry.add_controller(press)
+    # @window.add_controller(press)
+    press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      name = Gdk::Keyval.to_name(keyval)
+      uki = Gdk::Keyval.to_unicode(keyval)
+      keystr = uki.chr("UTF-8")
+      debug "keyval=#{keyval}"
+
+      if keyval == Gdk::Keyval::KEY_Down
         debug "DOWN"
         set_selected_row(@selected_row + 1)
-        # fixed = iter[COLUMN_FIXED]
-
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Up
+      elsif keyval == Gdk::Keyval::KEY_Up
         set_selected_row(@selected_row - 1)
         debug "UP"
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Return
+      elsif keyval == Gdk::Keyval::KEY_Return
         path = Gtk::TreePath.new(@selected_row.to_s)
         iter = @model.get_iter(path)
         ret = iter[1]
@@ -99,7 +117,7 @@ class SelectUpdateWindow
         @window.destroy
         # debug iter[1].inspect
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Escape
+      elsif keyval == Gdk::Keyval::KEY_Escape
         @window.destroy
         true
       else
@@ -131,11 +149,12 @@ class SelectUpdateWindow
 
     vbox.pack_start(container, :expand => false, :fill => false, :padding => 0)
     sw = Gtk::ScrolledWindow.new(nil, nil)
-    sw.shadow_type = :etched_in
+    # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)
-    vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
+    vbox.pack_end(sw, :expand => true, :fill => true, :padding => 0)
 
-    sw.add(treeview)
+    # sw.add(treeview) #TODO:gtk4
+    sw.set_child(treeview)
 
     if !opt[:columns].nil?
       for col in opt[:columns]
@@ -168,7 +187,7 @@ class SelectUpdateWindow
 
   def run
     if !@window.visible?
-      @window.show_all
+      @window.show
       # add_spinner
     else
       @window.destroy

data/lib/vimamsa/gui_sourceview.rb

@@ -1,80 +1,135 @@
-
-
 # class VSourceView < Gtk::TextView
 class VSourceView < GtkSource::View
-  attr_accessor :bufo 
+  attr_accessor :bufo
   # :highlight_matching_brackets
-  
+
   # def set_highlight_current_line(vbool)
   # end
-  
+
   # def set_show_line_numbers(vbool)
   # end
-  
+
   # def highlight_matching_brackets=(vbool)
   # end
-  
 
-  def initialize(title = nil,bufo=nil)
+  # def initialize(title = nil,bufo=nil)
+  def initialize(title, bufo)
     # super(:toplevel)
     @highlight_matching_brackets = true
+    @idle_func_running = false
     super()
     @bufo = bufo #object of Buffer class buffer.rb
     debug "vsource init"
     @last_keyval = nil
     @last_event = [nil, nil]
-    self.drag_dest_add_image_targets
-    self.drag_dest_add_uri_targets
-
-    signal_connect "button-press-event" do |_widget, event|
-      if event.button == Gdk::BUTTON_PRIMARY
-        # debug "Gdk::BUTTON_PRIMARY"
-        false
-      elsif event.button == Gdk::BUTTON_SECONDARY
-        # debug "Gdk::BUTTON_SECONDARY"
-        true
-      else
-        true
-      end
-    end
-
-    signal_connect("drag-data-received") do |widget, event, x, y, data, info, time|
-      puts "drag-data-received"
-      puts
-      if data.uris.size >= 1
-        imgpath = CGI.unescape(data.uris[0])
-        m = imgpath.match(/^file:\/\/(.*)/)
-        if m
-          fp = m[1]
-          handle_drag_and_drop(fp)
-        end
-      end
-      true
-    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
+    @removed_controllers = []
+    self.highlight_current_line = true
+
+    #    self.drag_dest_add_image_targets #TODO:gtk4
+    #    self.drag_dest_add_uri_targets #TODO:gtk4
+
+    #    signal_connect("drag-data-received") do |widget, event, x, y, data, info, time| #TODO:gtk4
+    # puts "drag-data-received"
+    # puts
+    # if data.uris.size >= 1
+    # imgpath = CGI.unescape(data.uris[0])
+    # m = imgpath.match(/^file:\/\/(.*)/)
+    # if m
+    # fp = m[1]
+    # handle_drag_and_drop(fp)
+    # end
+    # end
+    # true
+    # end
 
     signal_connect("move-cursor") do |widget, event|
+      debug("MOVE-CURSOR",2)
       $update_cursor = true
       false
     end
 
+    return
+
+    #TODO:gtk4
     signal_connect "button-release-event" do |widget, event|
-      $buffer.set_pos(buffer.cursor_position)
+      vma.buf.set_pos(buffer.cursor_position)
       false
     end
     @curpos_mark = nil
   end
 
-  def handle_key_event(event, sig)
+  def gutter_width()
+    winwidth = width
+    view_width = visible_rect.width
+    gutter_width = winwidth - view_width
+  end
+
+  def show_controllers
+    clist = self.observe_controllers
+    (0..(clist.n_items - 1)).each { |x|
+      ctr = clist.get_item(x)
+      pp ctr
+    }
+  end
+
+  def check_controllers
+    clist = self.observe_controllers
+    to_remove = []
+    (0..(clist.n_items - 1)).each { |x|
+      ctr = clist.get_item(x)
+      # Sometimes a GestureClick EventController appears from somewhere
+      # not initiated from this file.
+
+      # if ctr.class == Gtk::EventControllerKey or ctr.class == Gtk::GestureClick
+      if ctr != @click
+        # to_remove << ctr if ctr.class != Gtk::GestureDrag
+        to_remove << ctr 
+      end
+    }
+    if to_remove.size > 0
+      debug "Removing controllers:"
+      pp to_remove
+      to_remove.each { |x|
+        # To avoid GC. https://github.com/ruby-gnome/ruby-gnome/issues/15790
+        @removed_controllers << x
+        self.remove_controller(x)
+      }
+    end
+  end
+
+  def register_signals()
+
+    #TODO: Doesn't seem to catch "move-cursor" signal since upgrade to gtk4
+    # self.signal_connect("move-cursor") do |widget, event|
+    # $update_cursor = true
+    # false
+    # end
+
+    check_controllers
+    click = Gtk::GestureClick.new
+    click.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
+    self.add_controller(click)
+    # Detect mouse click
+    @click = click
+    click.signal_connect "pressed" do |gesture, n_press, x, y, z|
+      debug "SourceView, GestureClick x=#{x} y=#{y}"
+      pp visible_rect
+      winw = width
+      view_width = visible_rect.width
+      gutter_width = winw - view_width
+
+      i = get_iter_at_location((x - gutter_width).to_i, (y + visible_rect.y).to_i)
+      if !i.nil?
+        @bufo.set_pos(i.offset)
+      else
+        debug "iter nil 0000"
+      end
+      true
+    end
+  end
+
+  # def handle_key_event(event, sig)
+  def handle_key_event(keyval, keyname, sig)
     if $update_cursor
       curpos = buffer.cursor_position
       debug "MOVE CURSOR: #{curpos}"
@@ -84,13 +139,14 @@ class VSourceView < GtkSource::View
     debug $view.visible_rect.inspect
 
     debug "key event"
-    debug event
+    # debug event
 
-    key_name = event.string
-    if event.state.control_mask?
-      key_name = Gdk::Keyval.to_name(event.keyval)
-      # Gdk::Keyval.to_name()
-    end
+    # key_name = event.string
+    #TODO:??
+    # 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"
@@ -121,29 +177,48 @@ class VSourceView < GtkSource::View
 
     key_trans = {}
     key_trans["\e"] = "esc"
-    tk = keyval_trans[event.keyval]
-    key_name = tk if !tk.nil?
+    tk = keyval_trans[keyval]
+    keyname = 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 << "ctrl" if vma.kbd.modifiers[:ctrl]
+    key_str_parts << "alt" if vma.kbd.modifiers[:alt]
+    key_str_parts << "shift" if vma.kbd.modifiers[:shift]
+    key_str_parts << "meta" if vma.kbd.modifiers[:meta]
+    key_str_parts << "super" if vma.kbd.modifiers[:super]
+    key_str_parts << keyname
+
+    if key_str_parts[0] == key_str_parts[1]
+      # We don't want "ctrl-ctrl" or "alt-alt"
+      # TODO:There should be a better way to do this
+      key_str_parts.delete_at(0)
+    end
+
+    if key_str_parts[0] == "shift" and key_str_parts[1].class == String
+      #"shift-P" to just "P"
+      # key_str_parts.delete_at(0) if key_str_parts[1].match(/^[[:upper:]]$/)
+      key_str_parts.delete_at(0)
+    end
 
-    key_str_parts << key_name
     key_str = key_str_parts.join("-")
-    keynfo = { :key_str => key_str, :key_name => key_name, :keyval => event.keyval }
+    if key_str == "\u0000"
+      key_str = ""
+    end
+
+    keynfo = { :key_str => key_str, :key_name => keyname, :keyval => keyval }
     debug keynfo.inspect
     # $kbd.match_key_conf(key_str, nil, :key_press)
     # debug "key_str=#{key_str} key_"
 
     if key_str != "" # or prefixed_key_str != ""
-      if sig == :key_release_event and event.keyval == @last_keyval
+      if sig == :key_release and keyval == @last_keyval
         $kbd.match_key_conf(key_str + "!", nil, :key_release)
-        @last_event = [event, :key_release]
-      elsif sig == :key_press_event
+        @last_event = [keynfo, :key_release]
+      elsif sig == :key_press
         $kbd.match_key_conf(key_str, nil, :key_press)
-        @last_event = [event, key_str, :key_press]
+        @last_event = [keynfo, key_str, :key_press]
       end
-      @last_keyval = event.keyval #TODO: outside if?
+      @last_keyval = keyval #TODO: outside if?
     end
 
     handle_deltas
@@ -157,7 +232,9 @@ class VSourceView < GtkSource::View
     b = buffer
     iter = b.get_iter_at(:offset => i)
     iterxy = get_iter_location(iter)
-    winw = parent_window.width
+    # winw = parent_window.width #TODO:gtk4
+    winw = width #TODO
+
     view_width = visible_rect.width
     gutter_width = winw - view_width
 
@@ -167,7 +244,6 @@ class VSourceView < GtkSource::View
     # buffer_to_window_coords(Gtk::TextWindowType::TEXT, iterxy.x, iterxy.y).inspect
     # debug 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
@@ -190,7 +266,8 @@ class VSourceView < GtkSource::View
       end
     end
     if any_change
-      gui_set_cursor_pos(@bufo.id, @bufo.pos) #TODO: only when necessary
+      # gui_set_cursor_pos(@bufo.id, @bufo.pos) #TODO: only when necessary
+      self.set_cursor_pos(pos)
     end
 
     # sanity_check #TODO
@@ -236,7 +313,6 @@ class VSourceView < GtkSource::View
     # 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
@@ -251,6 +327,9 @@ class VSourceView < GtkSource::View
     # iter = buffer.get_iter_at(:offset => buffer.cursor_position)
     # iterxy = get_iter_location(iter)
 
+    # This is not the current buffer
+    return false if vma.gui.view != self
+
     sleep(0.01)
     # intr = iterxy.intersect(vr)
     if is_cursor_visible == false
@@ -265,8 +344,9 @@ class VSourceView < GtkSource::View
 
       scroll_to_iter(itr, within_margin, use_align, xalign, yalign)
 
-      # return true # Call this func again
+      return true # Call this func again
     else
+      @idle_func_running = false
       return false # Don't call this idle func again
     end
   end
@@ -282,9 +362,6 @@ class VSourceView < GtkSource::View
     if intr.nil?
       debug iterxy.inspect
       debug vr.inspect
-      # Ripl.start :binding => binding
-
-      # exit!
       return false
     else
       return true
@@ -292,7 +369,12 @@ class VSourceView < GtkSource::View
   end
 
   def ensure_cursor_visible
+    return #TODO:gtk4
+    debug "@idle_func_running=#{@idle_func_running}"
+    return if @idle_func_running
     if is_cursor_visible == false
+      @idle_func_running = true
+      debug "Starting idle func"
       Thread.new {
         sleep 0.01
         GLib::Idle.add(proc { cursor_visible_idle_func })
@@ -301,21 +383,33 @@ class VSourceView < GtkSource::View
   end
 
   def draw_cursor
-    if is_command_mode
+    mode = vma.kbd.get_mode
+    ctype = vma.kbd.get_cursor_type
+    # if is_command_mode
+    if ctype == :command
       itr = buffer.get_iter_at(:offset => @bufo.pos)
       itr2 = buffer.get_iter_at(:offset => @bufo.pos + 1)
-      $view.buffer.select_range(itr, itr2)
-    elsif @bufo.visual_mode?
+      buffer.select_range(itr, itr2)
+      # elsif @bufo.visual_mode?
+    elsif ctype == :visual
       debug "VISUAL MODE"
       (_start, _end) = @bufo.get_visual_mode_range2
       debug "#{_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
+      # Pango-CRITICAL **: pango_layout_get_cursor_pos: assertion 'index >= 0 && index <= layout->length' failed
+      buffer.select_range(itr, itr2)
+    elsif ctype == :insert
+      # Not sure why this is needed
       itr = buffer.get_iter_at(:offset => @bufo.pos)
-      $view.buffer.select_range(itr, itr)
+      buffer.select_range(itr, itr)
+
+      # Via trial and error, this combination is only thing that seems to work:
+      vma.gui.sw.child.toggle_cursor_visible
+      vma.gui.sw.child.cursor_visible = true
+
       debug "INSERT MODE"
+    else # TODO
     end
   end
 end