window_blessing 0.0.1 → 0.0.4

data/lib/window_blessing/window_redraw_areas.rb

@@ -0,0 +1,23 @@
+module WindowBlessing
+class WindowRedrawAreas
+  include Tools
+  attr_reader :areas
+
+  def initialize
+    @areas = []
+  end
+
+  # first pass merging algorithm:
+  # merge all overlapping areas with area until no overlapping areas
+  # This creates a non-overlapping set of areas, but it may be much bigger total area than before.
+  # TODO - for "two-point" overlaps - just shrink one of the rectangles so they don't overlap but still cover the same area
+  def <<(area)
+    overlapping, non_overlapping = @areas.partition {|a| a.overlaps?(area)}
+    while overlapping.length > 0
+      overlapping.each {|a| area &= a}
+      overlapping, non_overlapping = non_overlapping.partition {|a| a.overlaps?(area)}
+    end
+    @areas = non_overlapping + [area]
+  end
+end
+end

data/lib/window_blessing/windowed_screen.rb

@@ -20,32 +20,30 @@ class WindowedScreen < XtermScreen
     @root_window.buffer.dirty
     @root_window.name = "root_window"
 
-    event_manager.add_handler :tick do
-      if redraw_area = root_window.requested_redraw_area
-        time(:redraw, "size=#{redraw_area.size}.area = #{redraw_area.size.x * redraw_area.size.y}") do
-          root_window.draw
-          buffer = root_window.buffer
-          output.draw_buffer buffer.dirty_area.loc, buffer.dirty_subbuffer if buffer.dirty_area
-          buffer.clean
-        end
+    event_manager.on :tick do
+      if root_window.redraw_requested?
+        root_window.draw
+        buffer = root_window.buffer
+        output.draw_buffer buffer.dirty_area.loc, buffer.dirty_subbuffer if buffer.dirty_area
+        buffer.clean
       end
     end
 
-    event_manager.add_handler :key_press do |event|
+    event_manager.on :key_press do |event|
       root_window.route_keyboard_event event
     end
 
-    event_manager.add_handler :string_input do |event|
+    event_manager.on :string_input do |event|
       root_window.route_keyboard_event event
     end
 
-    event_manager.add_handler :resize do |event|
+    event_manager.on :resize do |event|
       root_window.size = event[:size]
       root_window.request_redraw_internal
     end
 
-    event_manager.add_handler :pointer do |event|
-      root_window.pointer_event event.clone
+    event_manager.on :pointer do |event|
+      root_window.route_pointer_event event.clone
     end
   end
 

data/lib/window_blessing/xterm_event_parser.rb

@@ -13,7 +13,7 @@ class XtermEventParser < BabelBridge::Parser
   end
 
   rule :event, /[^\x00-\x1f\x7F]+/ do
-    def event; {:type => :string_input, :string => to_s} end
+    def event; {type: :string_input, string: to_s} end
   end
 
   rule :command, /[a-zA-Z]/
@@ -27,28 +27,27 @@ class XtermEventParser < BabelBridge::Parser
   rule :event, "\e[8;", :numbers, "t" do
     include GuiGeo
     def event
-      {:type => :xterm_state, :state_type => :size, :state => point(*numbers.to_a.reverse)}
+      {type: :xterm_state, state_type: :size, state: point(*numbers.to_a.reverse)}
     end
   end
 
   rule :event, "\e[4;", :numbers, "t" do
     include GuiGeo
     def event
-      {:type => :xterm_state, :state_type => :display_pixel_size, :state => point(*numbers.to_a.reverse)}
+      {type: :xterm_state, state_type: :display_pixel_size, state: point(*numbers.to_a.reverse)}
     end
   end
 
-  rule(:event, "\e\x7F")              {def event;{:type => [:key_press,:backspace], :key => :backspace, :modifiers => [:alt]};end}
-  rule(:event, "\x7F")                {def event;{:type => [:key_press,:backspace], :key => :backspace, :modifiers => []};end}
-  rule(:event, "\e[O")                {def event;{:type => :blur};end}
-  rule(:event, "\e[I")                {def event;{:type => :focus};end}
+  rule(:event, "\e\x7F")              {def event;{type: [:key_press,:backspace], key: :backspace, alt:true };end}
+  rule(:event, "\x7F")                {def event;{type: [:key_press,:backspace], key: :backspace};end}
+  rule(:event, "\e[O")                {def event;{type: :blur};end}
+  rule(:event, "\e[I")                {def event;{type: :focus};end}
 
   rule :event, :key_press do
