reline 0.2.1 → 0.2.6

data/lib/reline/terminfo.rb

@@ -0,0 +1,84 @@
+require 'fiddle'
+require 'fiddle/import'
+
+module Reline::Terminfo
+  extend Fiddle::Importer
+
+  class TerminfoError < StandardError; end
+
+  @curses_dl = nil
+  def self.curses_dl
+    return @curses_dl if @curses_dl
+    if 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.
+      %w[libncursesw.so libcursesw.so libncurses.so libcurses.so].each do |curses_name|
+        result = Fiddle::Handle.new(curses_name)
+      rescue Fiddle::DLError
+        next
+      else
+        @curses_dl = result
+        break
+      end
+    end
+    @curses_dl
+  end
+end
+
+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)
+  #extern 'char *tiparm(const char *str, ...)'
+  @tiparm = Fiddle::Function.new(curses_dl['tiparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
+
+  def self.setupterm(term, fildes)
+    errret_int = String.new("\x00" * 8, encoding: 'ASCII-8BIT')
+    ret = @setupterm.(term, fildes, errret_int)
+    errret = errret_int.unpack('i')[0]
+    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
+
+  def self.tigetstr(capname)
+    result = @tigetstr.(capname).to_s
+    def result.tiparm(*args) # for method chain
+      Reline::Terminfo.tiparm(self, *args)
+    end
+    result
+  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.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

@@ -108,6 +108,7 @@ class Reline::Unicode
     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_3] then 3
     when m[:width_0] then 0

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.2.1'
+  VERSION = '0.2.6'
 end

data/lib/reline/windows.rb

@@ -9,23 +9,40 @@ class Reline::Windows
     true
   end
 
-  RAW_KEYSTROKE_CONFIG = {
-    [224, 72] => :ed_prev_history, # ↑
-    [224, 80] => :ed_next_history, # ↓
-    [224, 77] => :ed_next_char,    # →
-    [224, 75] => :ed_prev_char,    # ←
-    [224, 83] => :key_delete,      # Del
-    [224, 71] => :ed_move_to_beg,  # Home
-    [224, 79] => :ed_move_to_end,  # 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
-  }
+  def self.win_legacy_console?
+    @@legacy_console
+  end
+
+  def self.set_default_key_bindings(config)
+    {
+      [224, 72] => :ed_prev_history, # ↑
+      [224, 80] => :ed_next_history, # ↓
+      [224, 77] => :ed_next_char,    # →
+      [224, 75] => :ed_prev_char,    # ←
+      [224, 83] => :key_delete,      # Del
+      [224, 71] => :ed_move_to_beg,  # Home
+      [224, 79] => :ed_move_to_end,  # 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
+    }.each_pair do |key, func|
+      config.add_default_key_binding_by_keymap(:emacs, key, func)
+      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
+      config.add_default_key_binding_by_keymap(:vi_command, key, func)
+    end
+
+    {
+      [27, 32] => :em_set_mark,             # M-<space>
+      [24, 24] => :em_exchange_mark,        # C-x C-x
+    }.each_pair do |key, func|
+      config.add_default_key_binding_by_keymap(:emacs, key, func)
+    end
+  end
 
   if defined? JRUBY_VERSION
     require 'win32api'
@@ -69,13 +86,35 @@ class Reline::Windows
     end
   end
 
+  VK_RETURN = 0x0D
   VK_MENU = 0x12
   VK_LMENU = 0xA4
   VK_CONTROL = 0x11
   VK_SHIFT = 0x10
+
+  KEY_EVENT = 0x01
+  WINDOW_BUFFER_SIZE_EVENT = 0x04
+
+  CAPSLOCK_ON = 0x0080
+  ENHANCED_KEY = 0x0100
+  LEFT_ALT_PRESSED = 0x0002
+  LEFT_CTRL_PRESSED = 0x0008
+  NUMLOCK_ON = 0x0020
+  RIGHT_ALT_PRESSED = 0x0001
+  RIGHT_CTRL_PRESSED = 0x0004
+  SCROLLLOCK_ON = 0x0040
+  SHIFT_PRESSED = 0x0010
+
+  VK_END = 0x23
+  VK_HOME = 0x24
+  VK_LEFT = 0x25
+  VK_UP = 0x26
+  VK_RIGHT = 0x27
+  VK_DOWN = 0x28
+  VK_DELETE = 0x2E
+
   STD_INPUT_HANDLE = -10
   STD_OUTPUT_HANDLE = -11
-  WINDOW_BUFFER_SIZE_EVENT = 0x04
   FILE_TYPE_PIPE = 0x0003
   FILE_NAME_INFO = 2
   @@getwch = Win32API.new('msvcrt', '_getwch', [], 'I')
@@ -89,11 +128,31 @@ class Reline::Windows
   @@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
   @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
   @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
-  @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
+  @@ReadConsoleInputW = Win32API.new('kernel32', 'ReadConsoleInputW', ['L', 'P', 'L', 'P'], 'L')
   @@GetFileType = Win32API.new('kernel32', 'GetFileType', ['L'], 'L')
   @@GetFileInformationByHandleEx = Win32API.new('kernel32', 'GetFileInformationByHandleEx', ['L', 'I', 'P', 'L'], 'I')
   @@FillConsoleOutputAttribute = Win32API.new('kernel32', 'FillConsoleOutputAttribute', ['L', 'L', 'L', 'L', 'P'], 'L')
 
+  @@GetConsoleMode = Win32API.new('kernel32', 'GetConsoleMode', ['L', 'P'], 'L')
+  @@SetConsoleMode = Win32API.new('kernel32', 'SetConsoleMode', ['L', 'L'], 'L')
+  ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
+
+  private_class_method def self.getconsolemode
+    mode = "\000\000\000\000"
+    @@GetConsoleMode.call(@@hConsoleHandle, mode)
+    mode.unpack1('L')
+  end
+
+  private_class_method def self.setconsolemode(mode)
+    @@SetConsoleMode.call(@@hConsoleHandle, mode)
+  end
+
+  @@legacy_console = (getconsolemode() & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0)
+  #if @@legacy_console
+  #  setconsolemode(getconsolemode() | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+  #  @@legacy_console = (getconsolemode() & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0)
+  #end
+
   @@input_buf = []
   @@output_buf = []
 
@@ -121,78 +180,78 @@ class Reline::Windows
     name =~ /(msys-|cygwin-).*-pty/ ? true : false
   end
 
-  def self.getwch
-    unless @@input_buf.empty?
-      return @@input_buf.shift
-    end
-    while @@kbhit.call == 0
-      sleep(0.001)
-    end
-    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
+  def self.process_key_event(repeat_count, virtual_key_code, virtual_scan_code, char_code, control_key_state)
+    char = char_code.chr(Encoding::UTF_8)
+    if char_code == 0x0D and control_key_state.anybits?(LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED | SHIFT_PRESSED)
+      # It's treated as Meta+Enter on Windows.
+      @@output_buf.push("\e".ord)
+      @@output_buf.push(char_code)
+    elsif char_code == 0x20 and control_key_state.anybits?(LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+      # It's treated as Meta+Space on Windows.
+      @@output_buf.push("\e".ord)
+      @@output_buf.push(char_code)
+    elsif control_key_state.anybits?(LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)
+      @@output_buf.push("\e".ord)
+      @@output_buf.concat(char.bytes)
+    elsif control_key_state.anybits?(ENHANCED_KEY)
+      case virtual_key_code # Emulate getwch() key sequences.
+      when VK_END
+        @@output_buf.push(0, 79)
+      when VK_HOME
+        @@output_buf.push(0, 71)
+      when VK_LEFT
+        @@output_buf.push(0, 75)
+      when VK_UP
+        @@output_buf.push(0, 72)
+      when VK_RIGHT
+        @@output_buf.push(0, 77)
+      when VK_DOWN
+        @@output_buf.push(0, 80)
+      when VK_DELETE
+        @@output_buf.push(0, 83)
       end
-      begin
-        bytes = ret.chr(Encoding::UTF_8).bytes
-        @@input_buf.push(*bytes)
-      rescue Encoding::UndefinedConversionError
-        @@input_buf << ret
-        @@input_buf << @@getwch.call if ret == 224
+    elsif char_code == 0 and control_key_state != 0
+      # unknown
+    else
+      case virtual_key_code
+      when VK_RETURN
+        @@output_buf.push("\n".ord)
+      else
+        @@output_buf.concat(char.bytes)
       end
     end
-    @@input_buf.shift
   end
 
-  def self.getc
+  def self.check_input_event
     num_of_events = 0.chr * 8
-    while @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) != 0 and num_of_events.unpack('L').first > 0
+    while @@output_buf.empty? #or true
+      next if @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) == 0 or 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
+      if @@ReadConsoleInputW.(@@hConsoleInputHandle, input_record, 1, read_event) != 0
         event = input_record[0, 2].unpack('s*').first
