yap-rawline 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4658b19ad0748955062a2bb15a923376f463bb3b
-  data.tar.gz: 34445d368f9cd1ec0be6bd4214f89bab269ca174
+  metadata.gz: 27dea4694161e07942a1244b30298efd3c7473b5
+  data.tar.gz: 483fbc976ef8fbb074aba07df0ade32d47b821b7
 SHA512:
-  metadata.gz: 05ec5c1a59bd35812e6d61aa6866fb6da500ec730e50f7084d6da244572f0387dbb0a611d14411f9e6b8dedada4ea8418905f54489daa2c0417b48b3a618875c
-  data.tar.gz: 19305570b3e546dc452df02f1b6155c8a6d8716f2fdfa1d7900ee05d82523be003dfedd0b29676d8d97ab3dbecde8129341406e7d10dd48cc301f922c4277c45
+  metadata.gz: 757786ae22ee40296c746e29183b7cba37c0011422f97c21b0bc3efc5fa7b736d1e8686fa08534f23deafb7eda52bb448a566ee0e9c818b6c9efcf664a091122
+  data.tar.gz: aa640a935bcbe38c9afe54b8a583a7441673eb879c5e98969e9b692126b9d5b49b6faa5289e6dc39bd7e4b6b9a8ac1ccceba70547f29bb755154d9e7c7721109

data/examples/rawline_shell.rb

@@ -4,16 +4,13 @@ require File.dirname(File.expand_path(__FILE__))+'/../lib/rawline'
 require 'io/console'
 require 'term/ansicolor'
 
-$z = File.open("/tmp/z.log", "w+")
-$z.sync = true
-
 # puts "*** Rawline Editor Test Shell ***"
 # puts " * Press CTRL+X to exit"
 # puts " * Press CTRL+G to clear command history"
 # puts " * Press CTRL+D for line-related information"
 # puts " * Press CTRL+E to view command history"
 
-editor = RawLine::Editor.new
+editor = RawLine::Editor.create
 kill_ring = []
 
 editor.terminal.keys.merge!(enter: [13])

data/lib/rawline.rb

@@ -54,6 +54,9 @@ require "#{dir}/rawline/completer"
 require "#{dir}/rawline/event_loop"
 require "#{dir}/rawline/event_registry"
 require "#{dir}/rawline/keycode_parser"
+require "#{dir}/rawline/non_blocking_input"
+require "#{dir}/rawline/renderer"
+require "#{dir}/rawline/dom_tree"
 require "#{dir}/rawline/editor"
 
 module RawLine

data/lib/rawline/completer.rb

@@ -23,6 +23,10 @@ module RawLine
     def read_bytes(bytes)
       return unless bytes.any?
 
+      # this is to prevent a series of bytes from coming in at one time
+      # E.g. holding down the tab key or arrow keys
+      bytes = bytes.uniq
+
       if bytes.map(&:ord) == @keys[:left_arrow]
         @completion_matches.forward
         match = @completion_matches.get

data/lib/rawline/dom_tree.rb

@@ -0,0 +1,18 @@
+require 'terminal_layout'
+
+module RawLine
+  class DomTree < TerminalLayout::Box
+    attr_accessor :prompt_box, :input_box, :content_box
+
+    def initialize(children: nil)
+      unless children
+        @prompt_box = TerminalLayout::Box.new(content: "default-prompt>", style: {display: :inline})
+        @input_box = TerminalLayout::InputBox.new(content: "", style: {display: :inline})
+        @content_box = TerminalLayout::Box.new(content: "", style: {display: :block})
+        super(style: {}, children: [@prompt_box, @input_box, @content_box])
+      else
+        super(style: {}, children: children)
+      end
+    end
+  end
+end

data/lib/rawline/editor.rb

@@ -46,12 +46,45 @@ module RawLine
     attr_accessor :completion_class, :completion_proc, :line, :history, :completion_append_string
     attr_accessor :match_hidden_files
     attr_accessor :word_break_characters
-    attr_reader :output
     attr_accessor :dom
 
     # TODO: dom traversal for lookup rather than assignment
     attr_accessor :prompt_box, :input_box, :content_box
 
