terminal_rb 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6f4c3e8cfa6ca602f831ef011a146ff0f70d77d9a0da4a7a37a9768e52da39
-  data.tar.gz: 73f1ce0355077b7803c7c03924aaa764e8dac2f05e2534a653f37ba4b7d32b27
+  metadata.gz: 82d95e0e2e8423c8bbb464019e8282bb589c5bc8fb02298ec529ff58e9ee67bb
+  data.tar.gz: bbb98fffca9d97e21a5440644a1ddc0b91dc60e945af287da60dbab07b6ae63b
 SHA512:
-  metadata.gz: 2e65c5d198050d41671d57fb5a60c67efd0d4f22c4da71cb4253e8260481fa5c0bc32713be85bf4d1c14a3e5eb7ad886f088ff78418059197b89bf685615a152
-  data.tar.gz: 9376328d7d488c039ce14411061ee41f4f46efa9ee244c33481f03a855bd6861e871248f3e5faee2b07826b09646e3789a09fd3e2398784c801d527d784114bf
+  metadata.gz: 44d16eba18775b6bbd208d19288bd44265a30301607136cafb959e985e59248820829383dd714c62f235880d30c46f4ce0a86a46d46dd8b6f05e042f73068c20
+  data.tar.gz: 80b0d17ece194d7fa8b36080314c21683bb1d7739344529bbf47c7da8afbc27c5c910a860393bf348edaef2a27e590d2b2505ab7d7d8934ae349eed152653144

data/lib/terminal/ansi.rb

@@ -462,14 +462,7 @@ module Terminal
         }K"
       end
 
-      # Set window title.
-      # This is not widely supported.
-      #
-      # @param [#to_s] title text
-      # @return (see cursor_up)
-      def title(title) = "\e]2;#{title}\a"
-
-      # Set  tab title.
+      # Set (tab) title.
       # This is not widely supported; works for
       # Hyper,
       # iTerm2,
@@ -478,9 +471,9 @@ module Terminal
       # Tabby,
       # WezTerm.
       #
-      # @param (see title)
+      # @param [#to_s] title text
       # @return (see cursor_up)
-      def tab_title(title) = "\e]0;#{title}\a"
+      def title(title) = "\e]0;#{title}\a"
 
       # Create a hyperlink.
       # This is not widely supported; works for
@@ -677,15 +670,26 @@ module Terminal
     LINE_ERASE_PREV = "#{cursor_prev_line(nil)}#{LINE_ERASE}".freeze
 
     # @comment seems not widely supported:
-    #   doubled!? def cursor_column(column = 1) = "\e[#{column}`"
-    #   doubled!? def cursor_row(row = 1) = "\e[#{row}d"
+    #   doubled: def cursor_column(column = 1) = "\e[#{column}`"
+    #   doubled: def cursor_row(row = 1) = "\e[#{row}d"
+    #   doubled: def cursor_pos(row, col) = "\e[#{row};#{col}f"
+    #
     #   def cursor_column_rel(columns = 1) = "\e[#{columns}a"
     #   def cursor_row_rel(rows = 1) = "\e[#{rows}e"
     #   def cursor_tab(count = 1) = "\e[#{column}I"
     #   def cursor_reverse_tab(count = 1) = "\e[#{count}Z"
+    #
+    #   def lines_insert(count = 1) = "\e[#{count}L"
+    #   def lines_delete(count = 1) = "\e[#{count}M"
+    #
+    #   def chars_insert_spaces(count = 1) = "\e[#{count}@"
     #   def chars_delete(count = 1) = "\e[#{count}P"
     #   def chars_erase(count = 1) = "\e[#{count}X"
+    #
+    #   def chars_repeat_last(count = 1) = "\e[#{count}b"
+    #
     #   def notify(title) = "\e]9;#{title}\a"
+    #
     #   def set_scroll_region(top = nil, bottom = nil) = "\e[#{top};#{bottom}r"
 
     # @comment TODO:
@@ -695,5 +699,22 @@ module Terminal
     #   https://sw.kovidgoyal.net/kitty/color-stack
     #   https://sw.kovidgoyal.net/kitty/deccara
     #   https://sw.kovidgoyal.net/kitty/clipboard