-    def event; {:type => [:key_press,key], :key => key, :modifiers => modifiers} end
+    def event; {type: [:key_press,key], key: key}.merge(modifiers) end
 
     def modifiers
-      m = key_press.modifier
-      m ? m.modifiers : []
+      key_press.modifier ? key_press.modifier.modifiers : {}
     end
   end
 
@@ -58,83 +57,89 @@ class XtermEventParser < BabelBridge::Parser
   rule(:key_press, "\e", :modifier, "C")  {def key;:right;end}
   rule(:key_press, "\e", :modifier, "A")  {def key;:up;end}
   rule(:key_press, "\e", :modifier, "Z")  {def key;:reverse_tab;end}
-  rule(:key_press, "\e", :modifier, "H")  {def key;:home;end}
-  rule(:key_press, "\e", :modifier, "F")  {def key;:end;end}
   rule(:key_press, "\e", :modifier, "P")  {def key;:f1;end}
   rule(:key_press, "\e", :modifier, "Q")  {def key;:f2;end}
   rule(:key_press, "\e", :modifier, "R")  {def key;:f3;end}
   rule(:key_press, "\e", :modifier, "S")  {def key;:f4;end}
-  rule(:key_press, "\e", :modifier, "F")  {def key;:home;end}
-  rule(:key_press, "\e", :modifier, "H")  {def key;:end;end}
+  rule(:key_press, "\e", :modifier, "F")  {def key;:end;end;}
+  rule(:key_press, "\e", :modifier, "H")  {def key;:home;end; }
 
   rule :modifier, "\e", :modifier do
     def modifiers
-      (modifier.modifiers || []) + [:alt]
+      (modifier.modifiers || {}).merge alt:true
     end
-
   end
+
+  MODIFER_DECODER = {
+    2 => {shift: true},
+    3 => {alt: true},
+    4 => {shift: true, alt: true},
+    5 => {control: true},
+    6 => {shift: true, control: true},
+    7 => {alt: true, control: true},
+    8 => {shift: true, alt: true, control: true},
+    9 => {alt: true},
+    10 => {shift: true, alt: true},
+  }
+
   rule :modifier, "[", :numbers do
     def modifiers
-      {
-      2 => [:shift],
-      3 => [:alt],
-      4 => [:shift, :alt],
-      5 => [:control],
-      6 => [:shift, :control],
-      7 => [:alt, :control],
-      8 => [:shift, :alt, :control],
-      }[numbers.to_a[-1].to_i] || []
+      MODIFER_DECODER[numbers.to_a[-1].to_i] || {}
     end
   end
 
   rule :modifier, /[\[O]/ do
-    def modifiers; []; end
+    def modifiers; {}; end
   end
 
-  rule :event, "\e[", :number, "~" do
+  KEY_MAP_DECODER = {
+    3 => :delete,
+    2 => :insert,
+    6 => :page_down,
+    5 => :page_up,
+    13 => :f3,
+    14 => :f4,
+    15 => :f5,
+    17 => :f6,
+    18 => :f7,
+    19 => :f8,
+    20 => :f9,
+    21 => :f10,
+    23 => :f11,
+    24 => :f12,
+  }
+  rule :event, "\e[", :number, match?(";2").as(:shift), "~" do
     def event
+      key = KEY_MAP_DECODER[number.to_i]
       {
-      :type => :key_press,
-      :key => {
-        3 => :delete,
-        2 => :insert,
-        6 => :page_down,
-        5 => :page_up,
-        13 => :f3,
-        14 => :f4,
-        15 => :f5,
-        17 => :f6,
-        18 => :f7,
-        19 => :f8,
-        20 => :f9,
-        21 => :f10,
-        23 => :f11,
-        24 => :f12,
-        }[number.to_i]
+        :type => [:key_press, key],
+        :key => key,
+        :shift => !!shift
       }
     end
   end
 
+  BUTTON_ACTIONS = {
+    32 => [:button_down, 1], 33 => [:button_down, 2], 34=> [:button_down, 3], 35=>:button_up,
+    64 => :drag,
+    96 => :wheel_down, 97 => :wheel_up
+  }
+
   rule :event, "\e[", "M", match(/.../).as(:state) do
+    include GuiGeo
     def event
       s, x, y = state.to_s.unpack "CCC"
       x -= 33
       y -= 33
-      button_actions = {
-        32 => :button1_down, 33 => :button2_down, 34=> :button3_down, 35=>:button_up,
-        64 => :drag,
-        96 => :wheel_down, 97 => :wheel_up
-      }
       {
-        type: [:pointer, button_actions[s&99]],
-        button: button_actions[s&99],
-        state: s,
-        loc: point(x,y)
-      }.tap do |h|
-        h[:shift_down] = true if (s&4)!=0
-        h[:alt_down] = true if (s&8)!=0
-        h[:control_down] = true if (s&16)!=0
-      end
+        type:     [:pointer, BUTTON_ACTIONS[s&99]].flatten,
+        button:   BUTTON_ACTIONS[s&99],
+        state:    s,
+        loc:      point(x,y),
+        shift:    (s&4)!=0,
+        alt:      (s&8)!=0,
+        control:  (s&16)!=0,
+      }
     end
   end
 