+    def self.create(dom: nil, &blk)
+      terminal = nil
+
+      input = STDIN
+      output = STDOUT
+
+      case RUBY_PLATFORM
+      when /mswin/i then
+        terminal = WindowsTerminal.new(input, output)
+        if RawLine.win32console? then
+          win32_io = Win32::Console::ANSI::IO.new
+        end
+      else
+        terminal = VT220Terminal.new(input, output)
+      end
+
+      dom ||= DomTree.new
+
+      renderer = RawLine::Renderer.new(
+        dom: dom,
+        output: terminal.output,
+        width: terminal.width,
+        height: terminal.height
+      )
+
+      new(
+        dom: dom,
+        input: NonBlockingInput.new(input),
+        renderer: renderer,
+        terminal: terminal,
+        &blk
+      )
+    end
+
     #
     # Create an instance of RawLine::Editor which can be used
     # to read from input and perform line-editing operations.
@@ -66,19 +99,12 @@ module RawLine
     # * <tt>@completion_append_string</tt> - a string to append to completed words ('').
     # * <tt>@terminal</tt> -  a RawLine::Terminal containing character key codes.
     #
-    def initialize(input=STDIN, output=STDOUT)
+    def initialize(dom:, input:, renderer:, terminal:)
+      @dom = dom
       @input = input
-      # @output = output
+      @renderer = renderer
+      @terminal = terminal
 
-      case RUBY_PLATFORM
-      when /mswin/i then
-        @terminal = WindowsTerminal.new
-        if RawLine.win32console? then
-          @win32_io = Win32::Console::ANSI::IO.new
-        end
-      else
-        @terminal = VT220Terminal.new
-      end
       @history_size = 30
       @line_history_size = 50
       @keys = {}
@@ -96,27 +122,17 @@ module RawLine
         h.exclude = lambda { |item| item.strip == "" }
       end
       @keyboard_input_processors = [self]
+      # @allow_prompt_updates = true
       yield self if block_given?
       update_word_separator
       @char = nil
 
-      @event_registry = Rawline::EventRegistry.new do |registry|
-        registry.subscribe :default, -> (_) { self.check_for_keyboard_input }
-        registry.subscribe :dom_tree_change, -> (_) { self.render }
-      end
-      @event_loop = Rawline::EventLoop.new(registry: @event_registry)
-
-      @dom ||= build_dom_tree
-      @renderer ||= build_renderer
-
+      initialize_events
       initialize_line
     end
 
-    attr_reader :dom
-
-    def events
-      @event_loop
-    end
+    attr_reader :dom, :event_loop, :input
+    attr_reader :keyboard_input_processors
 
     #
     # Return the current RawLine version
@@ -126,49 +142,73 @@ module RawLine
     end
 
     def prompt
-      @line.prompt if @line
+      @prompt
     end
 
     def prompt=(text)
-      return if !@allow_prompt_updates || @line.nil? || @line.prompt == text
-      @prompt_box.content = Prompt.new(text)
+      return if @line && @line.prompt == text
+      @prompt = Prompt.new(text)
+      @dom.prompt_box.content = @prompt
     end
 
-    def initialize_line
-      @input_box.content = ""
-      update_word_separator
-      @add_history = true #add_history
-      @line = Line.new(@line_history_size) do |l|
-        l.prompt = @prompt_box.content
-        l.word_separator = @word_separator
+    def redraw_prompt
+      render(reset: true)
+    end
+
+    def terminal_width ; @terminal.width ; end
+    def terminal_height ; @terminal.height ; end
+
+    def content_box ; @dom.content_box ; end
+    def input_box ; @dom.input_box ; end
+    def prompt_box ; @dom.prompt_box ; end
+
+    ############################################################################
+    #
+    #                                EVENTS
+    #
+    ############################################################################
+
+    # Starts the editor event loop. Must be called before the editor
+    # can be interacted with.
+    def start
+      @terminal.raw!
+      at_exit { @terminal.cooked! }
+
+      Signal.trap("SIGWINCH") do
+        @event_loop.add_event name: "terminal-resized", source: self
       end
-      add_to_line_history
-      @allow_prompt_updates = true
+
+      @event_registry.subscribe("terminal-resized") do
+        @renderer.update_dimensions(width: terminal_width, height: terminal_height)
+        @event_loop.add_event name: "render", source: self
+      end
+
+      @event_loop.add_event name: "render", source: self
+      @event_loop.start
     end
 
-    def reset_line
-      initialize_line
-      render(reset: true)
+    # Subscribes to an event with the given block as a callback.
+    def subscribe(*args, &blk)
+      @event_registry.subscribe(*args, &blk)
     end
 
