terminal_rb 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76294a5517d1c24b4c85f855cf802ce01dd1fa574dfac92753edd78b7a8fd465
-  data.tar.gz: 3e95e7b5ae8f40a9e284cdd3abddbd5a77a70e0a4df40e0deed2702acaf2ed07
+  metadata.gz: e58a29a2a4369fa40b287a370939d976ecf75881a97478ce40056accc04459d0
+  data.tar.gz: 5629db5a425e272daf44a7474bd3ea871d9c458b8e263a6c933aaf596865711a
 SHA512:
-  metadata.gz: 99e9e190caea636278031df7116ce0fdaf15fa6fdf2c6c1912906862341eae25e3b6aacc77296aca15b833e4548cbad36edf7f41160fc313059c6ecbe472fb2a
-  data.tar.gz: 0b5cbc5ef6ed87179d6b74663607bec29c07ad53ca4fc7c1593577214e31d5b08281fa68a119be361eb4ce720420767d09690b5679ee2f6e43ef3061c40b7ec7
+  metadata.gz: 2023c65d76e3a28c0b1047ed62390f6e7bfacd8d45a9a6c204323f72e97bb8b52f37f682b0228c8d2574de9d86bddc689ff5b7592350636e303e5bb8fdea53cd
+  data.tar.gz: f5126d27a8c8ad09ed4a0da5c7e2f95f706bc6215bdcc259e757caa600c476d4e45c2f9999fb54063a8c0e9d71037ce5928f5a97ec499d1ca1e7b97864e4d2cd

data/README.md

@@ -4,7 +4,7 @@ Terminal.rb supports you with input and output on your terminal. Simple [BBCode]
 
 - Gem: [rubygems.org](https://rubygems.org/gems/terminal_rb)
 - Source: [codeberg.org](https://codeberg.org/mblumtritt/Terminal.rb)
-- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/0.19.0/Terminal)
+- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/0.20.0/Terminal)
 
 ## Features
 

data/examples/24bit-colors.rb

@@ -2,19 +2,18 @@
 
 require_relative '../lib/terminal'
 
-colors =
+Terminal.puts(
+  <<~TEXT,
+
+    ✅ [b bright_green]Terminal.rb[/b] — 24bit-Colors:[/]
+
+  TEXT
   Terminal::Ansi
     .named_colors
     .delete_if { /\d/.match?(_1) }
     .map! { "[on_#{_1}] [/] [#{_1}]#{_1.to_s.ljust(22)}[/]" }
     .each_slice(3)
     .map(&:join)
-    .join("\n")
-
-Terminal.puts <<~TEXT
-
-  ✅ [b bright_green]Terminal.rb[/b] — 24bit-Colors:[/]
-
-  #{colors}
-
-TEXT
+    .join("\n"),
+  nil
+)

data/examples/key-codes.rb

@@ -10,9 +10,6 @@ Terminal.puts <<~TEXT
 
 TEXT
 
-Terminal.hide_cursor
-at_exit { Terminal.show_cursor } # required for some terminals :/
-
 # if you like to have mouse position changes reported then use
 # 'mouse_move: true' in next line
 Terminal.on_key_event(mouse: true, focus: true, mouse_move: false) do |event|

data/lib/terminal/input/ansi.rb

@@ -7,29 +7,29 @@ module Terminal
     def on_key_event(mouse: false, mouse_move: false, focus: false)
       raise('already reading key events') if (@in_recursion += 1) != 1
       return unless block_given?
-      opts = __in_option(mouse, mouse_move, focus)
-      opts &&= @in.syswrite("#{opts}h") ? "#{opts}l" : nil
-      while (raw = @in.getch)
-        (yield(KeyEvent[raw]) ? next : break) if raw != "\e"
-        lesci = 0
-        while String === (nc = @in.read_nonblock(1, exception: false))
-          lesci = raw.size if nc == "\e"
-          raw << nc
+      opts = __input_option(mouse, mouse_move, focus)
+      STDIN.noecho do
+        opts &&= @in.syswrite("#{opts}h") ? "#{opts}l" : nil
+        while (raw = @in.getch)
+          (yield(KeyEvent[raw]) ? next : break) if raw != "\e"
+          while String === (nc = @in.read_nonblock(1, exception: false))
+            raw << nc
+          end
+          (yield(KeyEvent[raw]) ? next : break) if raw.rindex("\e") < 2
+          break unless raw[1..].split("\e").all? { yield(KeyEvent["\e#{_1}"]) }
         end
-        (yield(KeyEvent[raw]) ? next : break) if lesci < 2
-        break unless raw[1..].split("\e").all? { yield(KeyEvent["\e#{_1}"]) }
       end
     rescue IOError, SystemCallError
       __input_error
       false
     ensure
       @in_recursion -= 1