-        if event == WINDOW_BUFFER_SIZE_EVENT
+        case event
+        when WINDOW_BUFFER_SIZE_EVENT
           @@winch_handler.()
+        when KEY_EVENT
+          key_down = input_record[4, 4].unpack('l*').first
+          repeat_count = input_record[8, 2].unpack('s*').first
+          virtual_key_code = input_record[10, 2].unpack('s*').first
+          virtual_scan_code = input_record[12, 2].unpack('s*').first
+          char_code = input_record[14, 2].unpack('S*').first
+          control_key_state = input_record[16, 2].unpack('S*').first
+          is_key_down = key_down.zero? ? false : true
+          if is_key_down
+            process_key_event(repeat_count, virtual_key_code, virtual_scan_code, char_code, control_key_state)
+          end
         end
       end
     end
-    unless @@output_buf.empty?
-      return @@output_buf.shift
-    end
-    input = getwch
-    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
-      @@output_buf.push("\e".ord)
-      @@output_buf.push(input)
-    else
-      case input
-      when 0x00
-        meta = false
-        @@output_buf.push(input)
-        input = getwch
-        @@output_buf.push(*input)
-      when 0xE0
-        @@output_buf.push(input)
-        input = getwch
-        @@output_buf.push(*input)
-      when 0x03
-        @@output_buf.push(input)
-      else
-        @@output_buf.push(input)
-      end
-    end
-    if meta
-      "\e".ord
-    else
-      @@output_buf.shift
-    end
+  end
+
+  def self.getc
+    check_input_event
+    @@output_buf.shift
   end
 
   def self.ungetc(c)
@@ -258,6 +317,7 @@ class Reline::Windows
     cursor = csbi[4, 4].unpack('L').first
     written = 0.chr * 4
     @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
+    @@FillConsoleOutputAttribute.call(@@hConsoleHandle, 0, get_screen_size.last - cursor_pos.x, cursor, written)
   end
 
   def self.scroll_down(val)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -24,62 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yamatanooroti
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 description: Alternative GNU Readline or Editline implementation by pure Ruby.
 email:
 - aycabta@gmail.com
@@ -104,6 +48,7 @@ files:
 - 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
 - lib/reline/version.rb
@@ -128,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.17
 signing_key:
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.