-    def check_for_keyboard_input
-      bytes = []
-      begin
-        file_descriptor_flags = @input.fcntl(Fcntl::F_GETFL, 0)
-        loop do
-          string = @input.read_nonblock(4096)
-          bytes.concat string.bytes
-        end
-      rescue IO::WaitReadable
-        # reset flags so O_NONBLOCK is turned off on the file descriptor
-        # if it was turned on during the read_nonblock above
-        retry if IO.select([@input], [], [], 0.01)
+    # Returns the Editor's event loop.
+    def events
+      @event_loop
+    end
 
-        @input.fcntl(Fcntl::F_SETFL, file_descriptor_flags)
-        @keyboard_input_processors.last.read_bytes(bytes)
+    ############################################################################
+    #
+    #                               INPUT
+    #
+    ############################################################################
 
-        @event_loop.add_event name: 'check_for_keyboard_input', source: self
+    def check_for_keyboard_input
+      bytes = @input.read
+      if bytes.any?
+        @keyboard_input_processors.last.read_bytes(bytes)
       end
+      @event_loop.add_event name: 'check_for_keyboard_input', source: self
     end
 
     def read_bytes(bytes)
@@ -187,68 +227,23 @@ module RawLine
 
         @ignore_position_change = false
         if @char == @terminal.keys[:enter] || !@char
-          @allow_prompt_updates = false
-          move_to_beginning_of_input
-          @event_loop.add_event name: "line_read", source: self, payload: { line: @line.text.without_ansi.dup }
+          process_line
         end
       end
     end
 
-    def on_read_line(&blk)
-      @event_registry.subscribe :line_read, &blk
-    end
-
-    def start
-      @input.raw!
-      at_exit { @input.cooked! }
-
-      Signal.trap("SIGWINCH") do
-        @event_loop.add_event name: "terminal-resized", source: self
-      end
+    def process_line
+      @event_loop.add_event(name: "process_line", source: self) do
+        @terminal.snapshot_tty_attrs
+        @terminal.pseudo_cooked!
 
-      @event_registry.subscribe("terminal-resized") do
-        @render_tree.width = terminal_width
-        @render_tree.height = terminal_height
-        @event_loop.add_event name: "render", source: self
+        move_to_beginning_of_input
+        @terminal.puts
       end
 
-      @event_loop.add_event name: "render", source: self
-      @event_loop.start
-    end
-
-    def subscribe(*args, &blk)
-      @event_registry.subscribe(*args, &blk)
-    end
-
-    #
-    # Parse a key or key sequence into the corresponding codes.
-    #
-    def parse_key_codes(bytes)
-      KeycodeParser.new(@terminal.keys).parse_bytes(bytes)
-    end
-
-    #
-    # Write a string to <tt># @output</tt> starting from the cursor position.
-    # Characters at the right of the cursor are shifted to the right if
-    # <tt>@mode == :insert</tt>, deleted otherwise.
-    #
-    def write(string)
-      string.each_byte { |c| print_character c, true }
-      add_to_line_history
-    end
-
-    #
-    #  Write a new line to <tt># @output</tt>, overwriting any existing text
-    #  and printing an end of line character.
-    #
-    def write_line(string)
-      clear_line
-      # @output.print string
-      @line.text = string
-      @input_box.position = @line.position
-      add_to_line_history
-      add_to_history
-      @char = nil
+      @event_loop.add_event name: "line_read", source: self, payload: { line: @line.text.without_ansi.dup }
+      @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 }
     end
 
     #
@@ -308,6 +303,29 @@ module RawLine
       @terminal.update
     end
 
+    def unbind(key)
+      block = case key.class.to_s
+        when 'Symbol' then
+          @keys.delete @terminal.keys[key]
+        when 'Array' then
+          @keys.delete @keys[key]
+        when 'Fixnum' then
+          @keys.delete[[key]]
+        when 'String' then
+          if key.length == 1 then
+            @keys.delete([key.ord])
+          else
+            raise NotImplementedError, "This is no implemented yet. It needs to return the previously bound block"
+            bind_hash({:"#{key}" => key}, block)
+          end
+        when 'Hash' then
+          raise BindingException, "Cannot bind more than one key or key sequence at once" unless key.values.length == 1
+          bind_hash(key, -> { })
+        end
+      @terminal.update
+      block
+    end
+
     #
     # Return true if the last character read via <tt>read</tt> is bound to an action.
     #
@@ -324,17 +342,238 @@ module RawLine
     end
 
     #
