vedeu 0.6.51 → 0.6.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08eb61b65bd7020344202d3002defb0dc0d50c13
-  data.tar.gz: 560d43d002cf41c62bcb74b9964534071f33e941
+  metadata.gz: 134542edb6745534c69b060678db4f11bd0e5b47
+  data.tar.gz: c679c95b4f54b95a03ec19d6ed011d2590954905
 SHA512:
-  metadata.gz: ad2ece537d1197ef06bce653d9a063dae0a43abd7fd42989fe090451b346be4a4a36685c56d4794366b64b474d1dc5fed2be4bb44e15f4cce02b7bbb51051b6c
-  data.tar.gz: 2e660fa55283d844fbe6e5fa9f2a74ae8ba26489059a57ca8975fc1073c3a9afb91aefa6ea3bf8d0b52e7fc168bf23e9897895e876e0a58fe00b0ec976815f7b
+  metadata.gz: e63c021516235bf2d2567ed1416127b5ef882167d8811c5a7fa107591c87f596431bfb48a47aed11b394efc1dab68f29eeb671c2820a10a410741741ef536f6f
+  data.tar.gz: 1c0d40b4476b35b6cf4cd33161fd9b878da4efe5e8b8c02dc1d169d18adb877dc628c12276fde234cbbca3235eaebc1757c471d2c219c72994a6544455262da6

data/lib/vedeu/borders/refresh.rb

@@ -104,6 +104,7 @@ module Vedeu
         Vedeu::Views::Char.new(value:    value,
                                parent:   interface,
                                colour:   colour,
+                               name:     name,
                                style:    style,
                                position: [iy, ix],
                                border:   type)

data/lib/vedeu/buffers/all.rb

@@ -18,6 +18,8 @@ module Vedeu
 
 end # Vedeu
 
+require 'vedeu/buffers/empty'
+require 'vedeu/buffers/view'
 require 'vedeu/buffers/buffer'
 require 'vedeu/buffers/null'
 require 'vedeu/buffers/repository'

data/lib/vedeu/buffers/empty.rb

@@ -0,0 +1,78 @@
+module Vedeu
+
+  module Buffers
+
+    # Provides a grid of Vedeu::Models::Cell objects at the given
+    # height and width.
+    #
+    # @api private
+    class Empty
+
+      # @!attribute [r] name
+      # @return [NilClass|String|Symbol]
+      attr_reader :name
+
+      # Returns a new instance of Vedeu::Buffers::Empty.
+      #
+      # @note
+      #   If a particular key is missing from the attributes
+      #   parameter, then it is added with the respective value from
+      #   #defaults.
+      #
+      # @param attributes [Hash<Symbol => Fixnum, NilClass, String,
+      #   Symbol]
+      # @option attributes name [NilClass|String|Symbol]
+      # @option attributes height [Fixnum]
+      # @option attributes width [Fixnum]
+      # @return [Vedeu::Buffers::Empty]
+      def initialize(attributes = {})
+        defaults.merge!(attributes).each do |key, value|
+          instance_variable_set("@#{key}", value || defaults.fetch(key))
+        end
+      end
+
+      # @return [Array<Array<Vedeu::Models::Cell>>]
+      def buffer
+        Array.new(width) do |y|
+          Array.new(height) do |x|
+            Vedeu::Models::Cell.new(name: name, position: [y, x])
+          end
+        end
+      end
+
+      # @note
+      #   We add 1 to both the width and height as terminal screens
+      #   are 1-indexed.
+      #
+      # @return [Fixnum]
+      def height
+        @height + 1
+      end
+
+      # @note
+      #   We add 1 to both the width and height as terminal screens
+      #   are 1-indexed.
+      #
+      # @return [Fixnum]
+      def width
+        @width + 1
+      end
+
+      private
+
+      # Returns the default options/attributes for this class.
+      #
+      # @return [Hash<Symbol => void>]
+      def defaults
+        {
+          height: Vedeu.height,
+          name:   nil,
+          width:  Vedeu.width,
+        }
+      end
+
+    end # Empty
+
+  end # Buffers
+
+end # Vedeu

data/lib/vedeu/buffers/view.rb