+
+    # @comment other:
+    #   "\eE" same as "\r\n"
+    #   "\eD" same as "\n" but preserves X coord
+    #   "\eM" reverse "\n"
+    #   "\e[6n" report Cursor Position as "ESC \[ row ; col R"
+    #   "\e[21t report window’s title as ESC ] l title ESC \"
+    #   "\e[?Xl" set mouse mode "X":
+    #     9: X10_MOUSE
+    #     1000: VT200_MOUSE
+    #     1002: BTN_EVENT_MOUSE
+    #     1003: ANY_EVENT_MOUSE
+    #     1004: FOCUS_EVENT_MOUSE
+    #     1005: Xterm’s UTF8
+    #     1006: Xterm’s CSI-style
+    #     1015: Urxvt’s CSI-style
+    #   "\e[?Xl" reset mouse mode "X"
   end
 end

data/lib/terminal/input/csiu_keys.rb

@@ -3,83 +3,50 @@
 module Terminal
   module CSIuKeys
     class << self
-      def [](key)
-        return ORD[key.ord] if key.size == 1
-        return if key[0] != "\e"
-        return C0_LEGACY[key[1].ord] if key.size == 2 # ESC ?
-        return csi(key) if key[1] == '['
-        SS3[key[2].ord] if key[1] == 'O' && key.size == 3 # ESC O ?
+      def key_name(key)
+        @key_name[key.ord] if key.size == 1
       end
 
-      private
-
-      def csi(key)
-        type = key[-1]
-        return unicode(key) if type == 'u' # ESC [ ? u
-        return legacy(key) if type == '~' # ESC [ ? ; <modifier> ~
-        if key.size == 3 # ESC [ ?
-          ord = type.ord
-          return ord == 0x5a ? 'Shift+Tab' : SS3[ord]
-        end
-        return if key.size < 5
-        return unless key.start_with?("\e[1;")
-        # ESC [ 1 ; <modifier> ?
-        name = SS3[type.ord] or return
-        mod = key[4..-2]
-        mod.empty? ? name : modifier(name, mod.to_i - 1)
-      end
-
-      def unicode(key)
-        with_modifier(key) do |ord|
-          ORD[ord] || UNICODE_ORD[ord] || ord.chr(Encoding::UTF_8)
+      def translate(esc)
+        return if esc[0] != '[' # ESC [ ...
+        return @csi1[esc[1].ord] if esc.size == 2 # ESC [ ?
+        return csi1(esc) if esc[1] == '1' && esc[2] == ';'
+        if esc[-1] == '~'
+          # ESC [ <code> ~
+          # ESC [ <code> ; <modifier> ~
+          return with_modifier(esc) { @csi[_1] }
         end
+        return if esc[-1] != 'u'
+        # ESC [ <code> u
+        # ESC [ <code> ; <modifier> u
+        with_modifier(esc) { @csiu[_1] || _1.chr(Encoding::UTF_8) }
       end
 
-      def legacy(key)
-        with_modifier(key) do |ord|
-          return 'F3' if ord == 13
-          ord == 57_427 ? 'KpBegin' : ORD[ord]
-        end
-      end
+      private
 
