vimamsa 0.1.11 → 0.1.13

data/lib/vimamsa/gui.rb

@@ -90,33 +90,6 @@ def page_down
   return true
 end
 
-def paste_system_clipboard()
-
-  #TODO: Check if something useful in this old GTK3 code.
-  utf8_string = Gdk::Atom.intern("UTF8_STRING")
-
-  clipboard = Gtk::Clipboard.get_default($vmag.window.display)
-  received_text = ""
-
-  target_string = Gdk::Selection::TARGET_STRING
-  ti = clipboard.request_contents(target_string)
-
-  if clipboard.wait_is_text_available?
-    received_text = clipboard.wait_for_text
-  end
-
-  if received_text != "" and !received_text.nil?
-    max_clipboard_items = 100
-    if received_text != $clipboard[-1]
-      #TODO: HACK
-      $paste_lines = false
-    end
-    $clipboard << received_text
-    # debug $clipboard[-1]
-    $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
-  end
-  return received_text
-end
 
 def set_system_clipboard(arg)
   vma.gui.window.display.clipboard.set(arg)
@@ -178,38 +151,6 @@ def gui_set_cursor_pos(id, pos)
   vma.buf.view.set_cursor_pos(pos)
 end
 
-def gui_set_active_window(winid)
-  sw = vma.gui.sw
-  if winid == 2
-    sw = vma.gui.sw2
-  end
-
-  sw.set_child(view)
-  view.grab_focus
-
-  vma.gui.view = view
-  vma.gui.buf1 = view.buffer
-  $view = view
-  $vbuf = view.buffer
-end
-
-#TODO:delete?
-def gui_attach_buf_to_window(id, winid)
-  view = vma.gui.buffers[id]
-  sw = vma.gui.sw
-  if winid == 2
-    sw = vma.gui.sw2
-  end
-
-  sw.set_child(view)
-  view.grab_focus
-
-  vma.gui.view = view
-  vma.gui.buf1 = view.buffer
-  $view = view
-  $vbuf = view.buffer
-end
-
 def gui_set_current_buffer(id)
   vma.gui.set_current_buffer(id)
   return
@@ -328,72 +269,63 @@ class VMAgui
     @da.show
   end
 
-  def toggle_overlay
-    @show_overlay = @show_overlay ^ 1
-    if !@show_overlay
-      if @da != nil
-        @overlay.remove(@da)
-      end
-      return
-    else
-      @da = Gtk::Fixed.new
-      @overlay.add_overlay(@da)
-      @overlay.set_overlay_pass_through(@da, true)
+  def remove_overlay_cursor()
+    if !@cursorov.nil?
+      @overlay.remove_overlay(@cursorov)
+      @cursorov = nil
     end
+  end
 
-    (startpos, endpos) = get_visible_area
-    s = @view.buffer.text
-    wpos = s.enum_for(:scan, /\W(\w)/).map { Regexp.last_match.begin(0) + 1 }
-    wpos = wpos[0..130]
-
-    # vr =  @view.visible_rect
-    # # gtk_text_view_get_line_at_y
-    # # gtk_text_view_get_iter_at_position
-    # gtk_text_view_get_iter_at_position(vr.
-    # istart = @view.get_iter_at_position(vr.x,vr.y)
-    # istart = @view.get_iter_at_y(vr.y)
-    # startpos = @view.get_iter_at_position_raw(vr.x,vr.y)[1].offset
-    # endpos = @view.get_iter_at_position_raw(vr.x+vr.width,vr.y+vr.height)[1].offset
-    # debug "startpos,endpos:#{[startpos, endpos]}"
-
-    da = @da
-    if false
-      da.signal_connect "draw" do |widget, cr|
-        cr.save
-        for pos in wpos
-          (x, y) = @view.pos_to_coord(pos)
-
-          layout = da.create_pango_layout("XY")
-          desc = Pango::FontDescription.new("sans bold 11")
-          layout.font_description = desc
-
-          cr.move_to(x, y)
-          # cr.move_to(gutter_width, 300)
-          cr.pango_layout_path(layout)
-
-          cr.set_source_rgb(1.0, 0.0, 0.0)
-          cr.fill_preserve
-        end
-        cr.restore
-        false # = draw other
-        # true # = Don't draw others
+  def overlay_draw_cursor(textpos)
+    # return
+    remove_overlay_cursor
+    GLib::Idle.add(proc { self.overlay_draw_cursor_(textpos) })
+    # overlay_draw_cursor_(textpos)
+  end
+
+  # Run proc after animated scrolling has stopped (e.g. after page down)
+  def run_after_scrolling(p)
+    Thread.new {
+      # After running
+      #   view.signal_emit("move-cursor", Gtk::MovementStep.new(:PAGES)
+      # have to wait for animated page down scrolling to actually start
+      # Then have to wait determine that it has stopped if scrolling adjustment stops changing. There should be a better way to do this.
+      sleep 0.1
+      while Time.now - @last_adj_time < 0.1
+        sleep 0.1
       end
-    end
+      debug "SCROLLING ENDED", 2
+      run_as_idle p
+    }
+  end
 
