ruby_rich 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bb2ebd116fd55abbe618cbd351ad1b73dab3a040d5df2f43011aff77a608bf
-  data.tar.gz: be41ae4ba9c0d4754c3eb9de3070d914e6dba23dd383f5fc81ee72c848f8e4a6
+  metadata.gz: fa1b6881cd40609ff69b7e2b4c766c5fa3551bf49cd5558ad79681d89abc4e1a
+  data.tar.gz: e596c29715037aca70508b3dc564b009bc20bfa8f56a6286fb173819f9b2750a
 SHA512:
-  metadata.gz: c71f39b536218b86f9ce58e15ab476d7927bc086be78ec46f36629e9d3007972f5b4c727a924fad3729666362ae3fb600445ff0acd265e58bac9d266097b4edf
-  data.tar.gz: 2424396618c67fdad4568d77917424377c70e0284572ceb8e2735a53ccf9d10d217f1273cbc337ffd9063b70c9cfe60b310deb34278b619232ef8302140d8dc4
+  metadata.gz: 425b8e8584af060a2e9eb1ffe7666e0f2ddcec84c4a6a8005ffaf0f44c976b3e9c4c121a839a7c2b617f26ccabac20db8ef93ec1b3bc163761bd538a689e8f93
+  data.tar.gz: f17b46fb04ef923a0803163b06be590f985187ac50a81e9d76a47329ce2503c353c98f7d90295a94a534ecefe201907d0e6aa2585764c8a76df99f2ce436bf62

data/lib/ruby_rich/agent_shell.rb

@@ -42,7 +42,7 @@ module RubyRich
       self
     end
 
-    def start(refresh_rate: 24, mouse: true, alt_screen: false)
+    def start(refresh_rate: 24, mouse: true, alt_screen: true)
       @state_mutex.synchronize { @state = :starting }
       Live.start(@layout, refresh_rate: refresh_rate, mouse: mouse, alt_screen: alt_screen, autowrap: false) do |live|
         @state_mutex.synchronize do

data/lib/ruby_rich/app_shell.rb

@@ -147,7 +147,7 @@ module RubyRich
       false
     end
 
-    def start(refresh_rate: 24, mouse: true, alt_screen: false)
+    def start(refresh_rate: 24, mouse: true, alt_screen: true)
       Live.start(@layout, refresh_rate: refresh_rate, mouse: mouse, alt_screen: alt_screen, autowrap: false) do |live|
         @live = live
         live.listening = true

data/lib/ruby_rich/composer.rb

@@ -73,6 +73,27 @@ module RubyRich
       @menu_open
     end
 
+    def native_cursor_position
+      return nil unless focused?
+
+      input_width = [inner_width - 2, 1].max
+      editor_row, editor_col = @editor.cursor_visual_position(width: input_width)
+      raw_row = [@attachments.length, 3].min + editor_row
+      raw_col = 2 + editor_col
+
+      raw_height = [@height.to_i, 1].max
+      raw_lines = []
+      raw_lines.concat(render_attachments)
+      raw_lines.concat(render_input_lines)
+      raw_lines.concat(render_menu_lines) if menu_open?
+
+      clipped_rows = [raw_lines.length - raw_height, 0].max
+      visible_row = raw_row - clipped_rows
+      return nil if visible_row.negative? || visible_row >= raw_height
+
+      [visible_row, raw_col]
+    end
+
     def wants_tab?
       focused? && (menu_open? || @editor.value.include?("/"))
     end
@@ -229,7 +250,7 @@ module RubyRich
       elsif !@editor.empty?
         @editor.clear
       else
-        blur
+        focus
       end
     end
 

data/lib/ruby_rich/focus_manager.rb

@@ -29,8 +29,8 @@ module RubyRich
         end
       end
 
-      root_layout.key(:mouse_down, priority) do |event_data, _live|
-        entry = entry_at(event_data[:x], event_data[:y])
+      root_layout.key(:mouse_target, priority) do |event_data, _live|
+        entry = entry_for_layout(event_data[:target_layout]) || entry_at(event_data[:x], event_data[:y])
         if entry
           focus(entry[:name])
           false
