reline 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47cc0525de297744dff41dc87b9a4ac5c9ff1cad21da7f60a41aa4b17bd1b0e
-  data.tar.gz: '04681f2a2dc431f65fa9f2df68c8b7aa1955a7a4032b8d6d5483984e236d4c9b'
+  metadata.gz: 5978554d657a91d17e199389ec2bf7dd1a505436bf0ea9c73478973c202d08c7
+  data.tar.gz: cd5b28a0094e1af15c09617b8093550a81ed841ea1e9c9f3db9131eaca694217
 SHA512:
-  metadata.gz: ad38bf76659bc7553ebf084fd4aeedf6aba7cba1a2860fc78af0683222109216d59bdb3b4bf66962ce9a640b9033d21f707442151834e9ccc21c6fc8d115347b
-  data.tar.gz: 95d9d943870e64897076cdc97750f6110817bc4ad14e958755164aa862785d7e48399465f7997f900547f797e6304cf48d6761f78612651ebe7aa6dca505fab3
+  metadata.gz: 2d21a0ee4c7a28ef7b7d32db350646b369719b2778d04cb4158cac1583a1f8c41010f55c1e8a81aa1954dce207e2048526cbfcbbebcb8624a3037ff18b0851e9
+  data.tar.gz: f1d58c640a8cf6190c65a9bcf0898ecec70d9825f76fc68a28bcfe4300387eb6223f13d226689ecbd7d0fb248365e81a8df8fc8247452519abb163121684f4b3

data/lib/reline.rb

@@ -287,7 +287,7 @@ module Reline
           end
         when :unmatched
           if buffer.size == 1 and c == "\e".ord
-            read_escaped_key(keyseq_timeout, buffer, block)
+            read_escaped_key(keyseq_timeout, c, block)
           else
             block.(buffer.map{ |c| Reline::Key.new(c, c, false) })
           end
@@ -296,7 +296,7 @@ module Reline
       end
     end
 
-    private def read_escaped_key(keyseq_timeout, buffer, block)
+    private def read_escaped_key(keyseq_timeout, c, block)
       begin
         escaped_c = nil
         Timeout.timeout(keyseq_timeout / 1000.0) {

data/lib/reline/ansi.rb

@@ -24,20 +24,22 @@ class Reline::ANSI
     unless @@buf.empty?
       return @@buf.shift
     end
-    c = nil
-    loop do
-      result = select([@@input], [], [], 0.1)
-      next if result.nil?
-      c = @@input.read(1)
-      break
-    end
-    c&.ord
+    @@input.getbyte
   end
 
   def self.ungetc(c)
     @@buf.unshift(c)
   end
 
+  def self.retrieve_keybuffer
+      result = select([@@input], [], [], 0.001)
+      return if result.nil?
+      str = @@input.read_nonblock(1024)
+      str.bytes.each do |c|
+        @@buf.push(c)
+      end
+  end
+
   def self.get_screen_size
     @@input.winsize
   rescue Errno::ENOTTY
@@ -112,12 +114,17 @@ class Reline::ANSI
   end
 
   def self.prep
+    retrieve_keybuffer
     int_handle = Signal.trap('INT', 'IGNORE')
     otio = `stty -g`.chomp
     setting = ' -echo -icrnl cbreak'
-    if /-parenb\b/ =~ `stty -a`
+    stty = `stty -a`
+    if /-parenb\b/ =~ stty
       setting << ' pass8'
     end
+    if /\bdsusp *=/ =~ stty
+      setting << ' dsusp undef'
+    end
     setting << ' -ixoff'
     `stty #{setting}`
     Signal.trap('INT', int_handle)

data/lib/reline/key_actor/vi_command.rb

@@ -55,7 +55,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
     #  26 ^Z
     :ed_unassigned,
     #  27 ^[
-    :em_meta_next,
+    :ed_unassigned,
     #  28 ^\
     :ed_ignore,
     #  29 ^]

data/lib/reline/line_editor.rb

@@ -65,9 +65,8 @@ class Reline::LineEditor
     @screen_size = Reline::IOGate.get_screen_size
     reset_variables(prompt, encoding)
     @old_trap = Signal.trap('SIGINT') {
-      scroll_down(@highest_in_all - @first_line_started_from)
-      Reline::IOGate.move_cursor_column(0)
       @old_trap.call if @old_trap.respond_to?(:call) # can also be string, ex: "DEFAULT"
+      raise Interrupt
     }
     Reline::IOGate.set_winch_handler do
       @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
@@ -306,6 +305,7 @@ class Reline::LineEditor
       @menu_info.list.each do |item|
         Reline::IOGate.move_cursor_column(0)
         @output.print item
+        @output.flush
         scroll_down(1)
       end
       scroll_down(@highest_in_all - 1)
@@ -541,6 +541,7 @@ class Reline::LineEditor
         next
       end
       @output.print line
+      @output.flush
       if @first_prompt
         @first_prompt = false
         @pre_input_hook&.call
@@ -1049,6 +1050,8 @@ class Reline::LineEditor
     end
   end
 
+  private def ed_unassigned(key) end # do nothing
+
   private def ed_insert(key)
     if key.instance_of?(String)
       width = Reline::Unicode.get_mbchar_width(key)
@@ -1279,7 +1282,7 @@ class Reline::LineEditor
         @line = Reline::HISTORY[@history_pointer]
       end
     end
-    if @config.editing_mode_is?(:emacs)
+    if @config.editing_mode_is?(:emacs, :vi_insert)
       @cursor_max = @cursor = calculate_width(@line)
       @byte_pointer = @line.bytesize
     elsif @config.editing_mode_is?(:vi_command)
@@ -1326,7 +1329,7 @@ class Reline::LineEditor
       end
     end
     @line = '' unless @line
-    if @config.editing_mode_is?(:emacs)
+    if @config.editing_mode_is?(:emacs, :vi_insert)
       @cursor_max = @cursor = calculate_width(@line)
       @byte_pointer = @line.bytesize
     elsif @config.editing_mode_is?(:vi_command)

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/reline/windows.rb

@@ -11,41 +11,45 @@ class Reline::Windows
     [224, 79] => :ed_move_to_end,  # End
   }.each_key(&:freeze).freeze
 
