reline 0.0.0 → 0.0.1

data/lib/reline/unicode.rb

@@ -55,6 +55,17 @@ class Reline::Unicode
     end
   end
 
+  def self.escape_for_print(str)
+    str.chars.map! { |gr|
+      escaped = EscapedPairs[gr.ord]
+      if escaped && gr != -"\n" && gr != -"\t"
+        escaped
+      else
+        gr
+      end
+    }.join
+  end
+
   def self.get_mbchar_width(mbchar)
     case mbchar.encode(Encoding::UTF_8)
     when *EscapedChars # ^ + char, such as ^M, ^H, ^[, ...
@@ -177,6 +188,107 @@ class Reline::Unicode
     [byte_size, width]
   end
 
+  def self.ed_transpose_words(line, byte_pointer)
+    right_word_start = nil
+    size = get_next_mbchar_size(line, byte_pointer)
+    mbchar = line.byteslice(byte_pointer, size)
+    if size.zero?
+      # ' aaa bbb [cursor]'
+      byte_size = 0
+      while 0 < (byte_pointer + byte_size)
+        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
+        byte_size -= size
+      end
+      while 0 < (byte_pointer + byte_size)
+        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+        byte_size -= size
+      end
+      right_word_start = byte_pointer + byte_size
+      byte_size = 0
+      while line.bytesize > (byte_pointer + byte_size)
+        size = get_next_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+        byte_size += size
+      end
+      after_start = byte_pointer + byte_size
+    elsif mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
+      # ' aaa bb[cursor]b'
+      byte_size = 0
+      while 0 < (byte_pointer + byte_size)
+        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+        byte_size -= size
+      end
+      right_word_start = byte_pointer + byte_size
+      byte_size = 0
+      while line.bytesize > (byte_pointer + byte_size)
+        size = get_next_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+        byte_size += size
+      end
+      after_start = byte_pointer + byte_size
+    else
+      byte_size = 0
+      while (line.bytesize - 1) > (byte_pointer + byte_size)
+        size = get_next_mbchar_size(line, byte_pointer + byte_size)
+        mbchar = line.byteslice(byte_pointer + byte_size, size)
+        break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
+        byte_size += size
+      end
+      if (byte_pointer + byte_size) == (line.bytesize - 1)
+        # ' aaa bbb [cursor] '
+        after_start = line.bytesize
+        while 0 < (byte_pointer + byte_size)
+          size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+          mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+          break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
+          byte_size -= size
+        end
+        while 0 < (byte_pointer + byte_size)
+          size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+          mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+          break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+          byte_size -= size
+        end
+        right_word_start = byte_pointer + byte_size
+      else
+        # ' aaa [cursor] bbb '
+        right_word_start = byte_pointer + byte_size
+        while line.bytesize > (byte_pointer + byte_size)
+          size = get_next_mbchar_size(line, byte_pointer + byte_size)
+          mbchar = line.byteslice(byte_pointer + byte_size, size)
+          break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+          byte_size += size
+        end
+        after_start = byte_pointer + byte_size
+      end
+    end
+    byte_size = right_word_start - byte_pointer
+    while 0 < (byte_pointer + byte_size)
+      size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+      mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+      break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
+      byte_size -= size
+    end
+    middle_start = byte_pointer + byte_size
+    byte_size = middle_start - byte_pointer
+    while 0 < (byte_pointer + byte_size)
+      size = get_prev_mbchar_size(line, byte_pointer + byte_size)
+      mbchar = line.byteslice(byte_pointer + byte_size - size, size)
+      break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
+      byte_size -= size
+    end
+    left_word_start = byte_pointer + byte_size
+    [left_word_start, middle_start, right_word_start, after_start]
+  end
+
   def self.vi_big_forward_word(line, byte_pointer)
     width = 0
     byte_size = 0
@@ -396,7 +508,7 @@ class Reline::Unicode
     [byte_size, width]
   end
 
-  def self.ed_move_to_begin(line)
+  def self.vi_first_print(line)
     width = 0
     byte_size = 0
     while (line.bytesize - 1) > byte_size

data/lib/reline/version.rb

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

data/lib/reline/windows.rb

@@ -1,5 +1,56 @@
-module Reline
-  VK_LMENU = 0xA4
+require 'fiddle/import'
+
+class Reline::Windows
+  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
+  }.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
+
+    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
+  end
+
+  VK_MENU = 0x12
+  VK_SHIFT = 0x10
   STD_OUTPUT_HANDLE = -11
   @@getwch = Win32API.new('msvcrt', '_getwch', [], 'I')
   @@kbhit = Win32API.new('msvcrt', '_kbhit', [], 'I')
@@ -12,7 +63,7 @@ module Reline
   @@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
   @@buf = []
 
-  def getwch
+  def self.getwch
     while @@kbhit.call == 0
       sleep(0.001)
     end
@@ -29,13 +80,18 @@ module Reline
     result
   end
 
-  def getc
+  def self.getc
     unless @@buf.empty?
       return @@buf.shift
     end
     input = getwch
-    alt = (@@GetKeyState.call(VK_LMENU) & 0x80) != 0
-    if input.size > 1
+    alt = (@@GetKeyState.call(VK_MENU) & 0x80) != 0
+    shift_enter = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0 && input.first == 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]
@@ -61,10 +117,14 @@ module Reline
     end
   end
 
+  def self.ungetc(c)
+    @@buf.unshift(c)
+  end
+
   def self.get_screen_size
     csbi = 0.chr * 24
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
-    csbi[0, 4].unpack('SS')
+    csbi[0, 4].unpack('SS').reverse
   end
 
   def self.cursor_pos
@@ -72,7 +132,7 @@ module Reline
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     x = csbi[4, 2].unpack('s*').first
     y = csbi[6, 4].unpack('s*').first
-    CursorPos.new(x, y)
+    Reline::CursorPos.new(x, y)
   end
 
   def self.move_cursor_column(val)
@@ -100,12 +160,12 @@ module Reline
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     cursor = csbi[4, 4].unpack('L').first
     written = 0.chr * 4
-    @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.first - cursor_pos.x, cursor, written)
+    @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
   end
 
   def self.scroll_down(val)
     return if val.zero?
-    scroll_rectangle = [0, val, get_screen_size.last, get_screen_size.first].pack('s4')
+    scroll_rectangle = [0, val, get_screen_size.first, get_screen_size.last].pack('s4')
     destination_origin = 0 # y * 65536 + x
     fill = [' '.ord, 0].pack('SS')
     @@ScrollConsoleScreenBuffer.call(@@hConsoleHandle, scroll_rectangle, nil, destination_origin, fill)
@@ -121,12 +181,12 @@ module Reline
     raise NotImplementedError
   end
 
-  def prep
+  def self.prep
     # do nothing
     nil
   end
 
-  def deprep(otio)
+  def self.deprep(otio)
     # do nothing
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,8 @@ files:
 - lib/reline.rb
 - lib/reline/ansi.rb
 - lib/reline/config.rb
+- lib/reline/general_io.rb
+- lib/reline/history.rb
 - lib/reline/key_actor.rb
 - lib/reline/key_actor/base.rb
 - lib/reline/key_actor/emacs.rb
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.