-    for pos in wpos
-      (x, y) = @view.pos_to_coord(pos)
-      # da.put(Gtk::Label.new("AB"), x, y)
-      label = Gtk::Label.new("<span background='#00000088' foreground='#ff0000' weight='ultrabold'>AB</span>")
-      label.use_markup = true
-      da.put(label, x, y)
-    end
+  # To draw on empty lines and line-ends (where select_range doesn't work)
+  def overlay_draw_cursor_(textpos)
+    # Thread.new {
+    # GLib::Idle.add(proc { p.call; false })
+    # }
+
+    # while Time.now - @last_adj_time < 0.3
+    # return true
+    # end
 
-    # debug @view.pos_to_coord(300).inspect
+    remove_overlay_cursor
+    @cursorov = Gtk::Fixed.new
+    @overlay.add_overlay(@cursorov)
 
-    @da.show
+    (x, y) = @view.pos_to_coord(textpos)
+    pp [x, y]
+
+    # Trying to draw only background of character "I"
+    label = Gtk::Label.new("<span background='#00ffaaff' foreground='#00ffaaff' weight='ultrabold'>I</span>")
+    label.use_markup = true
+    @cursorov.put(label, x, y)
+    @cursorov.show
+    return false
   end
 
   def handle_deltas()
+    view.delete_cursor_char
     while d = buf.deltas.shift
       pos = d[0]
       op = d[1]
@@ -551,6 +483,7 @@ class VMAgui
     return true
   end
 
+  # Remove widget event controllers added by gtk, and add our own.
   def reset_controllers
     clist = @window.observe_controllers
     to_remove = []
@@ -629,23 +562,32 @@ class VMAgui
     end
   end
 
+  def idle_set_size()
+    # Need to wait for a while to window to be maximized to get correct @window.width
+    sleep 0.1
+    width = @window.width / 2
+    height = @window.height - 5
+    # Ripl.start :binding => binding
+    @window.unmaximize
+    @window.set_size_request(width, height)
+    return false
+  end
+
   def init_window
     @last_debug_idle = Time.now
     app = Gtk::Application.new("net.samiddhi.vimamsa.r#{rand(1000)}", :flags_none)
     @app = app
 
-    app.signal_connect "activate" do
+    Gtk::Settings.default.gtk_application_prefer_dark_theme = true
+    Gtk::Settings.default.gtk_theme_name = "Adwaita"
 
-      # @window = Gtk::Window.new(:toplevel)
-      # @window = Gtk::Window.new()
+    app.signal_connect "activate" do
       @window = Gtk::ApplicationWindow.new(app)
       @window.set_application(app)
 
-      #    sh = @window.screen.height #TODO:gtk4
-      #    sw = @window.screen.width #TODO:gtk4
-      # TODO:Maximise vertically
-      #    @window.set_default_size((sw * 0.45).to_i, sh - 20) #TODO:gtk4
-      @window.set_default_size(800, 600)
+      @window.maximize
+      # Need to let Gtk process after maximize
+      run_as_idle proc { idle_set_size }
 
       @window.title = "Multiple Views"
       @vpaned = Gtk::Paned.new(:vertical)
@@ -659,15 +601,22 @@ class VMAgui
 
       reset_controllers
 
-      # @window.signal_connect("key-pressed") { puts "Hello World!" }
-      # @window.signal_connect("clicked") { puts "Hello World!" }
-
-      # @menubar = Gtk::PopoverMenuBar.new #TODO:gtk4
-      #    @menubar.expand = false #TODO:gtk4
-
       @sw = Gtk::ScrolledWindow.new
       @sw.set_policy(:automatic, :automatic)
 
+
+      @last_adj_time = Time.now
+      @sw.vadjustment.signal_connect("value-changed") { |x|
+        # pp x.page_increment
+        # pp x.page_size
+        # pp x.step_increment
+        # pp x.upper
+        # pp x.value
+        # pp x
+        @last_adj_time = Time.now
+        # puts "@sw.vadjustment"
+      }
+
       # @sw.signal_connect("clicked") { puts "Hello World!" }
       # @sw.signal_connect("key-pressed") { puts "Hello World!" }
       @overlay = Gtk::Overlay.new
@@ -813,10 +762,10 @@ class VMAgui
     @vbox.remove(@overlay)
 
     # numbers: left, top, width, height
-    @pane.set_start_child(@overlay)
-    @pane.set_end_child(@overlay2)
+    @pane.set_start_child(@overlay2)
+    @pane.set_end_child(@overlay)
 
