yap-rawline 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1c07d4414b6e996e693a064efac3449068024e
-  data.tar.gz: 5425b7db921aad04459051ec8a237c44aff88645
+  metadata.gz: 13e2947b290e867550d30cacb28b8cf70896b796
+  data.tar.gz: 7e29e206c43dca81525e1aee74015b8e85b234e5
 SHA512:
-  metadata.gz: cf302b38f21ca604e5da6d58f98caf63eaf2d1cf23f7f2971153fca6c1dd39b8bb6d43caf64f7bbae35511786478a0fab3645f6e9f561580d0694550efa7f988
-  data.tar.gz: 1d40fa9b080716cb5d1b09ce43dba8f1343a2ded4578bfae8a995167c14064cbf00a8a76214f592e5992a487036791fa0f6cd6ba8a438c1bf84494d003c98ecd
+  metadata.gz: 00af0143953fe8b96f103ddd0cdf07660a60883e29d873e7deff86ffe04134cede9f68b4c10af219156926da6581eaf06c5bae7bc133aad55b55efd0a840e2e2
+  data.tar.gz: 646ec77535f43e27d829a38f8b98f5efe1c2f67f1b83a940714f6370cb4ca3dfd3c5a0e2d7b5aeef773f54031481836affb58064e16edb83c06a6b97021c3901

data/lib/rawline/editor.rb

@@ -252,22 +252,32 @@ module RawLine
 
     def read_bytes(bytes)
       return unless bytes.any?
+      @renderer.pause
+
+      Treefell['editor'].puts "read_bytes #{bytes.inspect}"
       old_position = @line.position
 
       key_code_sequences = parse_key_code_sequences(bytes)
+
+      Treefell['editor'].puts "key code sequences: #{key_code_sequences.inspect}"
       key_code_sequences.each do |sequence|
         @char = sequence
         if @char == @terminal.keys[:enter] || !@char
+          Treefell['editor'].puts "processing line: #{@line.text.inspect}"
+          @renderer.pause
           process_line
+          @renderer.unpause
         else
           process_character
           new_position = @line.position
         end
       end
+    ensure
+      @renderer.unpause
     end
 
     def process_line
-      @event_loop.add_event(name: "process_line", source: self) do
+      @event_loop.immediately(name: "process_line", source: self) do
         add_to_history
 
         @terminal.snapshot_tty_attrs
@@ -276,13 +286,14 @@ module RawLine
         @terminal.move_to_beginning_of_row
         @terminal.puts
       end
-
-      @event_loop.add_event(name: "line_read", source: self, payload: { line: @line.text.without_ansi.dup })
-      @event_loop.add_event(name: "prepare_new_line", source: self) do
+      @event_loop.immediately(name: "line_read", source: self, payload: { line: @line.text.without_ansi.dup })
+      @event_loop.immediately(name: "prepare_new_line", source: self) do
+        history.clear_position
+        reset_line
         move_to_beginning_of_input
       end
-      @event_loop.add_event(name: "restore_tty_attrs", source: self) { @terminal.restore_tty_attrs }
-      @event_loop.add_event(name: "render", source: self, payload: { reset: true })
+      @event_loop.immediately(name: "restore_tty_attrs", source: self) { @terminal.restore_tty_attrs }
+      @event_loop.immediately(name: "render", source: self, payload: { reset: true })
     end
 
     #

data/lib/rawline/event_loop.rb

@@ -38,6 +38,10 @@ module RawLine
       @events = @events.reject { |event| event[:_event_id] == event_id }
     end
 
+    def immediately(**event_kwargs, &blk)
+      dispatch_event(event_kwargs.merge(_event_callback: blk))
+    end
+
     def reset
       @events.clear
       @counter = 0

data/lib/rawline/keycode_parser.rb

@@ -2,6 +2,7 @@ module RawLine
   class KeycodeParser
     def initialize(keymap)
       @keymap = keymap
+      @inverted_keymap = @keymap.invert
       @escape_code = keymap[:escape]
     end
 
@@ -41,45 +42,37 @@ module RawLine
       bytes.pack('C*').force_encoding('UTF-8')
     end
 
-    def parse_bytes(bytes)
-      i = 0
-      results = []
-      loop do
-        byte = bytes[i]
-
-        keycode = find_keycode_for_multi_byte_sequence(bytes[i..-1])
-        if keycode
-          results << keycode
-          i += keycode.length
-        else
-          results << byte.ord
-          i += 1
+    def parse_bytes bytes
+      if bytes.empty?
+        []
+      elsif bytes.any?
+        results = []
+        index = 0
+        loop do
+          sequence = byte_sequence_for(bytes[index..-1])
+          results.concat sequence
+          index += sequence.first.is_a?(Array) ? sequence.first.length : sequence.length
+          break if index >= bytes.length
         end
-
-        break if i >= bytes.length
+        results
       end
-      results
     end
 
-    private
-
-    # {:left_arrow=>[27, 91, 68]}
-    # [27, 91, 68]
-    def find_keycode_for_multi_byte_sequence(bytes)
-      i = 0
-      sequence = []
-      loop do
-        byte = bytes[i]
-        if @keymap.values.any?{ |arr| arr[i] == byte }
-          sequence << byte
-          i += 1
-        else
-          break
-        end
-        break if i >= bytes.length
+    # This returns the longer possible known byte sequence for the given
+    # bytes. It returns every sequence wrapped in an array so if it knows
+    # about a multi-byte sequence like :left_arrow then it will return
+    # [[27,91,68]]. If it does not have a matching byte sequence it will
+    # return a single element array, e.g. [12].
+    def byte_sequence_for(bytes)
+      if @inverted_keymap[bytes]
+        [bytes]
+      elsif bytes.length == 1
+        bytes
+      elsif bytes.length == 0
+        fail "Bytes cannot be zero length"
+      else
+        byte_sequence_for(bytes[0..-2])
       end
-
-      sequence.any? ? sequence : nil
     end
   end
 end

data/lib/rawline/non_blocking_input.rb

@@ -18,8 +18,13 @@ module RawLine
       begin
         file_descriptor_flags = @input.fcntl(Fcntl::F_GETFL, 0)
         loop do
-          string = @input.read_nonblock(4096)
-          bytes.concat string.bytes
+          begin
+            string = @input.read_nonblock(4096)
+            bytes.concat string.bytes
+          rescue EOFError
+            sleep 0.1
+            retry
+          end
         end
       rescue IO::WaitReadable
         # reset flags so O_NONBLOCK is turned off on the file descriptor

data/lib/rawline/renderer.rb

@@ -12,9 +12,28 @@ module RawLine
       )
     end
 
+    def pause
+      @paused = true
+    end
+
+    def unpause
+      @paused = false
+      if @render_on_unpause_kwargs
+        render(**@render_on_unpause_kwargs)
+        @render_on_unpause = nil
+      end
+    end
+
     def render(reset: false)
-      @render_tree.layout
-      @renderer.render(@render_tree, reset: reset)
+      Treefell['editor'].puts "#{self.class}##{__callee__} reset=#{reset}"
+      if @paused
+        Treefell['editor'].puts "    paused"
+        @render_on_unpause_kwargs = {reset: reset}
+      else
+        Treefell['editor'].puts "    unpaused"
+        @render_tree.layout
+        @renderer.render(@render_tree, reset: reset)
+      end
     end
 
     def render_cursor

data/lib/rawline/terminal.rb

@@ -80,18 +80,21 @@ module RawLine
     CursorPosition = Struct.new(:column, :row)
 
     def raw!
+      return unless @input.isatty
       @input.raw!
     end
 
     def cooked!
+      return unless @input.isatty
       @input.cooked!
     end
 
     def pseudo_cooked!
+      return unless @input.isatty
+
       old_tty_attrs = Termios.tcgetattr(@input)
       new_tty_attrs = old_tty_attrs.dup
 
-
       new_tty_attrs.cflag |= Termios::BRKINT | Termios::ISTRIP | Termios::ICRNL | Termios::IXON
 
       new_tty_attrs.iflag |= Termios::ICRNL | Termios::IGNBRK
@@ -105,10 +108,12 @@ module RawLine
     end
 
     def snapshot_tty_attrs
+      return unless @input.isatty
       @snapshotted_tty_attrs << Termios.tcgetattr(@input)
     end
 
     def restore_tty_attrs
+      return unless @input.isatty
       Termios::tcsetattr(@input, Termios::TCSANOW, @snapshotted_tty_attrs.pop)
     end
 
@@ -182,7 +187,9 @@ module RawLine
     end
 
     def puts(*args)
-      @output.cooked do
+      if @output.isatty
+        @output.cooked { @output.puts(*args) }
+      else
         @output.puts(*args)
       end
     end

data/lib/rawline/version.rb

@@ -1,3 +1,3 @@
 module RawLine
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap-rawline
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Cevasco