@@ -73,5 +73,16 @@ module RubyRich
     def entry_at(x, y)
       @entries.reverse.find { |entry| entry[:layout].contains?(x, y) }
     end
+
+    def entry_for_layout(layout)
+      current = layout
+      while current
+        entry = @entries.reverse.find { |item| item[:layout] == current }
+        return entry if entry
+
+        current = current.parent
+      end
+      nil
+    end
   end
 end

data/lib/ruby_rich/layout.rb

@@ -334,6 +334,7 @@ module RubyRich
 
       capture = root.instance_variable_get(:@mouse_capture)
       target = capture && [:mouse_drag, :mouse_up].include?(event_data[:name]) ? capture : (hit_test(event_data[:x], event_data[:y]) || self)
+      dispatch_mouse_target_event(event_data, target) if event_data[:name] == :mouse_down
       handled = target.bubble_mouse_event(event_data)
 
       root.instance_variable_set(:@mouse_capture, target) if event_data[:name] == :mouse_down && handled
@@ -341,6 +342,16 @@ module RubyRich
       handled
     end
 
+    def dispatch_mouse_target_event(event_data, target)
+      target.bubble_mouse_event(
+        event_data.merge(
+          name: :mouse_target,
+          target_layout: target,
+          original_name: event_data[:name]
+        )
+      )
+    end
+
     protected
 
     def bubble_mouse_event(event_data)

data/lib/ruby_rich/line_editor.rb

@@ -193,18 +193,33 @@ module RubyRich
     end
 
     def render_lines(width:, placeholder: nil, focused: true)
+      _ = focused
       content = value
       return [placeholder.to_s] if content.empty? && placeholder
 
       rendered = []
-      line_index, col = cursor_line_col
-      lines.each_with_index do |line, index|
-        marker_col = focused && index == line_index ? col : nil
-        rendered.concat(wrap_line_with_cursor(line, width, marker_col))
+      lines.each do |line|
+        rendered.concat(wrap_line_without_cursor(line, width))
       end
       rendered.empty? ? [""] : rendered
     end
 
+    def cursor_visual_position(width:)
+      line_index, cursor_col = cursor_line_col
+      row = 0
+
+      lines.each_with_index do |line, index|
+        if index == line_index
+          cursor_row, display_col = cursor_position_in_wrapped_line(line, width, cursor_col)
+          return [row + cursor_row, display_col]
+        end
+
+        row += wrap_line_without_cursor(line, width).length
+      end
+
+      [row, 0]
+    end
+
     private
 
     def invalidate_content_cache
@@ -332,30 +347,46 @@ module RubyRich
       nil
     end
 
-    def wrap_line_with_cursor(line, width, marker_col)
+    def wrap_line_without_cursor(line, width)
       width = [width, 1].max
       segments = []
       current = +""
       current_width = 0
-      chars = line.chars
-      chars.each_with_index do |char, index|
+
+      line.chars.each do |char|
         char_width = display_width(char)
-        if current_width + char_width > width
+        if current_width + char_width > width && !current.empty?
           segments << current
           current = +""
           current_width = 0
         end
-        current << (marker_col == index ? cursor_marker(char) : char)
+
+        current << char
         current_width += char_width
       end
 
-      current << cursor_marker(" ") if marker_col == chars.length
       segments << current
       segments
     end
 
-    def cursor_marker(char)
-      "#{AnsiCode.inverse}#{char}#{AnsiCode.reset}"
+    def cursor_position_in_wrapped_line(line, width, cursor_col)
+      width = [width, 1].max
+      row = 0
+      display_col = 0
+
+      line.chars.each_with_index do |char, index|
+        char_width = display_width(char)
+        if display_col + char_width > width && display_col.positive?
+          row += 1
+          display_col = 0
+        end
+
+        return [row, display_col] if index == cursor_col
+
+        display_col += char_width
+      end
+
+      [row, display_col]
     end
 
     def display_width(char)

data/lib/ruby_rich/live.rb