@@ -0,0 +1,51 @@
+module Vedeu
+
+  module Buffers
+
+    class View
+
+      def initialize(attributes = {})
+        defaults.merge!(attributes).each do |key, value|
+          instance_variable_set("@#{key}", value || defaults.fetch(key))
+        end
+      end
+
+      private
+
+      def border
+        Vedeu.borders.by_name(name)
+      end
+
+      def buffer
+        @_buffer ||= Vedeu::Buffers::Empty.new(height: border.height,
+                                               name:   name,
+                                               width:  border.width).buffer
+      end
+
+      def current
+        @current ||= buffer
+      end
+
+      def current_reset!
+        @current = buffer
+      end
+
+      def defaults
+        {
+          name: ''
+        }
+      end
+
+      def dirty
+        @dirty ||= buffer
+      end
+
+      def dirty_reset!
+        @dirty = buffer
+      end
+
+    end # View
+
+  end # Buffers
+
+end # Vedeu

data/lib/vedeu/colours/colour.rb

@@ -37,14 +37,6 @@ module Vedeu
     #
     class Colour
 
-      # @!attribute [r] background
-      # @return [Vedeu::Colours::Background]
-      attr_reader :background
-
-      # @!attribute [r] foreground
-      # @return [Vedeu::Colours::Foreground]
-      attr_reader :foreground
-
       # @param value [Vedeu::Colours::Colour|Hash<Symbol => void>]
       # @return [Vedeu::Colours::Colour]
       def self.coerce(value)
@@ -78,19 +70,25 @@ module Vedeu
       # @option attributes foreground [String]
       # @return [Vedeu::Colours::Colour]
       def initialize(attributes = {})
-        @background = Vedeu::Colours::Background.coerce(attributes[:background])
-        @foreground = Vedeu::Colours::Foreground.coerce(attributes[:foreground])
+        defaults.merge!(attributes).each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
 
       # @return [Hash<Symbol => Vedeu::Colours::Background,
       #   Vedeu::Colours::Foreground>]
       def attributes
         {
-          background: Vedeu::Colours::Background.coerce(@background),
-          foreground: Vedeu::Colours::Foreground.coerce(@foreground),
+          background: background,
+          foreground: foreground,
         }
       end
 
+      # @return [Vedeu::Colours::Background]
+      def background
+        @background = Vedeu::Colours::Background.coerce(@background)
+      end
+
       # Converts the value into a Vedeu::Colours::Background.
       #
       # @param value [String]
@@ -109,6 +107,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [Vedeu::Colours::Foreground]
+      def foreground
+        @foreground = Vedeu::Colours::Foreground.coerce(@foreground)
+      end
+
       # Converts the value into a Vedeu::Colours::Foreground.
       #
       # @param value [String]
@@ -126,6 +129,15 @@ module Vedeu
       end
       alias_method :to_str, :to_s
 
+      private
+
+      def defaults
+        {
+          background: Vedeu::Colours::Background.new,
+          foreground: Vedeu::Colours::Foreground.new
+        }
+      end
+
     end # Colour
 
   end # Colours

data/lib/vedeu/editor/cropper.rb

@@ -43,7 +43,7 @@ module Vedeu
 
         visible.each_with_index do |line, iy|
           line.chars.each_with_index do |char, ix|