-    # Execute the default action for the last character read via <tt>read</tt>.
-    # By default it prints the character to the screen via <tt>print_character</tt>.
-    # This method is called automatically by <tt>process_character</tt>.
+    # Execute the default action for the last character read via <tt>read</tt>.
+    # By default it prints the character to the screen via <tt>print_character</tt>.
+    # This method is called automatically by <tt>process_character</tt>.
+    #
+    def default_action
+      @dom.input_box.content += @char.chr
+      print_character
+    end
+
+    #
+    # Parse a key or key sequence into the corresponding codes.
+    #
+    def parse_key_codes(bytes)
+      KeycodeParser.new(@terminal.keys).parse_bytes(bytes)
+    end
+
+    #
+    # Adds <tt>@line.text</tt> to the editor history. This action is
+    # bound to the enter key by default.
+    #
+    def newline
+      add_to_history
+			@history.clear_position
+    end
+
+    def on_read_line(&blk)
+      @event_registry.subscribe :line_read, &blk
+    end
+
+    ############################################################################
+    #
+    #                            LINE EDITING
+    #
+    ############################################################################
+
+    #
+    # Clear the current line, i.e.
+    # <tt>@line.text</tt> and <tt>@line.position</tt>.
+    # This action is bound to ctrl+k by default.
+    #
+    def clear_line
+      add_to_line_history
+      @line.text = ""
+      @line.position = 0
+      @dom.input_box.position = @line.position
+      @history.clear_position
+    end
+
+    def clear_screen
+      @terminal.clear_screen
+      render(reset: true)
+    end
+
+    #
+    # Delete the character at the left of the cursor.
+    # If <tt>no_line_hisytory</tt> is set to true, the deletion won't be
+    # recorded in the line history.
+    # This action is bound to the backspace key by default.
+    #
+    def delete_left_character(no_line_history=false)
+      if move_left then
+        delete_character(no_line_history)
+      end
+    end
+
+    def delete_n_characters(number_of_characters_to_delete, no_line_history=false)
+      number_of_characters_to_delete.times do |n|
+        @line[@line.position] = ''
+        @line.left
+      end
+
+      @dom.input_box.position = @line.position
+      @dom.input_box.content = @line.text
+      add_to_line_history unless no_line_history
+      @history.clear_position
+    end
+
+    #
+    # Delete the character under the cursor.
+    # If <tt>no_line_hisytory</tt> is set to true, the deletion won't be
+    # recorded in the line history.
+    # This action is bound to the delete key by default.
+    #
+    def delete_character(no_line_history=false)
+      unless @line.position > @line.eol
+        # save characters to shift
+        chars = (@line.eol?) ? ' ' : select_characters_from_cursor(1)
+        #remove character from line
+        @line[@line.position] = ''
+        @dom.input_box.content = @line.text
+        @dom.input_box.position = @line.position
+        add_to_line_history unless no_line_history
+        @history.clear_position
+      end
+    end
+
+    def highlight_text_up_to(text, position)
+      ANSIString.new("\e[1m#{text[0...position]}\e[0m#{text[position..-1]}")
+    end
+
+    def kill_forward
+      killed_text = @line.text[@line.position..-1]
+      @line.text[@line.position..-1] = ANSIString.new("")
+      @dom.input_box.content = line.text
+      @dom.input_box.position = @line.position
+      @history.clear_position
+      killed_text
+    end
+
+    def yank_forward(text)
+      @line.text[line.position] = text
+      @line.position = line.position + text.length
+      @dom.input_box.content = line.text
+      @dom.input_box.position = @line.position
+      @history.clear_position
+    end
+
+    #
+    # Move the cursor left (if possible) by printing a
+    # backspace, updating <tt>@line.position</tt> accordingly.
+    # This action is bound to the left arrow key by default.
+    #
+    def move_left
+      unless @line.bol? then
+        @line.left
+        @dom.input_box.position = @line.position
+        return true
+      end
+      false
+    end
+
+    #
+    # Move the cursor right (if possible) by re-printing the
+    # character at the right of the cursor, if any, and updating
+    # <tt>@line.position</tt> accordingly.
+    # This action is bound to the right arrow key by default.
+    #
+    def move_right
+      unless @line.position > @line.eol then
+        @line.right
+        @dom.input_box.position = @line.position
+        return true
+      end
+      false
+    end
+
+    def move_to_beginning_of_input
+      @line.position = @line.bol
+      @dom.input_box.position = @line.position
+    end
+
+    def move_to_end_of_input
+      @line.position = @line.length
+      @dom.input_box.position = @line.position
+    end
+
+    #
+    # Move the cursor to <tt>pos</tt>.
+    #
+    def move_to_position(pos)
+      rows_to_move = current_terminal_row - terminal_row_for_line_position(pos)
+      if rows_to_move > 0
+        # rows_to_move.times { @output.print @terminal.term_info.control_string("cuu1") }
+        # @terminal.move_up_n_rows(rows_to_move)
+      else
+        # rows_to_move.abs.times { @output.print @terminal.term_info.control_string("cud1") }
+        # @terminal.move_down_n_rows(rows_to_move.abs)
+      end
+      column = (@line.prompt.length + pos) % terminal_width
+      # @output.print @terminal.term_info.control_string("hpa", column)
+      # @terminal.move_to_column((@line.prompt.length + pos) % terminal_width)
+      @line.position = pos
+      @dom.input_box.position = @line.position
+    end
+
+    def move_to_end_of_line
+      rows_to_move_down = number_of_terminal_rows - current_terminal_row
+      # rows_to_move_down.times { @output.print @terminal.term_info.control_string("cud1") }
+      # @terminal.move_down_n_rows rows_to_move_down
+      @line.position = @line.length
+      @dom.input_box.position = @line.position
+
+      column = (@line.prompt.length + @line.position) % terminal_width
+      # @output.print @terminal.term_info.control_string("hpa", column)
+      # @terminal.move_to_column((@line.prompt.length + @line.position) % terminal_width)
+    end
+
+    #
+    # Overwrite the current line (<tt>@line.text</tt>)
+    # with <tt>new_line</tt>, and optionally reset the cursor position to
+    # <tt>position</tt>.
+    #
+    def overwrite_line(new_line, position=nil, options={})
+      text = @line.text
+      @highlighting = false
+
+      if options[:highlight_up_to]
+        @highlighting = true
+        new_line = highlight_text_up_to(new_line, options[:highlight_up_to])
+      end
+
+      @ignore_position_change = true
+      @line.position = position || new_line.length
+      @line.text = new_line
+      @dom.input_box.content = @line.text
+      @dom.input_box.position = @line.position
+      @event_loop.add_event name: "render", source: @dom.input_box
+    end
+
+    def reset_line
+      initialize_line
+      render(reset: true)
+    end
+
+    #
+    # Toggle the editor <tt>@mode</tt> to :replace or :insert (default).
     #
-    def default_action
-      @input_box.content += @char.chr
-      print_character
+    def toggle_mode
+      case @mode
+      when :insert then @mode = :replace
+      when :replace then @mode = :insert
+      end
     end
 
+    ############################################################################
     #
-    # Write a character to <tt># @output</tt> at cursor position,
+    #                            OUTPUT
+    #
+    ############################################################################
+
+    #
+    # Write a character to <tt>output</tt> at cursor position,
     # shifting characters as appropriate.
     # If <tt>no_line_history</tt> is set to <tt>true</tt>, the updated
     # won't be saved in the history of the current line.
@@ -344,7 +583,7 @@ module RawLine
         chars = select_characters_from_cursor if @mode == :insert
         @line.text[@line.position] = (@mode == :insert) ? "#{char.chr}#{@line.text[@line.position]}" : "#{char.chr}"
         @line.right
-        @input_box.position = @line.position
+        @dom.input_box.position = @line.position
         # if @mode == :insert then
         #   chars.length.times { @line.left } # move cursor back
         # end
@@ -352,11 +591,37 @@ module RawLine
         @line.right
         @line << char
       end
-      @input_box.content = @line.text
-      @input_box.position = @line.position
+      @dom.input_box.content = @line.text
+      @dom.input_box.position = @line.position
       add_to_line_history unless no_line_history
     end
 
+    #
+    # Write to <tt>output</tt> and then immediately re-render.
+    #
+    def puts(*args)
+      @terminal.puts(*args)
+      render(reset: true)
+    end
+
+    #
+    # Write a string starting from the cursor position.
+    #
+    def write(string)
+      @line.text[@line.position] = string
+      string.length.times { @line.right }
+      @dom.input_box.position = @line.position
+      @dom.input_box.content = @line.text
+
+      add_to_line_history
+    end
+
+    ############################################################################
+    #
+    #                             COMPLETION
+    #
+    ############################################################################
+
     #
     # Complete the current word according to what returned by
     # <tt>@completion_proc</tt>. Characters can be appended to the
@@ -369,6 +634,7 @@ module RawLine
     # pressed again.
     #
     def complete
+      @dom.input_box.cursor_off
       completer = @completion_class.new(
         char: @char,
         line: @line,
@@ -386,6 +652,7 @@ module RawLine
           if leftover_bytes.any?
             @keyboard_input_processors.last.read_bytes(leftover_bytes)
           end
+          @dom.input_box.cursor_on
         },
         keys: terminal.keys
       )
@@ -400,11 +667,8 @@ module RawLine
         @on_word_complete.call(name: "word-completion", payload: { sub_word: sub_word, word: word, completion: completion, possible_completions: possible_completions })
       end
 
-      if @line.word[:text].length > 0
-        # If not in a word, print the match, otherwise continue existing word
-        move_to_position(@line.word[:end]+@completion_append_string.to_s.length+1)
-      end
-      (@line.position-@line.word[:start]).times { delete_left_character(true) }
+      move_to_position @line.word[:end]
+      delete_n_characters(@line.word[:end] - @line.word[:start], true)
       write completion.to_s + @completion_append_string.to_s
     end
 
@@ -452,63 +716,11 @@ module RawLine
       end
     end
 
-
-    #
-    # Adds <tt>@line.text</tt> to the editor history. This action is
-    # bound to the enter key by default.
-    #
-    def newline
-      add_to_history
-			@history.clear_position
-    end
-
-    #
-    # Move the cursor left (if possible) by printing a
-    # backspace, updating <tt>@line.position</tt> accordingly.
-    # This action is bound to the left arrow key by default.
-    #
-    def move_left
-      unless @line.bol? then
-        @line.left
-        @input_box.position = @line.position
-        return true
-      end
-      false
-    end
-
-    #
-    # Move the cursor right (if possible) by re-printing the
-    # character at the right of the cursor, if any, and updating
-    # <tt>@line.position</tt> accordingly.
-    # This action is bound to the right arrow key by default.
-    #
-    def move_right
-      unless @line.position > @line.eol then
-        @line.right
-        @input_box.position = @line.position
-        return true
-      end
-      false
-    end
-
+    ############################################################################
     #
-    # Print debug information about the current line. Note that after
-    # the message is displayed, the line text and position will be restored.
+    #                            HISTORY
     #
-    def debug_line
-      pos = @line.position
-      text = @line.text
-      word = @line.word
-      # @output.puts
-      # @output.puts "Text: [#{text}]"
-      # @output.puts "Length: #{@line.length}"
-      # @output.puts "Position: #{pos}"
-      # @output.puts "Character at Position: [#{text[pos].chr}] (#{text[pos]})" unless pos >= @line.length
-      # @output.puts "Current Word: [#{word[:text]}] (#{word[:start]} -- #{word[:end]})"
-      clear_line
-      raw_print text
-      overwrite_line(text, pos)
-    end
+    ############################################################################
 
     #
     # Print the content of the editor history. Note that after
@@ -517,8 +729,6 @@ module RawLine
     def show_history
       pos = @line.position
       text = @line.text
-      # @output.puts
-      # @output.puts "History:"
       @history.each {|l| puts "- [#{l}]"}
       overwrite_line(text, pos)
     end
@@ -530,68 +740,6 @@ module RawLine
       @history.empty
     end
 
-    #
-    # Delete the character at the left of the cursor.
-    # If <tt>no_line_hisytory</tt> is set to true, the deletion won't be
-    # recorded in the line history.
-    # This action is bound to the backspace key by default.
-    #
-    def delete_left_character(no_line_history=false)
-      if move_left then
-        delete_character(no_line_history)
-      end
-    end
-
-    #
-    # Delete the character under the cursor.
-    # If <tt>no_line_hisytory</tt> is set to true, the deletion won't be
-    # recorded in the line history.
-    # This action is bound to the delete key by default.
-    #
-    def delete_character(no_line_history=false)
-      unless @line.position > @line.eol
-        # save characters to shift
-        chars = (@line.eol?) ? ' ' : select_characters_from_cursor(1)
-        # remove character from console and shift characters
-        # (chars.length+1).times { # @output.putc ?\b.ord }
-        #remove character from line
-        @line[@line.position] = ''
-        @input_box.content = @line.text
-        @input_box.position = @line.position
-        add_to_line_history unless no_line_history
-      end
-    end
-
-    #
-    # Clear the current line, i.e.
-    # <tt>@line.text</tt> and <tt>@line.position</tt>.
-    # This action is bound to ctrl+k by default.
-    #
-    def clear_line
-      # @output.putc ?\r
-      # @output.print @line.prompt
-      # @line.length.times {  @output.putc ?\s.ord }
-      # @line.length.times {  @output.putc ?\b.ord }
-      add_to_line_history
-      @line.text = ""
-      @line.position = 0
-      @input_box.position = @line.position
-      @history.clear_position
-    end
-
-    def clear_screen
-      # @output.print @terminal.term_info.control_string("clear")
-      # @terminal.clear_screen
-      # @output.print @line.prompt
-      # @output.print @line.text
-      # (@line.length - @line.position).times {  @output.putc ?\b.ord }
-    end
-
-    def clear_screen_down
-      # @output.print @terminal.term_info.control_string("ed")
-      # @terminal.clear_screen_down
-    end
-
     #
     # Undo the last modification to the current line (<tt>@line.text</tt>).
     # This action is bound to ctrl+z by default.
@@ -646,158 +794,67 @@ module RawLine
       @history << @line.text.dup if @add_history && @line.text != ""
     end
 
+    ############################################################################
     #
-    # Toggle the editor <tt>@mode</tt> to :replace or :insert (default).
+    #                            DEBUGGING
     #
-    def toggle_mode
-      case @mode
-      when :insert then @mode = :replace
-      when :replace then @mode = :insert
-      end
-    end
-
-    def terminal_row_for_line_position(line_position)
-      ((@line.prompt.length + line_position) / terminal_width.to_f).ceil
-    end
-
-    def current_terminal_row
-      ((@line.position + @line.prompt.length + 1) / terminal_width.to_f).ceil
-    end
-
-    def number_of_terminal_rows
-      ((@line.length + @line.prompt.length) / terminal_width.to_f).ceil
-    end
-
-    def kill_forward
-      @line.text[@line.position..-1].tap do
-        @line[line.position..-1] = ""
-        @input_box.content = line.text
-        @input_box.position = @line.position
-      end
-    end
-
-    def yank_forward(text)
-      @line.text[line.position] = text
-      @line.position = line.position + text.length
-      @input_box.content = line.text
-      @input_box.position = @line.position
-    end
+    ############################################################################
 
     #
-    # Overwrite the current line (<tt>@line.text</tt>)
-    # with <tt>new_line</tt>, and optionally reset the cursor position to
-    # <tt>position</tt>.
+    # Print debug information about the current line. Note that after
+    # the message is displayed, the line text and position will be restored.
     #
-    def overwrite_line(new_line, position=nil, options={})
+    def debug_line
+      pos = @line.position
       text = @line.text
-      @highlighting = false
-
-      if options[:highlight_up_to]
-        @highlighting = true
-        new_line = highlight_text_up_to(new_line, options[:highlight_up_to])
-      end
-
-      @ignore_position_change = true
-      @line.position = new_line.length
-      @line.text = new_line
-      @input_box.content = @line.text
-      @input_box.position = @line.position
-      @event_loop.add_event name: "render", source: @input_box
-    end
-
-    def highlight_text_up_to(text, position)
-      ANSIString.new("\e[1m#{text[0...position]}\e[0m#{text[position..-1]}")
-    end
-
-    def move_to_beginning_of_input
-      @line.position = @line.bol
-      @input_box.position = @line.position
-    end
-
-    def move_to_end_of_input
-      @line.position = @line.length
-      @input_box.position = @line.position
-    end
-
-    #
-    # Move the cursor to <tt>pos</tt>.
-    #
-    def move_to_position(pos)
-      rows_to_move = current_terminal_row - terminal_row_for_line_position(pos)
-      if rows_to_move > 0
-        # rows_to_move.times { @output.print @terminal.term_info.control_string("cuu1") }
-        # @terminal.move_up_n_rows(rows_to_move)
-      else
-        # rows_to_move.abs.times { @output.print @terminal.term_info.control_string("cud1") }
-        # @terminal.move_down_n_rows(rows_to_move.abs)
-      end
-      column = (@line.prompt.length + pos) % terminal_width
-      # @output.print @terminal.term_info.control_string("hpa", column)
-      # @terminal.move_to_column((@line.prompt.length + pos) % terminal_width)
-      @line.position = pos
-      @input_box.position = @line.position
-    end
-
-    def move_to_end_of_line
-      rows_to_move_down = number_of_terminal_rows - current_terminal_row
-      # rows_to_move_down.times { @output.print @terminal.term_info.control_string("cud1") }
-      # @terminal.move_down_n_rows rows_to_move_down
-      @line.position = @line.length
-      @input_box.position = @line.position
-
-      column = (@line.prompt.length + @line.position) % terminal_width
-      # @output.print @terminal.term_info.control_string("hpa", column)
-      # @terminal.move_to_column((@line.prompt.length + @line.position) % terminal_width)
-    end
-
-    def move_up_n_lines(n)
-      # n.times { @output.print @terminal.term_info.control_string("cuu1") }
-      # @terminal.move_up_n_rows(n)
-    end
-
-    def move_down_n_lines(n)
-      # n.times { @output.print @terminal.term_info.control_string("cud1") }
-      # @terminal.move_down_n_rows(n)
+      word = @line.word
+      # terminal.puts
+      # terminal.puts "Text: [#{text}]"
+      # terminal.puts "Length: #{@line.length}"
+      # terminal.puts "Position: #{pos}"
+      # terminal.puts "Character at Position: [#{text[pos].chr}] (#{text[pos]})" unless pos >= @line.length
+      # terminal.puts "Current Word: [#{word[:text]}] (#{word[:start]} -- #{word[:end]})"
+      clear_line
+      overwrite_line(text, pos)
     end
 
     private
 