-      def with_modifier(key)
-        code, mod = key[2..-2].split(';', 2)
-        code = yield(code.to_i) or return
-        mod ? modifier(code, mod.to_i - 1) : code
+      def csi1(esc)
+        # 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
+        (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
 
-      def modifier(name, mod)
-        (MODS.filter_map { |b, n| n if mod.allbits?(b) } << name).join('+')
+      def with_modifier(esc)
+        return yield(esc[1..-2].join.to_i) if (idx = esc.index(';')).nil? # no mod
+        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
+        (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
     end
 
-    ORD = {
+    @csiu = {
       0x02 => 'Ins',
-      0x03 => 'Del',
-      0x04 => 'Del',
-      0x05 => 'PageUp',
-      0x06 => 'PageDown',
-      0x07 => 'Home',
-      0x08 => 'End',
       0x09 => 'Tab',
-      0x0b => 'F1',
-      0x0c => 'F2',
       0x0d => 'Enter',
-      0x0e => 'F4',
-      0x0f => 'F5',
-      0x11 => 'F6',
-      0x12 => 'F7',
-      0x13 => 'F8',
-      0x14 => 'F9',
-      0x15 => 'F10',
-      0x17 => 'F11',
-      0x18 => 'F12',
       0x1b => 'Esc',
-      0x7f => 'Back'
-    }.compare_by_identity.freeze
-
-    # ESC [ ? u
-    UNICODE_ORD = {
+      0x20 => 'Space',
+      0x7f => 'Back',
       57_376 => 'F13',
       57_377 => 'F14',
       57_378 => 'F15',
@@ -118,7 +85,7 @@ module Terminal
       57_411 => 'KpMultiply',
       57_412 => 'KpSubtract',
       57_413 => 'KpAdd',
-      57_414 => 'KpEnter',
+      57_414 => 'Return', # 'KpEnter'
       57_415 => 'KpEqual',
       57_416 => 'KpSeparator',
       57_417 => 'KpLeft',
@@ -160,21 +127,7 @@ module Terminal
       57_454 => 'IsoLevel5Shift'
     }.compare_by_identity.freeze
 
-    # ESC ?
-    C0_LEGACY = {
-      0x00 => 'Ctrl+Space',
-      0x08 => 'Ctrl+Back',
-      0x09 => 'Alt+Tab',
-      0x0d => 'Alt+Enter',
-      0x1b => 'Alt+Esc',
-      0x20 => 'Alt+Space',
-      0x64 => 'Alt+Del',
-      0x7f => 'Alt+Back'
-    }.compare_by_identity.freeze
-
-    # ESC [ ?
-    # ESC [ O ?
-    SS3 = {
+    @csi1 = {
       0x41 => 'Up', # A
       0x42 => 'Down', # B
       0x43 => 'Right', # C
@@ -187,7 +140,50 @@ module Terminal
       0x53 => 'F4' # S
     }.compare_by_identity.freeze
 
-    MODS = {
+    @csi = {
+      0x02 => 'Ins',
+      0x03 => 'Del',
+      0x05 => 'PageUp',
+      0x06 => 'PageDown',
+      0x07 => 'Home',
+      0x08 => 'End',
+      0x09 => 'Tab',
+      0x0b => 'F1',
+      0x0c => 'F2',
+      0x0d => 'F3',
+      0x0e => 'F4',
+      0x0f => 'F5',
+      0x11 => 'F6',
+      0x12 => 'F7',
+      0x13 => 'F8',
+      0x14 => 'F9',
+      0x15 => 'F10',
+      0x17 => 'F11',
+      0x18 => 'F12',
+      0x19 => 'F13',
+      0x1a => 'F14',
+      0x1b => 'F15',
+      0x1c => 'F16',
+      0x1d => 'F17',
+      0x1e => 'F18',
+      0x1f => 'F19',
+      0x20 => 'F20',
+      0x21 => 'F21',
+      0x22 => 'F22',
+      0x23 => 'F23',
+      0x24 => 'F24'
+    }.compare_by_identity.freeze
+
+    @key_name = {
+      0x04 => 'Del',
+      0x09 => 'Tab',
+      0x0d => 'Enter',
+      0x1b => 'Esc',
+      0x20 => 'Space',
+      0x7f => 'Back'
+    }.compare_by_identity.freeze
+
+    @mods = {
       1 => 'Shift',
       2 => 'Alt',
       4 => 'Ctrl',

data/lib/terminal/input/dumb_keys.rb

@@ -2,11 +2,11 @@
 
 module Terminal
   module DumbKeys
-    def self.[](key)
-      ORD[key.ord] if key.size == 1
+    def self.key_name(key)
+      @key_name[key.ord] if key.size == 1
     end
 
-    ORD = {
+    @key_name = {
       0x05 => 'Ctrl+c',
       0x08 => 'Back',
       0x09 => 'Tab',

data/lib/terminal/input/legacy_keys.rb

@@ -3,55 +3,102 @@
 module Terminal
   module LegacyKeys
     class << self
-      def [](key)
-        return ORD[key.ord] if key.size == 1
-        return if key[0] != "\e"
-        return csi(key) if key[1] == '['
-        SS3[key[2].ord] if key[1] == 'O' && key.size == 3 # ESC O ?
+      def key_name(key)
+        @key_name[key.ord] if key.size == 1
       end
 
-      private
-
-      def csi(key)
-        return legacy(key) if key[-1] == '~' # ESC [ ? ; <modifier> ~
-        if key.size == 3 # ESC [ ?
-          ord = key[2].ord
-          return ord == 0x5a ? 'Shift+Tab' : SS3[ord]
+      def translate(esc)
+        return "Alt+#{@esc1[esc[0].ord] || esc[0]}" if esc.size == 1 # ESC ?
+        if esc.size == 2 && (esc[0] == 'O' || esc[0] == '[')
+          return @ss3[esc[1].ord] # ESC O ? || ESC [ ?
         end
-        # ESC [ 1 ; <modifier> ?
-        return if key.size < 5
-        return unless key.start_with?("\e[1;")
-        # ESC [ ? {ABCDEFHPQRS}
-        name = SS3[key[-1].ord] or return
-        mod = key[4..-2]
-        mod.empty? ? name : modifier(name, mod.to_i - 1)
+        if esc[0] == "\e" # ESC ESC ...
+          return "Alt+#{@esc1[esc[1].ord] || esc[1]}" if esc.size == 1
+          esc.shift
+          return (name = translate(esc)) ? "Alt+#{name}" : nil
+        end
+        return if esc[0] != '[' # ESC [ ...
+        return csi1(esc) if esc[1] == '1' && esc[2] == ';'
+        csi(esc) if esc[-1] == '~'
       end
 
-      def legacy(key)
-        with_modifier(key) { LEGACY[_1] }
-      end
+      private
 
-      def with_modifier(key)
-        code, mod = key[2..-2].split(';', 2)
-        code = yield(code.to_i) or return
-        mod ? modifier(code, mod.to_i - 1) : code
+      def csi(esc)
+        # ESC [ <code> ~
+        # ESC [ <code> ; <modifier> ~
+        return @csi[esc[1..-2].join.to_i] if (idx = esc.index(';')).nil? # no mod
+        key = @csi[esc[1..(idx - 1)].join.to_i] or return
+        return key if (mod = esc[(idx + 1)..-2].join.to_i - 1) < 1 # no mod
+        (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
 
-      def modifier(name, mod)
-        (MODS.filter_map { |b, n| n if mod.allbits?(b) } << name).join('+')
+      def csi1(esc)
+        # ESC [ 1 ; <modifier> [~ABCDEFHPQRS]
+        return if esc.size < 5
+        key = @ss3[esc[-1].ord] or return
+        return key if (mod = esc[3..-2].join.to_i - 1) < 1 # no mod
+        (@mods.filter_map { |b, n| n if mod.allbits?(b) } << key).join('+')
       end
     end
 
-    ORD = {
-      0x00 => 'Ctrl+2',
+    @csi = {
+      0x02 => 'Ins',
+      0x03 => 'Del',
+      0x05 => 'PageUp',
+      0x06 => 'PageDown',
+      0x07 => 'Home',
+      0x08 => 'End',
+      0x09 => 'Tab',
+      0x0b => 'F1',
+      0x0c => 'F2',
+      0x0d => 'F3',
+      0x0e => 'F4',
+      0x0f => 'F5',
+      0x11 => 'F6',
+      0x12 => 'F7',
+      0x13 => 'F8',
+      0x14 => 'F9',
+      0x15 => 'F10',
+      0x17 => 'F11',
+      0x18 => 'F12',
+      0x1b => 'Enter'
+    }.compare_by_identity.freeze
+
+    @ss3 = {
+      0x41 => 'Up', # A
+      0x42 => 'Down', # B
+      0x43 => 'Right', # C
+      0x44 => 'Left', # D
+      0x46 => 'End', # F
+      0x48 => 'Home', # H
+      0x50 => 'F1', # P
+      0x51 => 'F2', # Q
+      0x52 => 'F3', # R
+      0x53 => 'F4', # S
+      0x5a => 'Shift+Tab' # Z - not widely used
+    }.compare_by_identity.freeze
+
+    @esc1 = {
+      0x08 => 'Back',
+      0x09 => 'Tab',
+      0x10 => 'Ctrl+?',
+      0x0d => 'Enter',
+      0x1b => 'Esc',
+      0x20 => 'Space',
+      0x7f => 'Back'
+    }.compare_by_identity.freeze
+
+    @key_name = {
+      0x00 => 'Ctrl+Space',
       0x01 => 'Ctrl+a',
       0x02 => 'Ctrl+b',
       0x03 => 'Ctrl+c',
-      0x04 => 'Del',
+      0x04 => 'Ctrl+d',
       0x05 => 'Ctrl+e',
       0x06 => 'Ctrl+f',
       0x07 => 'Ctrl+g',
-      0x08 => 'Ctrl+h',
+      0x08 => 'Ctrl+Back',
       0x09 => 'Tab',
       0x0a => 'Ctrl+j',
       0x0b => 'Ctrl+k',
@@ -70,41 +117,16 @@ module Terminal
       0x18 => 'Ctrl+x',
       0x19 => 'Ctrl+y',
       0x1a => 'Ctrl+z',
-      0x1d => 'Ctrl+ü', # FIND AM
-      0x1e => 'Ctrl+^', # FIND AM
-      0x1f => 'Ctrl+-',
       0x1b => 'Esc',
+      0x1c => 'Ctrl+4',
+      0x1d => 'Ctrl+5',
+      0x1e => 'Ctrl+6',
+      0x1f => 'Ctrl+7',
+      0x20 => 'Space',
       0x7f => 'Back'
     }.compare_by_identity.freeze
 
-    # ESC [ ?
-    # ESC [ O ?
-    SS3 = {
-      0x41 => 'Up', # A
-      0x42 => 'Down', # B
-      0x43 => 'Right', # C
-      0x44 => 'Left', # D
-      0x46 => 'End', # F
-      0x48 => 'Home', # H
-      0x50 => 'F1', # P
-      0x51 => 'F2', # Q
-      0x52 => 'F3', # R
-      0x53 => 'F4' # S
-    }.compare_by_identity.freeze
-
-    LEGACY = {
-      0x03 => 'Del',
-      0x0f => 'F5',
-      0x11 => 'F6',
-      0x12 => 'F7',
-      0x13 => 'F8',
-      0x14 => 'F9',
-      0x15 => 'F10',
-      0x17 => 'F11',
-      0x18 => 'F12'
-    }.compare_by_identity.freeze
-
-    MODS = {
+    @mods = {
       1 => 'Shift',
       2 => 'Alt',
       4 => 'Ctrl',

data/lib/terminal/input.rb

@@ -30,66 +30,63 @@ module Terminal
     # @return [String] key name in `:named` mode
     # @return [[String, String]] key code and key name in `:both` mode
     def read_key(mode: :named)
-      case input_mode
-      when :dumb
-        read_dumb(mode)
-      when :legacy
-        read_legacy(mode)
-      when :csi_u
-        read_csi_u(mode)
-      end
+      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
+      return unless key
+      mode == :both ? [key, name] : name || key
     end
 
     private
 
-    def read_dumb(mode)
-      translate_key(STDIN.getc, mode, DumbKeys)
+    def read_dumb(both)
+      inp = STDIN.getc
+      name = DumbKeys.key_name(inp)
+      both ? [inp, name] : name || inp
     rescue Interrupt
-      translate_key("\x05", mode, DumbKeys)
-    rescue IOError, SystemCallError
-      @input_mode = :error
-      nil
+      DumbKeys.key_name("\x05")
     end
 
-    def read_legacy(mode) = translate_key(read_tty, mode, LegacyKeys)
-
-    def read_csi_u(mode)
-      if _write("\e[>1u")
-        key = read_tty
-        _write("\e[<u")
-        translate_key(key, mode, CSIuKeys)
-      else
-        @input_mode = :legacy
-        read_legacy(mode)
-      end
-    end
-
-    def translate_key(key, mode, translator)
+    def read_legacy
+      key, *esc = read_tty
       return unless key
-      return key if mode == :raw
-      name = translator[key]
-      mode == :both ? [key, name] : name || key
+      return key, LegacyKeys.key_name(key) if esc.empty?
+      [key + esc.join, LegacyKeys.translate(esc)]
     end
 
-    def read_tty
-      key = STDIN.getch
-      while (nc = STDIN.read_nonblock(1, exception: false))
-        String === nc ? key += nc : break
+    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
-    rescue Interrupt
-      key
-    rescue IOError, SystemCallError
-      @input_mode = :error
-      nil
+      key, *esc = read_tty
+      return unless key
+      return key, CSIuKeys.key_name(key) if esc.empty?
+      [key + esc.join, CSIuKeys.translate(esc)]
     end
 
     def find_input_mode
-      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
+      case ENV['INPUT_MODE']
+      when 'dumb', 'DUMB'
+        :dumb
+      when 'legacy', 'LEGACY'
+        :legacy
+      when 'csi_u', 'CSI_U', 'csiu', 'CSIU'
+        :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
+      end
+    rescue Interrupt
+      :legacy
     rescue IOError, SystemCallError
       :error
     end
@@ -98,12 +95,30 @@ module Terminal
       # iTerm2 returns result in two chunks :/
       ret = false
       while true
-        result = read_tty or return false
-        ret = true if result.include?("\e[?1u")
-        break if result[-1] == 'c'
+        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'
       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
+      end
+      key
+    rescue Interrupt
+      key
+    rescue IOError, SystemCallError
+      @input_mode = :error
+      nil
+    end
   end
 
   dir = __dir__

data/lib/terminal/text/char_width.rb

@@ -132,7 +132,7 @@ module Terminal
         0x450,
         0x451,
         0x482,
-        0x487,
+        0x489,
         0x590,
         0x5bd,
         0x5be,
@@ -359,6 +359,7 @@ module Terminal
         0x109d,
         0x10ff,
         0x115f,
+        0x11ff,
         0x135c,
         0x135f,
         0x1711,
@@ -414,8 +415,6 @@ module Terminal
         0x1a7e,
         0x1a7f,
         0x1aaf,
-        0x1abd,
-        0x1abe,
         0x1ace,
         0x1aff,
         0x1b03,
@@ -494,10 +493,6 @@ module Terminal
         0x20ab,
         0x20ac,
         0x20cf,
-        0x20dc,
-        0x20e0,
-        0x20e1,
-        0x20e4,
         0x20f0,
         0x2102,
         0x2103,
@@ -770,7 +765,7 @@ module Terminal
         0xa48f,
         0xa4c6,
         0xa66e,
-        0xa66f,
+        0xa672,
         0xa673,
         0xa67d,
         0xa69d,
@@ -843,6 +838,10 @@ module Terminal
         0xabed,
         0xabff,
         0xd7a3,
+        0xd7af,
+        0xd7c6,
+        0xd7ca,
+        0xd7fb,
         0xdfff,
         0xf8ff,
         0xfaff,
@@ -1645,7 +1644,6 @@ module Terminal
         0,
         1,
         2,
-        1,
         0,
         1,
         0,
@@ -1782,10 +1780,6 @@ module Terminal
         1,
         0,
         1,
-        0,
-        1,
-        0,
-        1,
         -1,
         1,
         -1,
@@ -2130,6 +2124,10 @@ module Terminal
         1,
         2,
         1,
+        0,
+        1,
+        0,
+        1,
         -1,
         2,
         1,

data/lib/terminal/text.rb

@@ -114,12 +114,13 @@ module Terminal
       def char_width(char)
         ord = char.ord
         return CONTROL_CHAR_WIDTH[ord] || 2 if ord < 0x20
-        return 1 if ord < 0xa1
-        return @ambiguous_char_width if (size = CharWidth[ord]) == -1
-        return size if size != 1 || char.size < 2
-        sco = char[1].ord
-        # Halfwidth Dakuten Handakuten
-        sco == 0xff9e || sco == 0xff9f ? 2 : 1
+        return 1 if char.size < 2 && ord < 0xa1
+        width = CharWidth[ord]
+        return @ambiguous_char_width if width == -1
+        sco = char[-1].ord
+        return width if sco != 0xff9e && sco != 0xff9f
+        # handle halfwidth dakuten/handakuten
+        char.size < 2 ? 1 : char.each_char.sum { char_width(_1) }
       end
 
       def lim_pairs(snippeds, limit)
@@ -452,7 +453,7 @@ module Terminal
     SCAN_EXPR =
       /\G(?:
         (\r?\n)
-        | (\e\[[\d;:\?]*[ABCDEFGHJKSTfminsuhl])
+        | (\e\[[\d;:\?]*[ABCDEFGHJKSTfhilmnsu])
         | (\e\]\d+(?:;[^\a\e]+)*(?:\a|\e\\))
         | (\s+)
         | (\X)
@@ -460,7 +461,7 @@ module Terminal
 
     WIDTH_SCANNER =
       /\G(?:
-        (?:\e\[[\d;:\?]*[ABCDEFGHJKSTfminsuhl])
+        (?:\e\[[\d;:\?]*[ABCDEFGHJKSTfhilmnsu])
         | (?:\e\]\d+(?:;[^\a\e]+)*(?:\a|\e\\))
         | (\s+)
         | (\X)

data/lib/terminal/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 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.10.0/Terminal
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.11.0/Terminal
 rdoc_options: []
 require_paths:
 - lib
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Fast terminal access with ANSI and BBCode support.
 test_files: []