vedeu 0.6.51 → 0.6.52

data/lib/vedeu/esc/borders.rb

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

data/lib/vedeu/esc/colours.rb

@@ -74,8 +74,6 @@ module Vedeu
         define_foregrounds!
       end
 
-      private
-
       # @return [void]
       def define_backgrounds!
         background_codes.each do |key, code|

data/lib/vedeu/esc/mouse.rb

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

data/lib/vedeu/events/event.rb

@@ -213,7 +213,7 @@ module Vedeu
       #
       # @return [Boolean]
       def throttling?
-        @now = Time.now.to_f
+        @now = Vedeu.clock_time
 
         options[:delay] > 0
       end
@@ -238,7 +238,7 @@ module Vedeu
       #
       # @return [Boolean]
       def debouncing?
-        @now = Time.now.to_f
+        @now = Vedeu.clock_time
 
         @deadline = @now + debounce unless deadline?
 

data/lib/vedeu/interfaces/clear.rb

@@ -167,6 +167,7 @@ module Vedeu
             Array.new(width) do |ix|
               Vedeu::Views::Char.new(value:    ' '.freeze,
                                      colour:   colour,
+                                     name:     name,
                                      position: [y + iy, x + ix])
             end
           end

data/lib/vedeu/logging/all.rb

@@ -9,6 +9,7 @@ module Vedeu
 
 end # Vedeu
 
+require 'vedeu/logging/clock_time'
 require 'vedeu/logging/lockless_log_device'
 require 'vedeu/logging/mono_logger'
 require 'vedeu/logging/log'

data/lib/vedeu/logging/clock_time.rb

@@ -0,0 +1,34 @@
+module Vedeu
+
+  module Logging
+
+    # If the system supports Process::CLOCK_MONOTONIC use that for
+    # timestamps.
+    #
+    #    Vedeu.clock_time # => 15217.232113 (Process::CLOCK_MONOTONIC)
+    #                     # => 1447196800.3098037 (Time.now)
+    #
+    module ClockTime
+
+      if defined?(Process::CLOCK_MONOTONIC)
+        def self.clock_time
+          Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        end
+
+      else
+        def self.clock_time
+          Time.now
+        end
+
+      end
+
+    end # ClockTime
+
+  end # Logging
+
+  # @!method clock_time
+  #   @see Vedeu::Logging::ClockTime
+  def_delegators Vedeu::Logging::ClockTime,
+                 :clock_time
+
+end # Vedeu

data/lib/vedeu/logging/log.rb

@@ -54,6 +54,24 @@ module Vedeu
           $stderr.puts log_entry(type, message)
         end
 
+        # Returns a formatted timestamp.
+        # eg. [137.7824]
+        #
+        # @return [String]
+        def timestamp
+          @now  = Vedeu.clock_time
+          @time ||= 0.0
+          @last ||= @now
+
+          unless @last == @time
+            @time += (@now - @last).round(4)
+            @last = @now
+          end
+
+          "[#{format('%7.4f', @time.to_s)}] ".rjust(7)
+        end
+        alias_method :log_timestamp, :timestamp
+
         private
 
         # @return [TrueClass]
@@ -163,23 +181,6 @@ module Vedeu
           }
         end
 
-        # Returns a formatted timestamp.
-        # eg. [137.7824]
-        #
-        # @return [String]
-        def timestamp
-          @now  = Time.now.to_f
-          @time ||= 0.0
-          @last ||= @now
-
-          unless @last == @time
-            @time += (@now - @last).round(4)
-            @last = @now
-          end
-
-          "[#{format('%7.4f', @time.to_s)}] ".rjust(7)
-        end
-
       end # Eigenclass
 
     end # Log
@@ -195,7 +196,8 @@ module Vedeu
   def_delegators Vedeu::Logging::Log,
                  :log,
                  :log_stdout,
-                 :log_stderr
+                 :log_stderr,
+                 :log_timestamp
 
   # :nocov:
 

data/lib/vedeu/logging/timer.rb

@@ -35,7 +35,7 @@ module Vedeu
       # @return [Vedeu::Logging::Timer]
       def initialize(message = '')
         @message = message
-        @started = Time.now.to_f
+        @started = Vedeu.clock_time
       end
 
       # Write an entry to the log file stating how long a section of
@@ -75,7 +75,7 @@ module Vedeu
       #
       # @return [Float]
       def elapsed
-        ((Time.now.to_f - started) * 1000).round(3)
+        ((Vedeu.clock_time - started) * 1000).round(3)
       end
 
     end # Timer

data/lib/vedeu/models/cell.rb

@@ -12,6 +12,10 @@ module Vedeu
       # @return [NilClass|String]
       attr_reader :colour
 
+      # @!attribute [r] name
+      # @return [String|Symbol]
+      attr_reader :name
+
       # @!attribute [r] style
       # @return [NilClass|Array<Symbol|String>|Symbol|String]
       attr_reader :style
@@ -56,6 +60,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [Vedeu::Interfaces::Interface]
+      def interface
+        @interface ||= Vedeu.interfaces.by_name(name)
+      end
+
       # @return [Vedeu::Geometry::Position]
       def position
         Vedeu::Geometry::Position.coerce(@position)
@@ -90,6 +99,7 @@ module Vedeu
       def defaults
         {
           colour:   nil,
+          name:     nil,
           style:    nil,
           value:    '',
           position: [1, 1],

data/lib/vedeu/models/views/char.rb

@@ -30,6 +30,10 @@ module Vedeu
       # @return [NilClass|Symbol]
       attr_accessor :border
 
+      # @!attribute [rw] name
+      # @return [String|Symbol]
+      attr_accessor :name
+
       # @!attribute [rw] parent
       # @return [Vedeu::Views::Line]
       attr_accessor :parent
@@ -45,6 +49,7 @@ module Vedeu
       #   A symbol representing the border 'piece' this
       #   {Vedeu::Views::Char} represents.
       # @option attributes colour [Vedeu::Colours::Colour]
+      # @option attributes name [String|Symbol]
       # @option attributes parent [Vedeu::Views::Line]
       # @option attributes position [Vedeu::Geometry::Position]
       # @option attributes style [Vedeu::Presentation::Style]
@@ -53,6 +58,7 @@ module Vedeu
       def initialize(attributes = {})
         @attributes = attributes
         @border     = @attributes[:border]
+        @name       = @attributes[:name]
         @parent     = @attributes[:parent]
         @value      = @attributes[:value]
       end
@@ -83,6 +89,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [Vedeu::Interfaces::Interface]
+      def interface
+        @interface ||= Vedeu.interfaces.by_name(name)
+      end
+
       # @return [Vedeu::Geometry::Position]
       def position
         @position = Vedeu::Geometry::Position.coerce(@attributes[:position])
@@ -130,6 +141,7 @@ module Vedeu
         {
           border:   border.to_s,
           colour:   colour_to_hash,
+          name:     name.to_s,
           parent:   parent_to_hash,
           position: position_to_hash,
           style:    style.to_s,

data/lib/vedeu/models/views/line.rb

@@ -86,6 +86,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [NilClass|String|Symbol]
+      def name
+        parent.name if parent
+      end
+
       # Returns the size of the content in characters without
       # formatting.
       #

data/lib/vedeu/models/views/stream.rb

@@ -71,6 +71,7 @@ module Vedeu
 
         @chars ||= value.chars.map do |char|
           member.new(value:    char,
+                     name:     name,
                      parent:   parent,
                      colour:   colour,
                      style:    style,
@@ -101,6 +102,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [NilClass|String|Symbol]
+      def name
+        parent.name if parent
+      end
+
       # Returns the size of the content in characters without
       # formatting.
       #

data/lib/vedeu/output/compressor.rb

@@ -58,16 +58,20 @@ module Vedeu
 
       # @return [String]
       def compress
-        Vedeu.timer("Compression for #{content.size} characters".freeze) do
+        Vedeu.timer("Compression for #{content.size} objects".freeze) do
           out = ''
 
           content.each do |cell|
-            out << cell.position.to_s
+            out << position_for(cell)
             out << colour_for(cell)
             out << style_for(cell)
             out << cell.value
           end
 
+          Vedeu.log(type:    :output,
+                    message: "Compression: #{content.size} objects -> " \
+                             "#{out.size} characters".freeze)
+
           out
         end
       end
@@ -80,9 +84,30 @@ module Vedeu
           out << cell.to_s
         end
 
+        Vedeu.log(type:    :output,
+                  message: "No compression: #{content.size} objects -> " \
+                           "#{out.size} characters".freeze)
+
         out
       end
 
+      # Compress by not repeatedly sending a position when only the x
+      # coordinate has changed; i.e. we are on the same line, just
+      # advancing a character.
+      #
+      # @param char [Vedeu::Views::Char]
+      # @return [String]
+      def position_for(char)
+        return ''.freeze if char.position.y == @y
+
+        @y = char.position.y
+        char.position.to_s
+      end
+
+      # Compress by not repeatedly sending the same colours for each
+      # character which has the same colours as the last character
+      # output.
+      #
       # @param char [Vedeu::Views::Char]
       # @return [String]
       def colour_for(char)
@@ -92,6 +117,10 @@ module Vedeu
         @colour.to_s
       end
 
+      # Compress by not repeatedly sending the same style(s) for each
+      # character which has the same style(s) as the last character
+      # output.
+      #
       # @param char [Vedeu::Views::Char]
       # @return [String]
       def style_for(char)

data/lib/vedeu/output/output.rb

@@ -9,6 +9,15 @@ module Vedeu
     #
     class Output
 
+      # @param output [Array<Array<Vedeu::Views::Char>>|
+      #   NilClass|Vedeu::Models::Escape]
+      # @return [Array]
+      def self.buffer_update(output)
+        return nil if output.nil?
+
+        new(output).buffer_update
+      end
+
       # @param output [Array<Array<Vedeu::Views::Char>>|
       #   NilClass|Vedeu::Models::Escape]
       # @return [Array]
@@ -47,6 +56,11 @@ module Vedeu
         @output = output
       end
 
+      # @return [Array]
+      def buffer_update
+        buffer_update!
+      end
+
       # @return [Array]
       def buffer_write
         buffer_write!
@@ -84,6 +98,11 @@ module Vedeu
 
       private
 
+      # @return [Array]
+      def buffer_update!
+        Vedeu::Terminal::Buffer.update(output)
+      end
+
       # @return [Array]
       def buffer_write!
         Vedeu::Terminal::Buffer.write(output)
@@ -106,13 +125,17 @@ module Vedeu
   # Write the given output to the configured or default renderers.
   #
   # @example
+  #   Vedeu.buffer_update(output)
+  #   Vedeu.buffer_write(output)
+  #   Vedeu.direct_write(output)
   #   Vedeu.render_output(output)
   #
   # @!method render_output
   # @return [Array|NilClass]
   def_delegators Vedeu::Output::Output,
-                 :render_output,
+                 :buffer_update,
                  :buffer_write,
-                 :direct_write
+                 :direct_write,
+                 :render_output
 
 end # Vedeu

data/lib/vedeu/output/presentation/colour.rb

@@ -15,6 +15,9 @@ module Vedeu
         @background ||= if colour
                           colour.background
 
+                        elsif self.is_a?(Vedeu::Views::Char) && name
+                          interface.colour.background
+
                         elsif parent
                           parent.background
 
@@ -39,6 +42,9 @@ module Vedeu
         @colour ||= if attributes[:colour]
                       Vedeu::Colours::Colour.coerce(attributes[:colour])
 
+                    elsif self.is_a?(Vedeu::Views::Char) && name
+                      Vedeu::Colours::Colour.coerce(interface.colour)
+
                     elsif parent
                       Vedeu::Colours::Colour.coerce(parent.colour)
 
@@ -65,6 +71,9 @@ module Vedeu
         @foreground ||= if colour
                           colour.foreground
 
+                        elsif self.is_a?(Vedeu::Views::Char) && name
+                          interface.colour.background
+
                         elsif parent
                           parent.foreground