-    def build_dom_tree
-      @prompt_box = TerminalLayout::Box.new(content: "default-prompt>", style: {display: :inline})
-      @input_box = TerminalLayout::InputBox.new(content: "", style: {display: :inline})
-      @content_box = TerminalLayout::Box.new(content: "", style: {display: :block})
-      TerminalLayout::Box.new(children:[@prompt_box, @input_box, @content_box])
-    end
-
-    def build_renderer
-      @renderer = TerminalLayout::TerminalRenderer.new(output: $stdout)
-      @render_tree = TerminalLayout::RenderTree.new(
-        @dom,
-        parent: nil,
-        style: { width:terminal_width, height:terminal_height },
-        renderer: @renderer
-      )
+    def initialize_events
+      @event_registry = Rawline::EventRegistry.new do |registry|
+        registry.subscribe :default, -> (_) { self.check_for_keyboard_input }
+        registry.subscribe :dom_tree_change, -> (_) { self.render }
+      end
+      @event_loop = Rawline::EventLoop.new(registry: @event_registry)
 
       @dom.on(:child_changed) do |*args|
         @event_loop.add_event name: "render", source: @dom#, target: event[:target]
       end
 
       @dom.on :cursor_position_changed do |*args|
-        @renderer.render_cursor(@input_box)
+        @renderer.render_cursor(@dom.input_box)
       end
 
       @event_registry.subscribe :render, -> (_) { render(reset: false) }
-
-      @renderer
     end
 
     def render(reset: false)
-      @render_tree.layout
-      @renderer.reset if reset
-      @renderer.render(@render_tree)
+      @renderer.render(reset: reset)
       @event_loop.add_event name: "check_for_keyboard_input"
     end
 
+    def initialize_line
+      @dom.input_box.content = ""
+      update_word_separator
+      @add_history = true #add_history
+      @line = Line.new(@line_history_size) do |l|
+        l.prompt = @dom.prompt_box.content
+        l.word_separator = @word_separator
+      end
+      add_to_line_history
+      @allow_prompt_updates = true
+    end
+
     def update_word_separator
       return @word_separator = "" if @word_break_characters.to_s == ""
       chars = []
@@ -832,10 +889,6 @@ module RawLine
       select_characters(:right, @line.length-@line.position, offset)
     end
 
-    def raw_print(string)
-      # string.each_byte { |c| @output.putc c }
-    end
-
     def generic_history_back(history)
       unless history.empty?
         history.back(matching_text: matching_text)
@@ -881,6 +934,7 @@ module RawLine
     end
 
     def set_default_keys
+      bind(:space) { write(' ') }
       bind(:enter) { newline }
       bind(:tab) { complete }
       bind(:backspace) { delete_left_character }
@@ -905,33 +959,31 @@ module RawLine
         @matching_text = @line[0...@line.position]
       end
     end
+
+    def terminal_row_for_line_position(line_position)
+      ((@line.prompt.length + line_position) / terminal_width.to_f).ceil
+    end
+
+    def current_terminal_row
+      ((@line.position + @line.prompt.length + 1) / terminal_width.to_f).ceil
+    end
+
+    def number_of_terminal_rows
+      ((@line.length + @line.prompt.length) / terminal_width.to_f).ceil
+    end
   end
 
   if RawLine.ansi? then
-
     class Editor
-
       if RUBY_PLATFORM.match(/mswin/) && RawLine.win32console? then
         def escape(string)
           string.each_byte { |c| @win32_io.putc c }
         end
       else
         def escape(string)
-          # @output.print string
+          # @terminal.print string
         end
       end
-
-      def terminal_width
-        terminal_size[0]
-      end
-
-      def terminal_height
-        terminal_size[1]
-      end
-
-      def cursor_position
-        terminal.cursor_position
-      end
     end
   end