@@ -145,10 +150,14 @@ class XtermEventParser < BabelBridge::Parser
     end
   end
 
+  rule(:event, "\e") {def event; {type: [:key_press, :escape],  :key=>:escape} end}
+  rule(:event, "\r") {def event; {type: [:key_press, :enter],   :key=>:enter} end}
+  rule(:event, "\t") {def event; {type: [:key_press, :tab],     :key=>:tab} end}
+
   rule :event, /[\x00-\x1f]/ do
     def event
       char = "%c"%(to_s.getbyte(0)+"`".getbyte(0))
-      {:type => :key_press, :key => "control_#{char}".to_sym}
+      {type: [:key_press, char.to_sym], key: char.to_sym, control: true}
     end
   end
 

data/lib/window_blessing/xterm_screen.rb

@@ -14,8 +14,8 @@ class XtermScreen
     @pending_events = []
     @event_queue = EventQueue.new
 
-    @event_manager.add_handler :key_press do |event|
-      quit if event[:key]==:control_q
+    @event_manager.on :key_press do |event|
+      quit if event[:control] && event[:key]==:q
     end
   end
 

data/lib/window_blessing/xterm_state.rb

@@ -5,7 +5,7 @@ class XtermState
   def initialize(event_manager)
     @state = {:size => point(-1,-1)}
 
-    event_manager.add_handler :xterm_state do |event|
+    event_manager.on :xterm_state do |event|
       state_type = event[:state_type]
       old_state = state[state_type]
       new_state = event[:state]

data/spec/buffer_spec.rb

@@ -47,6 +47,12 @@ describe "Buffer" do
     fb.to_s.should == "----\n----\n----\n----"
   end
 
+  it "fill out of bounds" do
+    fb = buffer(point(4,4))
+    fb.fill :area => rect(0,-4,1,1), :string => "-", :bg=>color(0,0,0)
+    fb.to_s.should == "    \n    \n    \n    "
+  end
+
   it "cropped fill" do
     (f=test_frame).cropped(rect(1,1,2,1)) do
       f.fill :string => '-'
