io-console 0.5.7-java → 0.5.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1493164f1796b8bd1a67e9263d12de32cce6fc7135c6f4eb3603ea19ee3d1152
-  data.tar.gz: a1c28fb7e965635d4b039aa5ff672833818116885daae8a6b3224d153144df2f
+  metadata.gz: a32a2bab33c5cdfeb72667a0e16580d322c3a6fa7127206ad6ec8f033b1fd503
+  data.tar.gz: eb107f1e5891acf99dcaf0bd6f3a664cd9f7911ace5dff034925aa7ad7e3752b
 SHA512:
-  metadata.gz: 1a8a824c8cdefab44e2e6276faedc1911e035f9fccf2853e09fe2ae35484fdf9aaa61bbfee474aac55b41d7cdd2f210037fc13c188ba453fb2c2d92cdc59799a
-  data.tar.gz: 82cdc2b38f9ab9975766cfd36920373fb7af1fd9bb1fb6166963551a0ffc2feb03f252d9fd57fd3864b5314f60821098bfab9ad9cdd678d222859eb8b5057388
+  metadata.gz: 8b348ea503826ebe463dde1188036c281dd5c15b433d4a2b3ada790a150022f0e71570d05ff0b59a57806ec4fdd1968986f9cc8ec3cd5a48ca3fa1499dcda1b7
+  data.tar.gz: 7e0facb56e8727a66eff702812adbcbae18f79d314342c1d6c29860562a3b174778c08b629d651c1331d4ba46d5a02e08bf8197c42d8caaa28055472658bd615

data/lib/io/console.rb

@@ -0,0 +1,5 @@
+if RUBY_ENGINE == 'ruby'
+  require_relative 'console.so'
+else
+  require_relative 'console/ffi/console'
+end

data/{jruby/io/console → lib/io/console/ffi}/bsd_console.rb

@@ -138,7 +138,7 @@ module IO::LibC
       :c_oflag, :tcflag_t,
       :c_cflag, :tcflag_t,
       :c_lflag, :tcflag_t,
-      :cc_c, [ :uchar, NCCS ],
+      :c_cc, [ :uchar, NCCS ],
       :c_ispeed, :speed_t,
       :c_ospeed, :speed_t
   end

data/{jruby/io/console → lib/io/console/ffi}/common.rb

@@ -1,7 +1,7 @@
 # Methods common to all backend impls
 class IO
-  def getch(*)
-    raw do
+  def getch(*, **opts)
+    raw(**opts) do
       getc
     end
   end

data/{jruby/io → lib/io/console/ffi}/console.rb

@@ -21,11 +21,11 @@
 
 require 'rbconfig'
 
-require_relative 'console/common'
+require_relative 'common'
 
 # If Windows, always use the stub version
 if RbConfig::CONFIG['host_os'] =~ /(mswin)|(win32)|(ming)/
-  require_relative 'console/stub_console'
+  require_relative 'stub_console'
 else
 
   # If Linux or BSD, try to load the native version
@@ -33,7 +33,7 @@ else
     begin
 
       # Attempt to load the native Linux and BSD console logic
-      require_relative 'console/native_console'
+      require_relative 'native_console'
       ready = true
 
     rescue Exception => ex
@@ -48,7 +48,7 @@ else
   if !ready
     begin
 
-      require_relative 'console/stty_console'
+      require_relative 'stty_console'
       ready = true
 
     rescue Exception
@@ -61,7 +61,7 @@ else
 
   # If still not ready, just use stubbed version
   if !ready
-    require_relative 'console/stub_console'
+    require_relative 'stub_console'
   end
 
 end

data/{jruby/io/console → lib/io/console/ffi}/linux_console.rb

@@ -171,7 +171,7 @@ module IO::LibC
       :c_cflag, :tcflag_t,
       :c_lflag, :tcflag_t,
       :c_line, :uchar,
-      :cc_c, [ :uchar, NCCS ],
+      :c_cc, [ :uchar, NCCS ],
       :c_ispeed, :speed_t,
       :c_ospeed, :speed_t
   end

data/{jruby/io/console → lib/io/console/ffi}/native_console.rb

@@ -13,38 +13,47 @@ class IO
   def ttymode
     termios = LibC::Termios.new
     if LibC.tcgetattr(self.fileno, termios) != 0
-      raise SystemCallError.new("tcgetattr", FFI.errno)
+      raise SystemCallError.new(path, FFI.errno)
     end
 
     if block_given?
       yield tmp = termios.dup
-      if LibC.tcsetattr(self.fileno, LibC::TCSADRAIN, tmp) != 0
-        raise SystemCallError.new("tcsetattr", FFI.errno)
+      if LibC.tcsetattr(self.fileno, LibC::TCSANOW, tmp) != 0
+        raise SystemCallError.new(path, FFI.errno)
       end
     end
     termios
   end
   private :ttymode
 
-  def ttymode_yield(block, &setup)
+  def ttymode_yield(block, **opts, &setup)
     begin
-      orig_termios = ttymode { |t| setup.call(t) }
+      orig_termios = ttymode { |t| setup.call(t, **opts) }
       block.call(self)
     ensure
-      if orig_termios && LibC.tcsetattr(self.fileno, LibC::TCSADRAIN, orig_termios) != 0
-        raise SystemCallError.new("tcsetattr", FFI.errno)
+      if orig_termios && LibC.tcsetattr(self.fileno, LibC::TCSANOW, orig_termios) != 0
+        raise SystemCallError.new(path, FFI.errno)
       end
     end
   end
   private :ttymode_yield
 
-  TTY_RAW = Proc.new do |t|
+  TTY_RAW = Proc.new do |t, min: 1, time: nil, intr: nil|
     LibC.cfmakeraw(t)
     t[:c_lflag] &= ~(LibC::ECHOE|LibC::ECHOK)
+    if min >= 0
+      t[:c_cc][LibC::VMIN] = min
+    end
+    t[:c_cc][LibC::VTIME] = (time&.to_i || 0) * 10
+    if intr
+      t[:c_iflag] |= LibC::BRKINT
+      t[:c_lflag] |= LibC::ISIG
+      t[:c_oflag] |= LibC::OPOST
+    end
   end
 
-  def raw(*, &block)
-    ttymode_yield(block, &TTY_RAW)
+  def raw(*, **kwargs, &block)
+    ttymode_yield(block, **kwargs, &TTY_RAW)
   end
 
   def raw!(*)
@@ -93,13 +102,25 @@ class IO
   end
 
   def winsize=(size)
+    size = size.to_ary unless size.kind_of?(Array)
+    sizelen = size.size
+
+    if sizelen != 2 && sizelen != 4
+      raise ArgumentError.new("wrong number of arguments (given #{sizelen}, expected 2 or 4)")
+    end
+
+    row, col, xpixel, ypixel = size
+
     ws = LibC::Winsize.new
     if LibC.ioctl(self.fileno, LibC::TIOCGWINSZ, :pointer, ws.pointer) != 0
       raise SystemCallError.new("ioctl(TIOCGWINSZ)", FFI.errno)
     end
 
-    ws[:ws_row] = size[0]
-    ws[:ws_col] = size[1]
+    ws[:ws_row] = row
+    ws[:ws_col] = col
+    ws[:ws_xpixel] = xpixel&.to_i || 0
+    ws[:ws_ypixel] = ypixel&.to_i || 0
+
     if LibC.ioctl(self.fileno, LibC::TIOCSWINSZ, :pointer, ws.pointer) != 0
       raise SystemCallError.new("ioctl(TIOCSWINSZ)", FFI.errno)
     end
@@ -117,6 +138,80 @@ class IO
     raise SystemCallError.new("tcflush(TCIOFLUSH)", FFI.errno) unless LibC.tcflush(self.fileno, LibC::TCIOFLUSH) == 0
   end
 
+  def cursor
+    raw do
+      syswrite "\e[6n"
+
+      return nil if getbyte != 0x1b
+      return nil if getbyte != ?[.ord
+
+      num = 0
+      result = []
+
+      while b = getbyte
+        c = b.to_i
+        if c == ?;.ord
+          result.push num
+          num = 0
+        elsif c >= ?0.ord && c <= ?9.ord
+          num = num * 10 + c - ?0.ord
+          #elsif opt && c == opt
+        else
+          last = c
+          result.push num
+          b = last.chr
+          return nil unless b == ?R
+          break
+        end
+      end
+
+      result.map(&:pred)
+    end
+  end
+
+  def cursor=(pos)
+    pos = pos.to_ary if !pos.kind_of?(Array)
+
+    raise "expected 2D coordinates" unless pos.size == 2
+
+    x, y = pos
+    syswrite(format("\x1b[%d;%dH", x + 1, y + 1))
+
+    self
+  end
+
+  def cursor_down(n)
+    raw do
+      syswrite "\x1b[#{n}B"
+    end
+
+    self
+  end
+
+  def cursor_right(n)
+    raw do
+      syswrite "\x1b[#{n}C"
+    end
+
+    self
+  end
+
+  def cursor_left(n)
+    raw do
+      syswrite "\x1b[#{n}D"
+    end
+
+    self
+  end
+
+  def cursor_up(n)
+    raw do
+      syswrite "\x1b[#{n}A"
+    end
+
+    self
+  end
+
   # TODO: Windows version uses "conin$" and "conout$" instead of /dev/tty
   def self.console(sym = nil, *args)
     raise TypeError, "expected Symbol, got #{sym.class}" unless sym.nil? || sym.kind_of?(Symbol)
@@ -141,8 +236,13 @@ class IO
       end
     end
 
-    if !con && $stdin.tty?
-      con = File.open('/dev/tty', 'r+')
+    if !con
+      begin
+        con = File.open('/dev/tty', 'r+')
+      rescue
+        return nil
+      end
+
       con.sync = true
       @console = con
     end

data/{jruby/io/console → lib/io/console/ffi}/stty_console.rb

@@ -68,7 +68,20 @@ class IO
   end
 
   def winsize=(size)
-    stty("rows #{size[0]} cols #{size[1]}")
+    size = size.to_ary unless size.kind_of?(Array)
+    sizelen = size.size
+
+    if sizelen != 2 && sizelen != 4
+      raise ArgumentError.new("wrong number of arguments (given #{sizelen}, expected 2 or 4)")
+    end
+
+    row, col, xpixel, ypixel = size
+
+    if sizelen == 4
+      warn "stty io/console does not support pixel winsize"
+    end
+
+    stty("rows #{row} cols #{col}")
   end
 
   def iflush

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-console
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: java
 authors:
 - Nobu Nakada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies: []
 description: add console capabilities to IO instances.
 email: nobu@ruby-lang.org
@@ -18,13 +18,14 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- jruby/io/console.rb
-- jruby/io/console/bsd_console.rb
-- jruby/io/console/common.rb
-- jruby/io/console/linux_console.rb
-- jruby/io/console/native_console.rb
-- jruby/io/console/stty_console.rb
-- jruby/io/console/stub_console.rb
+- lib/io/console.rb
+- lib/io/console/ffi/bsd_console.rb
+- lib/io/console/ffi/common.rb
+- lib/io/console/ffi/console.rb
+- lib/io/console/ffi/linux_console.rb
+- lib/io/console/ffi/native_console.rb
+- lib/io/console/ffi/stty_console.rb
+- lib/io/console/ffi/stub_console.rb
 - lib/io/console/size.rb
 homepage: https://github.com/ruby/io-console
 licenses:
@@ -35,7 +36,6 @@ metadata:
 post_install_message:
 rdoc_options: []
 require_paths:
-- jruby
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: