reline 0.2.5 → 0.3.1

data/lib/reline/terminfo.rb

@@ -0,0 +1,171 @@
+begin
+  require 'fiddle'
+  require 'fiddle/import'
+rescue LoadError
+  module Reline::Terminfo
+    def self.curses_dl
+      false
+    end
+  end
+end
+
+module Reline::Terminfo
+  extend Fiddle::Importer
+
+  class TerminfoError < StandardError; end
+
+  def self.curses_dl_files
+    case RUBY_PLATFORM
+    when /mingw/, /mswin/
+      # aren't supported
+      []
+    when /cygwin/
+      %w[cygncursesw-10.dll cygncurses-10.dll]
+    when /darwin/
+      %w[libncursesw.dylib libcursesw.dylib libncurses.dylib libcurses.dylib]
+    else
+      %w[libncursesw.so libcursesw.so libncurses.so libcurses.so]
+    end
+  end
+
+  @curses_dl = false
+  def self.curses_dl
+    return @curses_dl unless @curses_dl == false
+    if RUBY_VERSION >= '3.0.0'
+      # 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')
+      # Fiddle::TYPE_VARIADIC is supported from Fiddle 1.0.1.
+      fiddle_supports_variadic = true
+    else
+      fiddle_supports_variadic = false
+    end
+    if fiddle_supports_variadic and not Fiddle.const_defined?(:TYPE_VARIADIC)
+      # If the libffi version is not 3.0.5 or higher, there isn't TYPE_VARIADIC.
+      fiddle_supports_variadic = false
+    end
+    if fiddle_supports_variadic
+      curses_dl_files.each do |curses_name|
+        result = Fiddle::Handle.new(curses_name)
+      rescue Fiddle::DLError
+        next
+      else
+        @curses_dl = result
+        break
+      end
+    end
+    @curses_dl = nil if @curses_dl == false
+    @curses_dl
+  end
+end if not Reline.const_defined?(:Terminfo) or not Reline::Terminfo.respond_to?(:curses_dl)
+
+module Reline::Terminfo
+  dlload curses_dl
+  #extern 'int setupterm(char *term, int fildes, int *errret)'
+  @setupterm = Fiddle::Function.new(curses_dl['setupterm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  #extern 'char *tigetstr(char *capname)'
+  @tigetstr = Fiddle::Function.new(curses_dl['tigetstr'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_VOIDP)
+  begin
+    #extern 'char *tiparm(const char *str, ...)'
+    @tiparm = Fiddle::Function.new(curses_dl['tiparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
+  rescue Fiddle::DLError
+    # OpenBSD lacks tiparm
+    #extern 'char *tparm(const char *str, ...)'
+    @tiparm = Fiddle::Function.new(curses_dl['tparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
+  end
+  begin
+    #extern 'int tigetflag(char *str)'
+    @tigetflag = Fiddle::Function.new(curses_dl['tigetflag'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  rescue Fiddle::DLError
+    # OpenBSD lacks tigetflag
+    #extern 'int tgetflag(char *str)'
+    @tigetflag = Fiddle::Function.new(curses_dl['tgetflag'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  end
+  begin
+    #extern 'int tigetnum(char *str)'
+    @tigetnum = Fiddle::Function.new(curses_dl['tigetnum'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  rescue Fiddle::DLError
+    # OpenBSD lacks tigetnum
+    #extern 'int tgetnum(char *str)'
+    @tigetnum = Fiddle::Function.new(curses_dl['tgetnum'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  end
+
+  def self.setupterm(term, fildes)
+    errret_int = String.new("\x00" * 8, encoding: 'ASCII-8BIT')
+    ret = @setupterm.(term, fildes, errret_int)
+    errret = errret_int.unpack1('i')
+    case ret
+    when 0 # OK
+      0
+    when -1 # ERR
+      case errret
+      when 1
+        raise TerminfoError.new('The terminal is hardcopy, cannot be used for curses applications.')
+      when 0
+        raise TerminfoError.new('The terminal could not be found, or that it is a generic type, having too little information for curses applications to run.')
+      when -1
+        raise TerminfoError.new('The terminfo database could not be found.')
+      else # unknown
+        -1
+      end
+    else # unknown
+      -2
+    end
+  end
+
+  class StringWithTiparm < String
+    def tiparm(*args) # for method chain
+      Reline::Terminfo.tiparm(self, *args)
+    end
+  end
+
+  def self.tigetstr(capname)
+    capability = @tigetstr.(capname)
+    case capability.to_i
+    when 0, -1
+      raise TerminfoError, "can't find capability: #{capname}"
+    end
+    StringWithTiparm.new(capability.to_s)
+  end
+
+  def self.tiparm(str, *args)
+    new_args = []
+    args.each do |a|
+      new_args << Fiddle::TYPE_INT << a
+    end
+    @tiparm.(str, *new_args).to_s
+  end
+
+  def self.tigetflag(capname)
+    flag = @tigetflag.(capname).to_i
+    case flag
+    when -1
+      raise TerminfoError, "not boolean capability: #{capname}"
+    when 0
+      raise TerminfoError, "can't find capability: #{capname}"
+    end
+    flag
+  end
+
+  def self.tigetnum(capname)
+    num = @tigetnum.(capname).to_i
+    case num
+    when -2
+      raise TerminfoError, "not numeric capability: #{capname}"
+    when -1
+      raise TerminfoError, "can't find capability: #{capname}"
+    end
+    num
+  end
+
+  def self.enabled?
+    true
+  end
+end if Reline::Terminfo.curses_dl
+
+module Reline::Terminfo
+  def self.enabled?
+    false
+  end
+end unless Reline::Terminfo.curses_dl

data/lib/reline/unicode.rb

@@ -79,6 +79,8 @@ class Reline::Unicode
 
   require 'reline/unicode/east_asian_width'
 
+  HalfwidthDakutenHandakuten = /[\u{FF9E}\u{FF9F}]/
+
   MBCharWidthRE = /
     (?<width_2_1>
       [#{ EscapedChars.map {|c| "\\x%02x" % c.ord }.join }] (?# ^ + char, such as ^M, ^H, ^[, ...)
@@ -93,6 +95,12 @@ class Reline::Unicode
       #{ EastAsianWidth::TYPE_H }
     | #{ EastAsianWidth::TYPE_NA }
     | #{ EastAsianWidth::TYPE_N }
+    )(?!#{ HalfwidthDakutenHandakuten })
+  | (?<width_2_3>
+      (?: #{ EastAsianWidth::TYPE_H }
+        | #{ EastAsianWidth::TYPE_NA }
+        | #{ EastAsianWidth::TYPE_N })
+      #{ HalfwidthDakutenHandakuten }
     )
   | (?<ambiguous_width>
       #{EastAsianWidth::TYPE_A}
@@ -101,15 +109,15 @@ class Reline::Unicode
 
   def self.get_mbchar_width(mbchar)
     ord = mbchar.ord
-    if (0x00 <= ord and ord <= 0x1F)
+    if (0x00 <= ord and ord <= 0x1F) # in EscapedPairs
       return 2
-    elsif (0x20 <= ord and ord <= 0x7E)
+    elsif (0x20 <= ord and ord <= 0x7E) # printable ASCII chars
       return 1
     end
     m = mbchar.encode(Encoding::UTF_8).match(MBCharWidthRE)
     case
     when m.nil? then 1 # TODO should be U+FFFD � REPLACEMENT CHARACTER
-    when m[:width_2_1], m[:width_2_2] then 2
+    when m[:width_2_1], m[:width_2_2], m[:width_2_3] then 2
     when m[:width_3] then 3
     when m[:width_0] then 0
     when m[:width_1] then 1
@@ -185,6 +193,37 @@ class Reline::Unicode
     [lines, height]
   end
 
+  # Take a chunk of a String cut by width with escape sequences.
+  def self.take_range(str, start_col, max_width, encoding = str.encoding)
+    chunk = String.new(encoding: encoding)
+    total_width = 0
+    rest = str.encode(Encoding::UTF_8)
+    in_zero_width = false
+    rest.scan(WIDTH_SCANNER) do |gc|
+      case
+      when gc[NON_PRINTING_START_INDEX]
+        in_zero_width = true
+      when gc[NON_PRINTING_END_INDEX]
+        in_zero_width = false
+      when gc[CSI_REGEXP_INDEX]
+        chunk << gc[CSI_REGEXP_INDEX]
+      when gc[OSC_REGEXP_INDEX]
+        chunk << gc[OSC_REGEXP_INDEX]
+      when gc[GRAPHEME_CLUSTER_INDEX]
+        gc = gc[GRAPHEME_CLUSTER_INDEX]
+        if in_zero_width
+          chunk << gc
+        else
+          mbchar_width = get_mbchar_width(gc)
+          total_width += mbchar_width
+          break if (start_col + max_width) < total_width
+          chunk << gc if start_col < total_width
+        end
+      end
+    end
+    chunk
+  end
+
   def self.get_next_mbchar_size(line, byte_pointer)
     grapheme = line.byteslice(byte_pointer..-1).grapheme_clusters.first
     grapheme ? grapheme.bytesize : 0

data/lib/reline/version.rb

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