@@ -166,5 +172,55 @@ describe "Buffer" do
     f1.fg_buffer.should == [[7, 7, 7, 7], [7, 7, 7, 7], [7, 7, 7, 7], [7, 7, 7, 7]]
     f1.bg_buffer.should == [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
   end
+
+  it "sanitize_contents" do
+    f1 = test_frame
+    f1.contents = "hi\t!\nthere"
+    f1.to_s.should == "hi?!\nther\n    \n    "
+    f1.contents[1]="boo\x00"
+    f1.to_s.should == "hi?!\nboo\x00\n    \n    "
+    f1.sanitize_contents 2..-1
+    f1.to_s.should == "hi?!\nboo\x00\n    \n    "
+    f1.sanitize_contents 1..1
+    f1.to_s.should == "hi?!\nboo?\n    \n    "
+  end
+
+  it "each_line" do
+    f1 = test_frame
+    f1.each_line.collect{|a|a}.should == [
+      ["1234", [7, 7, 7, 7], [0, 0, 0, 0]],
+      ["2345", [7, 7, 7, 7], [0, 0, 0, 0]],
+      ["3456", [7, 7, 7, 7], [0, 0, 0, 0]],
+      ["4567", [7, 7, 7, 7], [0, 0, 0, 0]]
+    ]
+  end
+
+  it "fg_buffer=" do
+    f1 = test_frame
+    f1.fg_buffer = [[8],[6,7,8]]
+    f1.fg_buffer.should == [[8, 7, 7, 7], [6, 7, 8, 7], [7, 7, 7, 7], [7, 7, 7, 7]]
+    f1.bg_buffer.should == [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
+  end
+
+  it "bg_buffer=" do
+    f1 = test_frame
+    f1.bg_buffer = [[8],[6,7,8]]
+    f1.fg_buffer.should == [[7, 7, 7, 7], [7, 7, 7, 7], [7, 7, 7, 7], [7, 7, 7, 7]]
+    f1.bg_buffer.should == [[8, 0, 0, 0], [6, 7, 8, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
+  end
+
+  it "normalize range" do
+    f1 = buffer(size = point(2,4))
+    f1.fill bg:255
+    f1.bg_buffer.should == [[255,255],[255,255],[255,255],[255,255]]
+    f1.normalize 1..2
+    f1.bg_buffer.should == [[255,255],[255,255],[255,255],[255,255]]
+    f1.normalize 1...2
+    f1.bg_buffer.should == [[255,255],[255,255],[255,255],[255,255]]
+    f1.size.should == size
+    f1.contents.length.should == size.y
+    f1.fg_buffer.length.should == size.y
+    f1.bg_buffer.length.should == size.y
+  end
 end
 end

data/spec/color_spec.rb

@@ -32,5 +32,19 @@ describe "Color" do
     color("#abc").to_hex.should == "#aabbcc"
     color("#abcdef").to_hex.should == "#abcdef"
   end
+
+  it "br" do
+    color("#fff").br.should == 1.0
+    color("#000").br.should == 0.0
+    (color("#ff7f00").br*100).to_i.should == 49
+  end
+
+  it "to_screen_color" do
+    color("#ff0").to_screen_color.should == 226
+    color("#011").to_screen_color.should == 16
+    color("#777").to_screen_color.should == 243
+    color("#000").to_screen_color.should == 0
+    color("#ffffff").to_screen_color.should == 15
+  end
 end
 end

data/spec/event_manager_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+module WindowBlessing
+describe "EventManager" do
+  include Tools
+
+  it "inspect" do
+    em = EventManager.new "a parent"
+    em.inspect["EventManager"].should == "EventManager"
+  end
+
+  it "custom event" do
+    em = EventManager.new "a parent"
+    val = 0
+    em.on(:custom_event) {|event|val = event[:val]}
+    val.should == 0
+    em.handle_event type: :custom_event, :val => 1
+    val.should == 1
+  end
+
+  it "on_event_exception" do
+    em = EventManager.new "a parent"
+    exception_count = 0
+    em.on(:event_exception) {exception_count+=1}
+    em.on(:custom_event)    {raise "foo"}
+    em.handle_event type: :custom_event
+    exception_count.should == 1
+  end
+
+  it "on_every_event" do
+    em = EventManager.new "a parent"
+    event_count = 0
+    em.on {event_count+=1}
+    em.handle_event type: :custom_event
+    em.handle_event type: :a_different_custom_event
+    event_count.should == 2
+  end
+
+  it "on_unhandled_event" do
+    em = EventManager.new "a parent"
+    handled = ""
+
+    em.on(:custom_event)    {handled+="a"}
+    em.on(:unhandled_event) {handled+="b"}
+
+    em.handle_event type: :custom_event
+    em.handle_event type: :a_different_custom_event
+    em.handle_event type: :b_different_custom_event
+    em.handle_event type: :custom_event
+    handled.should == "abba"
+  end
+
+  it "exception in on_event_exception handler" do
+    em = EventManager.new "a parent"
+    handled = ""
+
+    em.on(:event_exception) {handled+="e";raise "foo"}
+    em.on(:custom_event)    {handled+="c";raise "foo"}
+
+    em.handle_event type: :custom_event
+    handled.should == "ce"
+  end
+
+  it "on_last" do
+    em = EventManager.new "a parent"
+    handled = ""
+
+    em.on(:custom_event) {handled += "a"}
+    em.on(:custom_event) {handled += "b"}
+    em.on_last(:custom_event) {handled += "!"}
+
+    em.handle_event type: :custom_event
+    handled.should == "ba!"
+  end
+
+  it "handle_events" do
+    em = EventManager.new "a parent"
+    handled = ""
+    em.on(:custom_event) {handled += "a"}
+    em.handle_events [{type: :custom_event},{type: :other_custom_event},{type: :custom_event}]
+    handled.should == "aa"
+  end
+
+  it "layered event types" do
+    em = EventManager.new "a parent"
+    handled = ""
+    em.on(:custom_event) {handled += "C"}
+    em.on(:custom_event, :sub_type_a) {handled += "ca"}
+    em.on(:custom_event, :sub_type_b) {handled += "cb"}
+
+    em.handle_event :type => :custom_event
+    handled.should == "C"
+
+    handled = ""
+    em.handle_event :type => [:custom_event]
+    handled.should == "C"
+
+    handled = ""
+    em.handle_event :type => [:custom_event, :sub_type_a]
+    handled.should == "caC"
+
+    handled = ""
+    em.handle_event :type => [:custom_event, :sub_type_b]
+    handled.should == "cbC"
+  end
+end
+end