-    @vbox.attach(@pane, 0, 1, 2, 1)
+    @vbox.attach(@pane, 0, 2, 2, 1)
 
     @sw2.vexpand = true
     @sw2.hexpand = true
@@ -831,7 +780,7 @@ class VMAgui
       last = vma.buffers.get_last_visited_id
       set_buffer_to_window(last, 2)
     else
-      bf = create_new_buffer "\n\n"
+      bf = create_new_buffer "\n\n", "buff", false
       set_buffer_to_window(bf.id, 2)
     end
   end
@@ -848,8 +797,14 @@ class VMAgui
     else
       set_active_window(1)
     end
+  end
 
-    vma.buffers.set_current_buffer_by_id(@sw.child.bufo.id)
+  # activate that window which has the given view
+  def set_current_view(view)
+    w = @windows.find { |k, v| v[:sw].child == view }
+    if !w.nil?
+      set_active_window(w[0])
+    end
   end
 
   def set_active_window(id)
@@ -868,16 +823,26 @@ class VMAgui
     @sw = @windows[id][:sw]
     @overlay = @windows[id][:overlay]
 
+    vma.buffers.set_current_buffer_by_id(@sw.child.bufo.id)
+
     #TODO: set buf & view of active window??
 
   end
 
+  def current_view
+    return @sw.child
+  end
+
   def set_buffer_to_window(bufid, winid)
     view = @buffers[bufid]
     debug "vma.gui.set_buffer_to_window(#{bufid}), winid=#{winid}"
     buf1 = view.buffer
 
     @windows[winid][:sw].set_child(view)
+    idle_ensure_cursor_drawn
+
+    # @overlay = Gtk::Overlay.new
+    # @overlay.add_overlay(view)
 
     #TODO:???
     # @view = view
@@ -896,19 +861,26 @@ class VMAgui
     $view = view
     $vbuf = buf1
 
-    # If already open in another column
-
+    # Check if buffer is already open in another column
     if @two_column and @active_column == 2 and id == @sw1.child.bufo.id
       toggle_active_window
-    elsif @two_column and @active_column == 1 and id == @sw2.child.bufo.id
+    elsif @two_column && @active_column == 1 && !@sw2.child.nil? && id == @sw2.child.bufo.id
+      #TODO: should not need !@sw2.child.nil? here. If this happens then other column is empty.
       toggle_active_window
     else
       @sw.set_child(view)
     end
     view.grab_focus
-    # TODO:needed?
-    # view.set_cursor_visible(true)
-    # view.place_cursor_onscreen
-    # @sw.show
+
+    idle_ensure_cursor_drawn
+  end
+
+  def idle_ensure_cursor_drawn
+    run_as_idle proc { self.ensure_cursor_drawn }
+  end
+
+  def ensure_cursor_drawn
+    # view.place_cursor_onscreen #TODO: needed?
+    view.draw_cursor
   end
 end

data/lib/vimamsa/gui_menu.rb

@@ -43,6 +43,10 @@ module Vimamsa
       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 "View.TwoColumn", { :label => "Start two column mode", :action => :toggle_two_column }
+      
 
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }

data/lib/vimamsa/gui_select_window.rb

@@ -69,13 +69,19 @@ class SelectUpdateWindow
 
     @window.add(vbox)
 
+    if !opt[:desc].nil?
+      descl = Gtk::Label.new(opt[:desc])
+      set_margin_all(descl,15)
+      # vbox.append(descl, :expand => false, :fill => false, :padding => 0)
+      vbox.append(descl)
+    end
+
     @entry = Gtk::SearchEntry.new
     @entry.width_chars = 45
     container = Gtk::Box.new(:horizontal, 10)
     # container.halign = :start
     container.halign = :center
-    container.pack_start(@entry,
-                         :expand => false, :fill => false, :padding => 0)
+    container.append(@entry)
 
     # create tree view
     @model = Gtk::ListStore.new(String, String)
@@ -135,11 +141,6 @@ class SelectUpdateWindow
     @entry.signal_connect("changed") { debug "[changed] " }
     @entry.signal_connect("next-match") { debug "[next-match] " }
 
-    if !opt[:desc].nil?
-      descl = Gtk::Label.new(opt[:desc])
-      vbox.pack_start(descl, :expand => false, :fill => false, :padding => 0)
-    end
-
     # label = Gtk::Label.new(<<-EOF)
     # Search:
     # EOF
@@ -147,7 +148,7 @@ class SelectUpdateWindow
     # label = Gtk::Label.new("Input:")
     # vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-    vbox.pack_start(container, :expand => false, :fill => false, :padding => 0)
+    vbox.append(container)
     sw = Gtk::ScrolledWindow.new(nil, nil)
     # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)