@@ -236,6 +236,25 @@ module RubyRich
       @last_terminal_size = [width, height]
       @layout.calculate_dimensions(width, height)
       @render.draw(@layout.render_to_buffer)
+      position_native_cursor
+    end
+
+    def position_native_cursor
+      composer_layout = @layout[:composer]
+      return unless composer_layout
+
+      frame = composer_layout.content
+      component = frame.instance_variable_get(:@component) if frame
+      return unless component&.respond_to?(:native_cursor_position)
+
+      cursor = component.native_cursor_position
+      return unless cursor
+
+      row, col = cursor
+      terminal_row = composer_layout.y_offset.to_i + 1 + row.to_i
+      terminal_col = composer_layout.x_offset.to_i + 1 + col.to_i
+      print "\e[#{terminal_row + 1};#{terminal_col + 1}H"
+      $stdout.flush
     end
 
     def wait_for_activity

data/lib/ruby_rich/terminal.rb

@@ -42,7 +42,7 @@ module RubyRich
     class << self
       attr_accessor :debug_input
 
-      def setup(mouse: false, hide_cursor: true, autowrap: true, alt_screen: false)
+      def setup(mouse: false, hide_cursor: false, autowrap: true, alt_screen: false)
         capture_state
         enable_virtual_terminal_on_windows
         system('stty -echo') unless windows?

data/lib/ruby_rich/version.rb

@@ -1,3 +1,3 @@
 module RubyRich
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/ruby_rich/viewport.rb

@@ -14,6 +14,7 @@ module RubyRich
       @height = 0
       @scroll_top = 0
       @dragging_scrollbar = false
+      @dragging_viewport = false
       @drag_start_y = nil
       @drag_start_scroll_top = nil
       @selecting = false
@@ -62,7 +63,6 @@ module RubyRich
 
     def handle_event(event_data, layout = nil)
       return false if keyboard_event?(event_data) && !@focused
-      return false if mouse_event?(event_data) && !@focused
 
       case event_data[:name]
       when :page_up
@@ -89,11 +89,11 @@ module RubyRich
       when :mouse_down
         return copy_selection if event_data[:button] == :right
 
-        start_scrollbar_drag(event_data, layout) || start_selection(event_data, layout)
+        start_scrollbar_drag(event_data, layout) || start_viewport_drag(event_data, layout)
       when :mouse_drag
-        drag_scrollbar(event_data, layout) || drag_selection(event_data, layout)
+        drag_scrollbar(event_data, layout) || drag_viewport(event_data, layout) || drag_selection(event_data, layout)
       when :mouse_up
-        stop_scrollbar_drag || stop_selection
+        stop_scrollbar_drag || stop_viewport_drag || stop_selection
       else
         false
       end
@@ -352,6 +352,18 @@ module RubyRich
       true
     end
 
+    def start_viewport_drag(event_data, layout)
+      return false unless layout
+      return false unless event_data[:button] == :left
+      return false if event_data[:x] >= layout.x_offset + content_width
+      return false unless event_data[:y].between?(layout.y_offset, layout.y_offset + @height - 1)
+
+      @dragging_viewport = true
+      @drag_start_y = event_data[:y]
+      @drag_start_scroll_top = @scroll_top
+      true
+    end
+
     def drag_scrollbar(event_data, layout)
       return false unless @dragging_scrollbar && layout
 
@@ -367,6 +379,14 @@ module RubyRich
       true
     end
 
+    def drag_viewport(event_data, layout)
+      return false unless @dragging_viewport && layout
+
+      delta_y = event_data[:y] - @drag_start_y
+      scroll_to(@drag_start_scroll_top - delta_y)
+      true
+    end
+
     def drag_selection(event_data, layout)
       return false unless @selecting && layout
 
@@ -382,6 +402,14 @@ module RubyRich
       was_dragging
     end
 
+    def stop_viewport_drag
+      was_dragging = @dragging_viewport
+      @dragging_viewport = false
+      @drag_start_y = nil
+      @drag_start_scroll_top = nil
+      was_dragging
+    end
+
     def stop_selection
       return false unless @selecting
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rich
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - zhuang biaowei