-            out << Vedeu::Views::Char.new(parent:   interface,
+            out << Vedeu::Views::Char.new(name:     name,
                                           position: [(by + iy), (bx + ix)],
                                           value:    char.freeze)
           end

data/lib/vedeu/editor/cursor.rb

@@ -65,9 +65,11 @@ module Vedeu
 
       # Move the virtual cursor down by one line.
       #
+      # @param size [Fixnum]
       # @return [Vedeu::Editor::Cursor]
-      def down
+      def down(size = nil)
         @y += 1
+        @x = size if size && x > size
 
         self
       end
@@ -132,10 +134,12 @@ module Vedeu
 
       # Move the virtual cursor up by one line.
       #
+      # @param size [Fixnum]
       # @return [Vedeu::Editor::Cursor]
-      def up
+      def up(size = nil)
         @oy -= 1 unless @oy == 0
         @y -= 1
+        @x = size if size && x > size
 
         self
       end

data/lib/vedeu/editor/document.rb

@@ -77,9 +77,9 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def delete_character
-        return self if (x == 0 || x - 1 < 0) && y == 0
+        return self if document_start?
 
-        if (x == 0 || x - 1 < 0) && y > 0
+        if first_char? && y > 0
           delete_line
 
           return
@@ -132,13 +132,12 @@ module Vedeu
 
         down
 
-        cursor.bol.refresh
-
         refresh
       end
 
       # Returns the current line from the collection of lines.
       #
+      # @param index [Fixnum]
       # @return [Array<String|void>]
       def line(index = y)
         lines.line(index)
@@ -160,6 +159,8 @@ module Vedeu
 
         @lines = defaults[:data]
 
+        cursor.refresh
+
         refresh
       end
 
@@ -172,9 +173,9 @@ module Vedeu
 
         Vedeu.trigger(:_clear_view_content_, name)
 
-        Vedeu.render_output(output)
+        Vedeu.buffer_update(output)
 
-        cursor.refresh
+        Vedeu.direct_write(output.map(&:to_s).join)
 
         self
       end
@@ -183,7 +184,7 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def left
-        return self if x - 1 < 0
+        return self if first_char?
 
         cursor.left.refresh
 
@@ -194,7 +195,7 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def right
-        return self if x + 1 > line.size
+        return self if last_char?
 
         cursor.right.refresh
 
@@ -205,11 +206,9 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def up
-        return self if y - 1 < 0
+        return self if first_line?
 
-        cursor.up.refresh
-
-        reposition_cursor_x!
+        cursor.up(prev_line_size).refresh
 
         self
       end
@@ -218,29 +217,26 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def down
-        return self if y + 1 >= lines.size
-
-        cursor.down.refresh
+        return self if last_line?
 
-        reposition_cursor_x!
+        cursor.down(next_line_size).refresh
 
         self
       end
 
       private
 
-      # Repositions the x coordinate of the virtual cursor to the end
-      # of the line if the x coordinate is beyond the end of the line.
-      #
-      # This is used when the cursor moves up or down, moving from a
-      # long line to a shorter line.
+      # @return [Boolean]
+      def document_start?
+        first_char? && first_line?
+      end
+
+      # Return a virtual cursor to track the cursor position within
+      # the document.
       #
       # @return [Vedeu::Editor::Cursor]
-      def reposition_cursor_x!
-        if x > line.size
-          cursor.x = line.size
-          cursor.refresh
-        end
+      def cursor
+        @cursor ||= Vedeu::Editor::Cursor.new(name: name)
       end
 
       # Returns the default options/attributes for this class.
@@ -254,6 +250,31 @@ module Vedeu
         }
       end
 
+      # @return [Boolean]
+      def first_char?
+        x - 1 < 0
+      end
+
+      # @return [Boolean]
+      def first_line?
+        y - 1 < 0
+      end
+
+      # @return [Boolean]
+      def last_char?
+        x + 1 > line.size
+      end
+
+      # @return [Boolean]
+      def last_line?
+        y + 1 >= lines.size
+      end
+
+      # @return [Fixnum]
+      def next_line_size
+        line(y + 1).size
+      end
+
       # Return the data needed to render the document, based on the
       # current virtual cursor position. This output may be a cropped
       # representation of the full document depending on the size of
@@ -267,12 +288,9 @@ module Vedeu
                                    oy:    oy).viewport
       end
 
-      # Return a virtual cursor to track the cursor position within
-      # the document.
-      #
-      # @return [Vedeu::Editor::Cursor]
-      def cursor
-        @cursor ||= Vedeu::Editor::Cursor.new(name: name)
+      # @return [Fixnum]
+      def prev_line_size
+        line(y - 1).size
       end
 
     end # Document

data/lib/vedeu/esc/actions.rb

@@ -31,13 +31,6 @@ module Vedeu
 
       # @return [void]
       def setup!
-        define_actions!
-      end
-
-      private
-
-      # @return [void]
-      def define_actions!
         characters.each { |key, code| define_method(key) { code } }
       end