-  class Win32API
-    DLL = {}
-    TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
-    POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
-
-    WIN32_TYPES = "VPpNnLlIi"
-    DL_TYPES = "0SSI"
-
-    def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-      @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
-      import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
-      export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
-      calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
-
-      handle = DLL[dllname] ||=
-               begin
-                 Fiddle.dlopen(dllname)
-               rescue Fiddle::DLError
-                 raise unless File.extname(dllname).empty?
-                 Fiddle.dlopen(dllname + ".dll")
-               end
-
-      @func = Fiddle::Function.new(handle[func], import, export, calltype)
-    rescue Fiddle::DLError => e
-      raise LoadError, e.message, e.backtrace
-    end
+  if defined? JRUBY_VERSION
+    require 'win32api'
+  else
+    class Win32API
+      DLL = {}
+      TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
+      POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
+
+      WIN32_TYPES = "VPpNnLlIi"
+      DL_TYPES = "0SSI"
+
+      def initialize(dllname, func, import, export = "0", calltype = :stdcall)
+        @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
+        import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
+        export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
+        calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
+
+        handle = DLL[dllname] ||=
+                 begin
+                   Fiddle.dlopen(dllname)
+                 rescue Fiddle::DLError
+                   raise unless File.extname(dllname).empty?
+                   Fiddle.dlopen(dllname + ".dll")
+                 end
+
+        @func = Fiddle::Function.new(handle[func], import, export, calltype)
+      rescue Fiddle::DLError => e
+        raise LoadError, e.message, e.backtrace
+      end
 
-    def call(*args)
-      import = @proto.split("")
-      args.each_with_index do |x, i|
-        args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
-        args[i], = [x].pack("I").unpack("i") if import[i] == "I"
+      def call(*args)
+        import = @proto.split("")
+        args.each_with_index do |x, i|
+          args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
+          args[i], = [x].pack("I").unpack("i") if import[i] == "I"
+        end
+        ret, = @func.call(*args)
+        return ret || 0
       end
-      ret, = @func.call(*args)
-      return ret || 0
     end
   end
 
@@ -66,23 +70,27 @@ class Reline::Windows
   @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
   @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
   @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
-  @@buf = []
+  @@input_buf = []
+  @@output_buf = []
 
   def self.getwch
+    unless @@input_buf.empty?
+      return @@input_buf.shift
+    end
     while @@kbhit.call == 0
       sleep(0.001)
     end
-    result = []
     until @@kbhit.call == 0
       ret = @@getwch.call
       begin
-        result.concat(ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes)
+        bytes = ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes
+        @@input_buf.push(*bytes)
       rescue Encoding::UndefinedConversionError
-        result << ret
-        result << @@getwch.call if ret == 224
+        @@input_buf << ret
+        @@input_buf << @@getwch.call if ret == 224
       end
     end
-    result
+    @@input_buf.shift
   end
 
   def self.getc
@@ -97,44 +105,42 @@ class Reline::Windows
         end
       end
     end
-    unless @@buf.empty?
-      return @@buf.shift
+    unless @@output_buf.empty?
+      return @@output_buf.shift
     end
     input = getwch
     alt = (@@GetKeyState.call(VK_MENU) & 0x80) != 0
-    shift_enter = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0 && input.first == 0x0D
+    shift_enter = !input.instance_of?(Array) && (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0 && input == 0x0D
     if shift_enter
       # It's treated as Meta+Enter on Windows
-      @@buf.concat(["\e".ord])
-      @@buf.concat(input)
-    elsif input.size > 1
-      @@buf.concat(input)
-    else # single byte
-      case input[0]
+      @@output_buf.push("\e".ord)
+      @@output_buf.push(input)
+    else
+      case input
       when 0x00
         getwch
         alt = false
         input = getwch
-        @@buf.concat(input)
+        @@output_buf.push(*input)
       when 0xE0
-        @@buf.concat(input)
+        @@output_buf.push(input)
         input = getwch
-        @@buf.concat(input)
+        @@output_buf.push(*input)
       when 0x03
-        @@buf.concat(input)
+        @@output_buf.push(input)
       else
-        @@buf.concat(input)
+        @@output_buf.push(input)
       end
     end
     if alt
       "\e".ord
     else
-      @@buf.shift
+      @@output_buf.shift
     end
   end
 
   def self.ungetc(c)
-    @@buf.unshift(c)
+    @@output_buf.unshift(c)
   end
 
   def self.get_screen_size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler