reline 0.0.1 → 0.0.6

data/lib/reline/unicode/east_asian_width.rb

@@ -1,6 +1,6 @@
 class Reline::Unicode::EastAsianWidth
   # This is based on EastAsianWidth.txt
-  # http://www.unicode.org/Public/10.0.0/ucd/EastAsianWidth.txt
+  # http://www.unicode.org/Public/12.1.0/ucd/EastAsianWidth.txt
 
   # Fullwidth
   TYPE_F = /^(

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.1'
+  VERSION = '0.0.6'
 end

data/lib/reline/windows.rb

@@ -9,49 +9,65 @@ class Reline::Windows
     [224, 83] => :key_delete,      # Del
     [224, 71] => :ed_move_to_beg,  # Home
     [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
+    [  0, 41] => :ed_unassigned,   # input method on/off
+    [  0, 72] => :ed_prev_history, # ↑
+    [  0, 80] => :ed_next_history, # ↓
+    [  0, 77] => :ed_next_char,    # →
+    [  0, 75] => :ed_prev_char,    # ←
+    [  0, 83] => :key_delete,      # Del
+    [  0, 71] => :ed_move_to_beg,  # Home
+    [  0, 79] => :ed_move_to_end   # 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
 
   VK_MENU = 0x12
+  VK_LMENU = 0xA4
+  VK_CONTROL = 0x11
   VK_SHIFT = 0x10
+  STD_INPUT_HANDLE = -10
   STD_OUTPUT_HANDLE = -11
+  WINDOW_BUFFER_SIZE_EVENT = 0x04
   @@getwch = Win32API.new('msvcrt', '_getwch', [], 'I')
   @@kbhit = Win32API.new('msvcrt', '_kbhit', [], 'I')
   @@GetKeyState = Win32API.new('user32', 'GetKeyState', ['L'], 'L')
@@ -61,77 +77,101 @@ class Reline::Windows
   @@FillConsoleOutputCharacter = Win32API.new('kernel32', 'FillConsoleOutputCharacter', ['L', 'L', 'L', 'L', 'P'], 'L')
   @@ScrollConsoleScreenBuffer = Win32API.new('kernel32', 'ScrollConsoleScreenBuffer', ['L', 'P', 'P', 'L', 'P'], 'L')
   @@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
-  @@buf = []
+  @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
+  @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
+  @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
+  @@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
+      if ret == 0 or ret == 0xE0
+        @@input_buf << ret
+        ret = @@getwch.call
+        @@input_buf << ret
+        return @@input_buf.shift
+      end
       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
-    unless @@buf.empty?
-      return @@buf.shift
+    num_of_events = 0.chr * 8
+    while @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) != 0 and num_of_events.unpack('L').first > 0
+      input_record = 0.chr * 18
+      read_event = 0.chr * 4
+      if @@ReadConsoleInput.(@@hConsoleInputHandle, input_record, 1, read_event) != 0
+        event = input_record[0, 2].unpack('s*').first
+        if event == WINDOW_BUFFER_SIZE_EVENT
+          @@winch_handler.()
+        end
+      end
+    end
+    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
-    if shift_enter
+    meta = (@@GetKeyState.call(VK_LMENU) & 0x80) != 0
+    control = (@@GetKeyState.call(VK_CONTROL) & 0x80) != 0
+    shift = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0
+    force_enter = !input.instance_of?(Array) && (control or shift) && input == 0x0D
+    if force_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
+        meta = false
+        @@output_buf.push(input)
         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
+    if meta
       "\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
-    csbi = 0.chr * 24
+    csbi = 0.chr * 22
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     csbi[0, 4].unpack('SS').reverse
   end
 
   def self.cursor_pos
-    csbi = 0.chr * 24
+    csbi = 0.chr * 22
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     x = csbi[4, 2].unpack('s*').first
-    y = csbi[6, 4].unpack('s*').first
+    y = csbi[6, 2].unpack('s*').first
     Reline::CursorPos.new(x, y)
   end
 
@@ -181,6 +221,10 @@ class Reline::Windows
     raise NotImplementedError
   end
 
+  def self.set_winch_handler(&handler)
+    @@winch_handler = handler
+  end
+
   def self.prep
     # do nothing
     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - aycabta
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.