terminal_rb 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d95e0e2e8423c8bbb464019e8282bb589c5bc8fb02298ec529ff58e9ee67bb
-  data.tar.gz: bbb98fffca9d97e21a5440644a1ddc0b91dc60e945af287da60dbab07b6ae63b
+  metadata.gz: cf8062e89f52459ef6bb5e6e61d6142986d43dbec76d223ab16656146e3467a1
+  data.tar.gz: 3656dd6c10b1c2a88697c485daa12d345cd48a128f7c63da92f97f1395780e8c
 SHA512:
-  metadata.gz: 44d16eba18775b6bbd208d19288bd44265a30301607136cafb959e985e59248820829383dd714c62f235880d30c46f4ce0a86a46d46dd8b6f05e042f73068c20
-  data.tar.gz: 80b0d17ece194d7fa8b36080314c21683bb1d7739344529bbf47c7da8afbc27c5c910a860393bf348edaef2a27e590d2b2505ab7d7d8934ae349eed152653144
+  metadata.gz: bc2fb13b0b73a329cc4d60c8af62c0e347b551e3ed3d72eac5be4fbbdd823830bc8410487145a49833d2c34f33c2a7d2d5f7bb250ad1608ed384a49f31a4e139
+  data.tar.gz: 874df65c622227f93c081a8d6ff26b18f380ab89a4ffbe76f38b23bc25c81ee33287179b0327c274d5e4a9c30abdf25ebac2fd535b6ea016da296b12d7cd7f14

data/lib/terminal/input/csiu_keys.rb

@@ -28,14 +28,14 @@ module Terminal
         # ESC [ 1 ; <modifier> [~ABCDEFHPQRS]
         return if esc.size < 5
         key = @csi1[esc[-1].ord] or return
-        return key if (mod = esc[3..-2].join.to_i - 1) < 1 # no mod
+        return key if (mod = esc[3..-2].join.to_i - 1) < 1
         (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
 
       def with_modifier(esc)
-        return yield(esc[1..-2].join.to_i) if (idx = esc.index(';')).nil? # no mod
+        return yield(esc[1..-2].join.to_i) if (idx = esc.index(';')).nil?
         key = yield(esc[1..(idx - 1)].join.to_i) or return
-        return key if (mod = esc[(idx + 1)..-2].join.to_i - 1) < 1 # no mod
+        return key if (mod = esc[(idx + 1)..-2].join.to_i - 1) < 1
         (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
     end

data/lib/terminal/input/legacy_keys.rb

@@ -62,7 +62,15 @@ module Terminal
       0x15 => 'F10',
       0x17 => 'F11',
       0x18 => 'F12',
-      0x1b => 'Enter'
+      0x19 => 'F13',
+      0x1a => 'F14',
+      0x1b => 'Enter',
+      0x1c => 'F15',
+      0x1d => 'F16',
+      0x1f => 'F17',
+      0x20 => 'F18',
+      0x21 => 'F19',
+      0x22 => 'F20'
     }.compare_by_identity.freeze
 
     @ss3 = {

data/lib/terminal/input.rb

@@ -33,7 +33,7 @@ module Terminal
       return if input_mode == :error
       return read_dumb(mode == :both) if @input_mode == :dumb
       return read_tty&.join if mode == :raw
-      key, name = @input_mode == :csi_u ? read_csiu : read_legacy
+      key, name = read_tty_with(@input_mode == :csi_u ? CSIuKeys : LegacyKeys)
       return unless key
       mode == :both ? [key, name] : name || key
     end
@@ -48,42 +48,22 @@ module Terminal
       DumbKeys.key_name("\x05")
     end
 
-    def read_legacy
+    def read_tty_with(trans)
       key, *esc = read_tty
       return unless key
-      return key, LegacyKeys.key_name(key) if esc.empty?
-      [key + esc.join, LegacyKeys.translate(esc)]
-    end
-
-    def read_csiu
-      unless @csiu_set
-        if _write("\e[>1u").nil?
-          @input_mode = :legacy
-          return read_legacy
-        end
-        @csiu_set = true
-        at_exit { _write("\e[<u") if @csiu_set }
-      end
-      key, *esc = read_tty
-      return unless key
-      return key, CSIuKeys.key_name(key) if esc.empty?
-      [key + esc.join, CSIuKeys.translate(esc)]
+      return key, trans.key_name(key) if esc.empty?
+      [key + esc.join, trans.translate(esc)]
     end
 
     def find_input_mode
-      case ENV['INPUT_MODE']
-      when 'dumb', 'DUMB'
-        :dumb
-      when 'legacy', 'LEGACY'
-        :legacy
-      when 'csi_u', 'CSI_U', 'csiu', 'CSIU'
+      im = ENV['INPUT_MODE']
+      return :dumb if im == 'dumb' || !STDIN.tty?
+      return :legacy if im == 'legacy'
+      if ansi? && _write("\e[>1u\e[?u\e[c") && csi_u?
+        at_exit { _write("\e[<u") }
         :csi_u
       else
-        return :dumb unless STDIN.tty?
-        STDIN.sync = true
-        return :legacy if !ansi? || _write("\e[>1u\e[?u\e[c").nil? || !csi_u?
-        _write("\e[<u")
-        :csi_u
+        :legacy
       end
     rescue Interrupt
       :legacy
@@ -93,28 +73,25 @@ module Terminal
 
     def csi_u?
       # iTerm2 returns result in two chunks :/
-      ret = false
+      found = false
       while true
-        break if (str = STDIN.getch.dup) != "\e"
-        while (nc = STDIN.read_nonblock(1, exception: false))
-          String === nc ? str << nc : break
-        end
-        ret = true if str.include?("\e[?1u")
-        break if str[-1] == 'c'
+        inp = read_tty&.join or return false
+        found = true if inp.include?("\e[?1u")
+        return found if inp[-1] == 'c'
       end
-      ret
     end
 
-    # nil, nil => error; key, [] => simple key; "\e", [] => esc sequence
     def read_tty
-      key = [STDIN.getch]
-      return key if key[0] != "\e"
-      while (nc = STDIN.read_nonblock(1, exception: false))
-        String === nc ? key << nc : break
+      STDIN.raw do |raw|
+        key = [raw.getch]
+        return key if key[0] != "\e"
+        while (nc = raw.read_nonblock(1, exception: false))
+          String === nc ? key << nc : break
+        end
+        key
       end
-      key
     rescue Interrupt
-      key
+      nil
     rescue IOError, SystemCallError
       @input_mode = :error
       nil

data/lib/terminal/version.rb

@@ -2,5 +2,5 @@
 
 module Terminal
   # The version number of the gem.
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -49,7 +49,7 @@ metadata:
   rubygems_mfa_required: 'true'
   source_code_uri: https://codeberg.org/mblumtritt/Terminal.rb
   bug_tracker_uri: https://codeberg.org/mblumtritt/Terminal.rb/issues
-  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.11.0/Terminal
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.11.1/Terminal
 rdoc_options: []
 require_paths:
 - lib