reline 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1009c9156a8c15c1f3c64a3cb89a0d6a1acef037185bfb76c24ed9df7e49cb2c
-  data.tar.gz: 983ad1d570617a47d732402485a79eba8bd1acc6f3555f117ca6822cee52030d
+  metadata.gz: 8198104fe3ad27c73acaaffc9c8b1c8b9a5c50069a26a71cd940dd2b5dc13afc
+  data.tar.gz: 171ff8cdf2ae4aebaf4cfb6cea131e2d90e5eb56a2c09dbe19acfa8765522ffc
 SHA512:
-  metadata.gz: 424c026623c896ccd59fed73b5f61e7bb067dfdc8fe34a13bdb317895fb512eb666b25c76439e940915307e658e85dbbfcb8339ecfae5c5b72fa9239d1599778
-  data.tar.gz: 93077ced9c8009d5c2f7f59eb013f8134394347c57660e7958244a2adfe60b2a09463ac2062d9ce31e5d75974b19665f7e800f2078bf9b461dfbada76c3e572e
+  metadata.gz: e3411f0086a0445d2d805fc46528a86b947c58b8e61a664dc08b437596702ef1f360cd7e85a1dab64bf159f6f39691b9d5110f951bd5376f4fce0439e9557532
+  data.tar.gz: 968ac4a376ba350590fd37d05525a5a2e5e26c44e159b5fd9b0c7400e260850e91088357c007651373d44b7b7d37c699852014d07258428be86081581baf0229

data/lib/reline/ansi.rb

@@ -150,7 +150,7 @@ class Reline::ANSI
     until c = @@input.raw(intr: true) { @@input.wait_readable(0.1) && @@input.getbyte }
       Reline.core.line_editor.resize
     end
-    (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c
+    (c == 0x16 && @@input.raw(min: 0, time: 0, &:getbyte)) || c
   rescue Errno::EIO
     # Maybe the I/O has been closed.
     nil

data/lib/reline/config.rb

@@ -45,6 +45,8 @@ class Reline::Config
     attr_accessor v
   end
 
+  attr_accessor :autocompletion
+
   def initialize
     @additional_key_bindings = {} # from inputrc
     @additional_key_bindings[:emacs] = {}
@@ -55,6 +57,7 @@ class Reline::Config
     @if_stack = nil
     @editing_mode_label = :emacs
     @keymap_label = :emacs
+    @keymap_prefix = []
     @key_actors = {}
     @key_actors[:emacs] = Reline::KeyActor::Emacs.new
     @key_actors[:vi_insert] = Reline::KeyActor::ViInsert.new
@@ -93,14 +96,6 @@ class Reline::Config
     (val.respond_to?(:any?) ? val : [val]).any?(@editing_mode_label)
   end
 
-  def autocompletion=(val)
-    @autocompletion = val
-  end
-
-  def autocompletion
-    @autocompletion
-  end
-
   def keymap
     @key_actors[@keymap_label]
   end
@@ -221,7 +216,7 @@ class Reline::Config
         key, func_name = $1, $2
         keystroke, func = bind_key(key, func_name)
         next unless keystroke
-        @additional_key_bindings[@keymap_label][keystroke] = func
+        @additional_key_bindings[@keymap_label][@keymap_prefix + keystroke] = func
       end
     end
     unless @if_stack.empty?
@@ -292,18 +287,29 @@ class Reline::Config
       when 'emacs'
         @editing_mode_label = :emacs
         @keymap_label = :emacs
+        @keymap_prefix = []
       when 'vi'
         @editing_mode_label = :vi_insert
         @keymap_label = :vi_insert
+        @keymap_prefix = []
       end
     when 'keymap'
       case value
-      when 'emacs', 'emacs-standard', 'emacs-meta', 'emacs-ctlx'
+      when 'emacs', 'emacs-standard'
+        @keymap_label = :emacs
+        @keymap_prefix = []
+      when 'emacs-ctlx'
+        @keymap_label = :emacs
+        @keymap_prefix = [?\C-x.ord]
+      when 'emacs-meta'
         @keymap_label = :emacs
+        @keymap_prefix = [?\e.ord]
       when 'vi', 'vi-move', 'vi-command'
         @keymap_label = :vi_command
+        @keymap_prefix = []
       when 'vi-insert'
         @keymap_label = :vi_insert
+        @keymap_prefix = []
       end
     when 'keyseq-timeout'
       @keyseq_timeout = value.to_i

data/lib/reline/general_io.rb

@@ -57,6 +57,12 @@ class Reline::GeneralIO
     Reline::CursorPos.new(1, 1)
   end
 
+  def self.hide_cursor
+  end
+
+  def self.show_cursor
+  end
+
   def self.move_cursor_column(val)
   end
 

data/lib/reline/line_editor.rb

@@ -466,15 +466,17 @@ class Reline::LineEditor
     new_highest_in_this = calculate_height_by_width(prompt_width + calculate_width(@line.nil? ? '' : @line))
     rendered = false
     if @add_newline_to_end_of_buffer
+      clear_dialog_with_content
       rerender_added_newline(prompt, prompt_width)
       @add_newline_to_end_of_buffer = false
     else
       if @just_cursor_moving and not @rerender_all
+        clear_dialog_with_content
         rendered = just_move_cursor
-        render_dialog((prompt_width + @cursor) % @screen_size.last)
         @just_cursor_moving = false
         return
       elsif @previous_line_index or new_highest_in_this != @highest_in_this
+        clear_dialog_with_content
         rerender_changed_current_line
         @previous_line_index = nil
         rendered = true
@@ -653,7 +655,10 @@ class Reline::LineEditor
   end
 
   private def padding_space_with_escape_sequences(str, width)
-    str + (' ' * (width - calculate_width(str, true)))
+    padding_width = width - calculate_width(str, true)
+    # padding_width should be only positive value. But macOS and Alacritty returns negative value.
+    padding_width = 0 if padding_width < 0
+    str + (' ' * padding_width)
   end
 
   private def render_each_dialog(dialog, cursor_column)
@@ -741,24 +746,21 @@ class Reline::LineEditor
     Reline::IOGate.move_cursor_column(dialog.column)
     dialog.contents.each_with_index do |item, i|
       if i == pointer
-        bg_color = '45'
+        fg_color = dialog_render_info.pointer_fg_color
+        bg_color = dialog_render_info.pointer_bg_color
       else
-        if dialog_render_info.bg_color
-          bg_color = dialog_render_info.bg_color
-        else
-          bg_color = '46'
-        end
+        fg_color = dialog_render_info.fg_color
+        bg_color = dialog_render_info.bg_color
       end
       str_width = dialog.width - (dialog.scrollbar_pos.nil? ? 0 : @block_elem_width)
       str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
-      @output.write "\e[#{bg_color}m#{str}"
+      @output.write "\e[#{bg_color}m\e[#{fg_color}m#{str}"
       if dialog.scrollbar_pos and (dialog.scrollbar_pos != old_dialog.scrollbar_pos or dialog.column != old_dialog.column)
         @output.write "\e[37m"
         if dialog.scrollbar_pos <= (i * 2) and (i * 2 + 1) < (dialog.scrollbar_pos + bar_height)
           @output.write @full_block
         elsif dialog.scrollbar_pos <= (i * 2) and (i * 2) < (dialog.scrollbar_pos + bar_height)
           @output.write @upper_half_block
-          str += ''
         elsif dialog.scrollbar_pos <= (i * 2 + 1) and (i * 2) < (dialog.scrollbar_pos + bar_height)
           @output.write @lower_half_block
         else
@@ -883,6 +885,14 @@ class Reline::LineEditor
     end
   end
 
+  private def clear_dialog_with_content
+    @dialogs.each do |dialog|
+      clear_each_dialog(dialog)
+      dialog.contents = nil
+      dialog.trap_key = nil
+    end
+  end
+
   private def clear_each_dialog(dialog)
     dialog.trap_key = nil
     return unless dialog.contents
@@ -1420,7 +1430,7 @@ class Reline::LineEditor
     if @waiting_operator_proc
       if VI_MOTIONS.include?(method_symbol)
         old_cursor, old_byte_pointer = @cursor, @byte_pointer
-        @vi_arg = @waiting_operator_vi_arg if @waiting_operator_vi_arg > 1
+        @vi_arg = @waiting_operator_vi_arg if @waiting_operator_vi_arg&.> 1
         block.(true)
         unless @waiting_proc
           cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
@@ -2223,6 +2233,8 @@ class Reline::LineEditor
             @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
             @line_index = @buffer_of_lines.size - 1
             @line = @buffer_of_lines.last
+            @byte_pointer = @line.bytesize
+            @cursor = @cursor_max = calculate_width(@line)
             @rerender_all = true
             @searching_prompt = "(%s)`%s'" % [prompt_name, search_word]
           else

data/lib/reline/terminfo.rb

@@ -35,7 +35,7 @@ module Reline::Terminfo
       # Gem module isn't defined in test-all of the Ruby repository, and
       # Fiddle in Ruby 3.0.0 or later supports Fiddle::TYPE_VARIADIC.
       fiddle_supports_variadic = true
-    elsif Fiddle.const_defined?(:VERSION) and Gem::Version.create(Fiddle::VERSION) >= Gem::Version.create('1.0.1')
+    elsif Fiddle.const_defined?(:VERSION,false) and Gem::Version.create(Fiddle::VERSION) >= Gem::Version.create('1.0.1')
       # Fiddle::TYPE_VARIADIC is supported from Fiddle 1.0.1.
       fiddle_supports_variadic = true
     else
@@ -92,9 +92,9 @@ module Reline::Terminfo
   end
 
   def self.setupterm(term, fildes)
-    errret_int = String.new("\x00" * 8, encoding: 'ASCII-8BIT')
+    errret_int = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
     ret = @setupterm.(term, fildes, errret_int)
-    errret = errret_int.unpack1('i')
+    errret = errret_int[0, Fiddle::SIZEOF_INT].unpack1('i')
     case ret
     when 0 # OK
       0
@@ -121,6 +121,7 @@ module Reline::Terminfo
   end
 
   def self.tigetstr(capname)
+    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
     capability = @tigetstr.(capname)
     case capability.to_i
     when 0, -1
@@ -138,6 +139,7 @@ module Reline::Terminfo
   end
 
   def self.tigetflag(capname)
+    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
     flag = @tigetflag.(capname).to_i
     case flag
     when -1
@@ -149,6 +151,7 @@ module Reline::Terminfo
   end
 
   def self.tigetnum(capname)
+    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
     num = @tigetnum.(capname).to_i
     case num
     when -2

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/reline/windows.rb

@@ -95,7 +95,7 @@ class Reline::Windows
   end
 
   VK_RETURN = 0x0D
-  VK_MENU = 0x12
+  VK_MENU = 0x12 # ALT key
   VK_LMENU = 0xA4
   VK_CONTROL = 0x11
   VK_SHIFT = 0x10
@@ -249,7 +249,7 @@ class Reline::Windows
     # no char, only control keys
     return if key.char_code == 0 and key.control_keys.any?
 
-    @@output_buf.push("\e".ord) if key.control_keys.include?(:ALT)
+    @@output_buf.push("\e".ord) if key.control_keys.include?(:ALT) and !key.control_keys.include?(:CTRL)
 
     @@output_buf.concat(key.char.bytes)
   end

data/lib/reline.rb

@@ -33,7 +33,18 @@ module Reline
     alias_method :==, :match?
   end
   CursorPos = Struct.new(:x, :y)
-  DialogRenderInfo = Struct.new(:pos, :contents, :bg_color, :width, :height, :scrollbar, keyword_init: true)
+  DialogRenderInfo = Struct.new(
+    :pos,
+    :contents,
+    :bg_color,
+    :pointer_bg_color,
+    :fg_color,
+    :pointer_fg_color,
+    :width,
+    :height,
+    :scrollbar,
+    keyword_init: true
+  )
 
   class Core
     ATTR_READER_NAMES = %i(
@@ -58,6 +69,11 @@ module Reline
     attr_accessor :last_incremental_search
     attr_reader :output
 
+    extend Forwardable
+    def_delegators :config,
+      :autocompletion,
+      :autocompletion=
+
     def initialize
       self.output = STDOUT
       @dialog_proc_list = {}
@@ -123,14 +139,6 @@ module Reline
       @completion_proc = p
     end
 
-    def autocompletion
-      @config.autocompletion
-    end
-
-    def autocompletion=(val)
-      @config.autocompletion = val
-    end
-
     def output_modifier_proc=(p)
       raise ArgumentError unless p.respond_to?(:call) or p.nil?
       @output_modifier_proc = p
@@ -243,7 +251,16 @@ module Reline
         context.push(cursor_pos_to_render, result, pointer, dialog)
       end
       dialog.pointer = pointer
-      DialogRenderInfo.new(pos: cursor_pos_to_render, contents: result, scrollbar: true, height: 15)
+      DialogRenderInfo.new(
+        pos: cursor_pos_to_render,
+        contents: result,
+        scrollbar: true,
+        height: 15,
+        bg_color: 46,
+        pointer_bg_color: 45,
+        fg_color: 37,
+        pointer_fg_color: 37
+      )
     }
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 
@@ -466,7 +483,7 @@ module Reline
     end
 
     private def may_req_ambiguous_char_width
-      @ambiguous_width = 2 if Reline::IOGate == Reline::GeneralIO or STDOUT.is_a?(File)
+      @ambiguous_width = 2 if Reline::IOGate == Reline::GeneralIO or !STDOUT.tty?
       return if defined? @ambiguous_width
       Reline::IOGate.move_cursor_column(0)
       begin
@@ -563,24 +580,21 @@ module Reline
 end
 
 require 'reline/general_io'
-if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-  require 'reline/windows'
-  if Reline::Windows.msys_tty?
-    Reline::IOGate = if ENV['TERM'] == 'dumb'
-      Reline::GeneralIO
-    else
-      require 'reline/ansi'
-      Reline::ANSI
-    end
+io = Reline::GeneralIO
+unless ENV['TERM'] == 'dumb'
+  case RbConfig::CONFIG['host_os']
+  when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+    require 'reline/windows'
+    tty = (io = Reline::Windows).msys_tty?
   else
-    Reline::IOGate = Reline::Windows
+    tty = $stdout.tty?
   end
+end
+Reline::IOGate = if tty
+  require 'reline/ansi'
+  Reline::ANSI
 else
-  Reline::IOGate = if $stdout.isatty
-    require 'reline/ansi'
-    Reline::ANSI
-  else
-    Reline::GeneralIO
-  end
+  io
 end
+
 Reline::HISTORY = Reline::History.new(Reline.core.config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -47,7 +47,6 @@ files:
 - lib/reline/key_stroke.rb
 - lib/reline/kill_ring.rb
 - lib/reline/line_editor.rb
-- lib/reline/sibori.rb
 - lib/reline/terminfo.rb
 - lib/reline/unicode.rb
 - lib/reline/unicode/east_asian_width.rb
@@ -66,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.

data/lib/reline/sibori.rb

@@ -1,170 +0,0 @@
-require 'reline/unicode'
-
-=begin
-
-  \       |
-   \      | <--- whipped cream
-    \     |
-     \    |
-      \-~~|
-       \  | <--- shibori kutigane (piping nozzle in Japanese)
-        \Ml
-         (\    __ __
-         ( \--(  )  )
-          (__(__)__)  <--- compressed whipped cream
-=end
-
-class Sibori
-  attr_writer :output
-
-  def initialize(width, height, cursor_pos)
-    @width = width
-    @height = height
-    @cursor_pos = cursor_pos
-    @screen = [String.new]
-    @line_index = 0
-    @byte_pointer_in_line = 0
-    @cleared = false
-    clone_screen
-  end
-
-  def clone_screen
-    @prev_screen = @screen.map { |line|
-      line.dup
-    }
-    @prev_cursor_pos = @cursor_pos.dup
-    @prev_line_index = @line_index
-  end
-
-  def print(str)
-    #$stderr.puts "print #{str.inspect}"
-    line = @screen[@line_index]
-    before = line.byteslice(0, @byte_pointer_in_line)
-    str_width = Reline::Unicode.calculate_width(str, true)
-    after_cursor = line.byteslice(@byte_pointer_in_line..-1)
-    after_cursor_width = Reline::Unicode.calculate_width(after_cursor, true)
-    rest = ''
-    if after_cursor_width > str_width
-      rest_byte_pointer = @byte_pointer_in_line + width_to_bytesize(after_cursor, str_width)
-      rest = line.byteslice(rest_byte_pointer..-1)
-    end
-    @screen[@line_index] = before + str + rest
-    @byte_pointer_in_line += str.bytesize
-    @cursor_pos.x += Reline::Unicode.calculate_width(str, true)
-  end
-
-  def move_cursor_column(col)
-    #$stderr.puts "move_cursor_column(#{col})"
-    @byte_pointer_in_line = width_to_bytesize(@screen[@line_index], col)
-    @cursor_pos.x = col
-  end
-
-  def move_cursor_up(val)
-    #$stderr.puts "move_cursor_up(#{val})"
-    if @line_index.positive?
-      @line_index -= val
-      @byte_pointer_in_line = width_to_bytesize(@screen[@line_index], @cursor_pos.x)
-      @cursor_pos.y -= val
-    end
-  end
-
-  def move_cursor_down(val)
-    #$stderr.puts "move_cursor_down(#{val})"
-    if @line_index < @height - 1
-      #$stderr.puts "@line_index #{@line_index}  @screen.size #{@screen.size}  @height #{@height}"
-      #$stderr.puts @screen.inspect
-      @line_index += val
-      @screen[@line_index] = String.new if @line_index == @screen.size
-      @byte_pointer_in_line = width_to_bytesize(@screen[@line_index], @cursor_pos.x)
-      @cursor_pos.y += val
-    end
-  end
-
-  def scroll_down(val)
-    #$stderr.puts "scroll_down(#{val})"
-    if val >= @height
-      clear_screen
-      @line_index = @screen.size - 1
-      return
-    end
-    @screen.size.times do |n|
-      if n < @screen.size - val
-        #$stderr.puts "A @screen[#{val} + #{n}] (#{@screen[val + n].inspect}) to @screen[#{n}]"
-        @screen[n] = @screen[val + n]
-      else
-        #$stderr.puts "B String.new to @screen[#{n}]"
-        @screen[n] = String.new
-      end
-    end
-    @line_index += val
-  end
-
-  def erase_after_cursor
-    #$stderr.puts "erase_after_cursor"
-    @screen[@line_index] = @screen[@line_index].byteslice(0, @byte_pointer_in_line)
-  end
-
-  def clear_screen
-    #$stderr.puts "clear_screen"
-    @screen = [String.new]
-    @line_index = 0
-    @byte_pointer_in_line = 0
-    @cursor_pos.x = @cursor_pos.y = 0
-    @cleared = true
-    Reline::IOGate.clear_screen
-  end
-
-  private def width_to_bytesize(str, width)
-    lines, _ = Reline::Unicode.split_by_width(str, width)
-    lines.first.bytesize
-  end
-
-  def render
-    #$stderr.puts ?* * 100
-    Reline::IOGate.move_cursor_up(@prev_line_index) if @prev_line_index.positive?
-    #$stderr.puts "! move_cursor_up(#{@prev_line_index})" if @prev_line_index.positive?
-    #$stderr.puts "@prev_line_index #{@prev_line_index}  @line_index #{@line_index}"
-    if @screen.size > @prev_screen.size
-    #$stderr.puts ?a * 100
-      down = @screen.size - @prev_screen.size
-      #$stderr.puts "#{@prev_cursor_pos.y} #{down} #{@height}"
-      if @prev_cursor_pos.y + down > (@height - 1)
-    #$stderr.puts ?b * 100
-        scroll = (@prev_cursor_pos.y + down) - (@height - 1)
-        Reline::IOGate.scroll_down(scroll)
-        #$stderr.puts "! scroll_down(#{scroll})"
-    #$stderr.puts "down #{down}"
-        Reline::IOGate.move_cursor_up(@screen.size - 1 - scroll)
-        #$stderr.puts "! move_cursor_up(#{@screen.size - 1})"
-      else
-    #$stderr.puts ?c * 100
-      end
-    end
-    @screen.size.times do |n|
-      Reline::IOGate.move_cursor_column(0)
-      #$stderr.puts "! move_cursor_column(0)"
-      @output.write @screen[n]
-      #$stderr.puts "! print #{@screen[n].inspect}"
-      Reline::IOGate.erase_after_cursor
-      #$stderr.puts "! erase_after_cursor"
-      Reline::IOGate.move_cursor_down(1) if n != (@screen.size - 1)
-      #$stderr.puts "! move_cursor_down(1)" if n != (@screen.size - 1)
-    end
-    up = @screen.size - 1 - @line_index
-    Reline::IOGate.move_cursor_up(up) if up.positive?
-    #$stderr.puts "! move_cursor_up(#{up})" if up.positive?
-    column = Reline::Unicode.calculate_width(@screen[@line_index].byteslice(0, @byte_pointer_in_line), true)
-    Reline::IOGate.move_cursor_column(column)
-    #$stderr.puts "! move_cursor_column(#{column}) #{@byte_pointer_in_line}"
-    clone_screen
-    #$stderr.puts ?- * 10
-  end
-
-  def prep
-    Reline::IOGate.prep
-  end
-
-  def deprep
-    Reline::IOGate.deprep
-  end
-end