-      @in&.syswrite(opts) if opts
+      @in.syswrite(opts) if opts && @in
     end
 
     private
 
-    def __in_option(mouse, mouse_move, focus)
+    def __input_option(mouse, mouse_move, focus)
       opts = +(mouse ? '1000' : '')
       # highlight: '1001'
       # drag: '1002'

data/lib/terminal/input.rb

@@ -94,10 +94,12 @@ module Terminal
       return :legacy if im == 'legacy'
       return :dumb if im == 'dumb' || !STDIN.tty?
       con = IO.console
-      return :legacy if con.syswrite("\e[>1u\e[?u\e[c") != 12
-      inp = +''
-      inp << con.getch until inp.rindex('c')
-      return :legacy unless inp.include?("\e[?1u")
+      STDIN.noecho do
+        return :legacy if con.syswrite("\e[>1u\e[?u\e[c") != 12
+        inp = +''
+        inp << con.getch until inp.rindex('c')
+        return :legacy unless inp.include?("\e[?1u")
+      end
       at_exit do
         IO.console.syswrite("\e[<u")
       rescue StandardError

data/lib/terminal/output/ansi.rb

@@ -101,7 +101,11 @@ module Terminal
     def __init_tty
       require('io/console')
       @con = IO.console
-      Signal.trap('WINCH') { @size = nil } if Signal.list.key?('WINCH')
+      return unless Signal.list.key?('WINCH')
+      Signal.trap('WINCH') do
+        @size = nil
+        @on_resize&.call
+      end
     end
 
     private_class_method def self.extended(mod)

data/lib/terminal/output.rb

@@ -200,6 +200,14 @@ module Terminal
     #
     #   @return [Terminal] itself
 
+    # Define callback executed when terminal is resized
+    #
+    # @return [Terminal] itself
+    def on_resize(&block)
+      block ? @on_resize = block : @on_resize&.call
+      self
+    end
+
     # @!endgroup
 
     private

data/lib/terminal/text.rb

@@ -29,11 +29,12 @@ module Terminal
       # @return [Integer] display width
       def width(str, bbcode: true)
         return 0 if (str = bbcode ? Ansi.unbbcode(str) : str.to_s).empty?
-        str = str.encode(@encoding) if str.encoding != @encoding
         width = 0
-        str.scan(@scan_width) do |sp, gc|
+        (str.encoding == @encoding ? str : str.encode(@encoding)).scan(
+          @scan_width
+        ) do |space, gc|
           next width += char_width(gc) if gc
-          width += 1 if sp
+          width += 1 if space
         end
         width
       end
@@ -114,11 +115,7 @@ module Terminal
       # @return [Integer] width
       def max_line_width(*text, ignore_newline: false)
         return 0 if text.empty?
-        ret = 0
-        pairs(as_snippets(text, false, false, ignore_newline, Word)) do |_l, w|
-          ret = w if w > ret
-        end
-        ret
+        max_width_of(as_snippets(text, true, true, ignore_newline, Word))
       end
 
       private
@@ -209,6 +206,29 @@ module Terminal
         nil
       end
 
+      def max_width_of(snippets)
+        lws = false
+        ret = size = 0
+        snippets.each do |snippet|
+          if snippet == :space
+            next if size == 0
+            lws = true
+            next size += 1
+          end
+
+          if snippet == :nl || snippet == :hard_nl
+            size -= 1 if lws
+            ret = size if ret < size
+            lws = false
+            next size = 0
+          end
+
+          lws = false
+          size += snippet.size if Word === snippet
+        end
+        ret
+      end
+
       def pairs(snippets)
         line = @empty.dup
         size = 0
@@ -363,9 +383,9 @@ module Terminal
             next ret << (last = :hard_nl)
           end
 
-          txt = txt.encode(@encoding) if txt.encoding != @encoding
-
-          txt.scan(@scan_snippet) do |nl, csi, osc, space, gc|
+          (txt.encoding == @encoding ? txt : txt.encode(@encoding)).scan(
+            @scan_snippet
+          ) do |nl, csi, osc, space, gc|
             if gc
               next last.add(gc, char_width(gc)) if word_class === last
               next ret << (last = word_class.new(gc, char_width(gc)))

data/lib/terminal/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -55,7 +55,7 @@ licenses:
 metadata:
   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.19.0
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.20.0
   rubygems_mfa_required: 'true'
   yard.run: yard
 rdoc_options: []
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Fast terminal access with ANSI, CSIu, mouse events, BBCode, word-wise line
   break support and much more.