luck 0.0.0 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/lib/luck/alert.rb

@@ -0,0 +1,36 @@
+module Luck
+class Alert < Pane
+  attr_accessor :width, :height, :handler
+  
+  def initialize display, width, height, title, controls={}, &blck
+    super display, nil, nil, nil, nil, title, controls, &blck
+    
+    @width, @height = width, height
+  end
+  
+  def x1
+    (@display.width / 2).to_i - (@width / 2).to_i
+  end
+  def y1
+    (@display.height / 2).to_i - (@height / 2).to_i
+  end
+  
+  def x2
+    x1 + @width
+  end
+  def y2
+    y1 + @height
+  end
+  
+  def on_dismiss &blck
+    @handler = blck
+  end
+  
+  def handle_char char
+    if char == "\n"
+      @handler.call @text if @handler
+    end
+    #redraw
+  end
+end
+end

data/lib/luck/ansi.rb

@@ -0,0 +1,222 @@
+module Luck
+class ANSIDriver
+  attr_reader :width, :height
+  
+  def initialize
+    prepare_modes
+    
+    @height, @width = terminal_size
+  end
+  
+  def flush
+    $stdout.flush
+  end
+  
+  def put row, col, text
+    text.each_line do |line|
+      print "\e[#{row.to_i};#{col.to_i}H#{line}"
+      row += 1
+    end
+  end
+  
+  def color codes
+    "\e[#{codes}m"
+  end
+  
+  def cursor=(show)
+    print "\e[?25" + (show ? 'h' : 'l')
+  end
+  
+  def linedrawing=(toggle)
+    print(toggle ? "\x0E\e)0" : "\x0F")
+  end
+  
+  def resized?
+    size = terminal_size
+    
+    return false if [@height, @width] == size
+    
+    @height, @width = size
+    true
+  end
+  
+  def clear; print "\e[H"; end
+  def cursor_to_home; print "\e[J"; end
+  
+  def save_cursor; print "\e[s"; end
+  def restore_cursor; print "\e[u"; end
+  def set_cursor row, col; put row, col, "\e[s"; end
+  
+  def set_title title; print "\e]2;#{title}\007"; end
+  
+  #~ BUTTONS = {
+    #~ 0 => :left,
+    #~ 1 => :middle,
+    #~ 2 => :right,
+    #~ 3 => :release,
+    #~ 64 => :scrollup,
+    #~ 65 => :scrolldown
+  #~ }
+  #~ 
+  #~ # alt-anything => \e*KEY* (same as Esc, key)
+  #~ # alt-[ would become \e[ which is an ANSI escape
+  #~ #
+  #~ # ctrl-stuff becomes weird stuff, i.e. ctrl-space = \x00, ctrl-a = \x01, ctrl-b = \x02
+  #~ #
+  #~ # super is not sent?
+  #~ def handle_stdin
+    #~ @escapes ||= 0
+    #~ @ebuff ||= ''
+    #~ 
+    #~ $stdin.read_nonblock(1024).each_char do |chr|
+    #~ 
+      #~ if @escapes == 0
+        #~ if chr == "\e"
+          #~ @escapes = 1
+        #~ elsif chr == "\t"
+          #~ cycle_controls
+        #~ elsif chr == "\177"
+          #~ route_key :backspace
+        #~ else
+          #~ route_key chr
+        #~ end
+        #~ 
+      #~ elsif @escapes == 1 && chr == '['
+        #~ @escapes = 2
+      #~ elsif @escapes == 1 && chr == 'O'
+        #~ @escapes = 5
+        #~ 
+      #~ elsif @escapes == 2
+        #~ if chr == 'A'
+          #~ route_key :up
+        #~ elsif chr == 'B'
+          #~ route_key :down
+        #~ elsif chr == 'C'
+          #~ route_key :right
+        #~ elsif chr == 'D'
+          #~ route_key :left
+        #~ elsif chr == 'E'
+          #~ route_key :center
+        #~ elsif chr == 'Z'
+          #~ cycle_controls_back
+        #~ else
+          #~ @ebuff = chr
+          #~ @escapes = 3
+        #~ end
+        #~ @escapes = 0 if @escapes == 2
+        #~ 
+      #~ elsif @escapes == 3
+        #~ if chr == '~' && @ebuff.to_i.to_s == @ebuff
+          #~ route_key case @ebuff.to_i
+            #~ when 2; :insert
+            #~ when 3; :delete
+            #~ when 5; :pageup
+            #~ when 6; :pagedown
+            #~ when 15; :f5
+            #~ when 17; :f6
+            #~ when 18; :f7
+            #~ when 19; :f8
+            #~ when 20; :f9
+            #~ when 24; :f12
+            #~ else; raise @ebuff.inspect
+          #~ end
+        #~ elsif @ebuff[0,1] == 'M' && @ebuff.size == 3
+          #~ @ebuff += chr
+          #~ info, x, y = @ebuff.unpack('xCCC').map{|i| i - 32}
+          #~ modifiers = []
+          #~ modifiers << :shift if info & 4 == 4
+          #~ modifiers << :meta if info & 8 == 8
+          #~ modifiers << :control if info & 16 == 16
+          #~ pane = pane_at(x, y)
+          #~ 
+          #~ unless modal && modal != pane
+            #~ pane.handle_click BUTTONS[info & 71], modifiers, x, y if pane
+          #~ end
+        #~ elsif @ebuff.size > 10
+          #~ raise "long ebuff #{@ebuff.inspect} - #{chr.inspect}"
+        #~ else
+          #~ @ebuff += chr
+          #~ @escapes = 4
+        #~ end
+        #~ @escapes = 0 if @escapes == 3
+        #~ @escapes = 3 if @escapes == 4
+        #~ @ebuff = '' if @escapes == 0
+        #~ 
+      #~ elsif @escapes == 5
+        #~ if chr == 'H'
+          #~ route_key :home
+        #~ elsif chr == 'F'
+          #~ route_key :end
+        #~ elsif chr == 'Q'
+          #~ route_key :f2
+        #~ elsif chr == 'R'
+          #~ route_key :f3
+        #~ elsif chr == 'S'
+          #~ route_key :f4
+        #~ else
+          #~ raise "escape 5 #{chr.inspect}"
+        #~ end
+        #~ @escapes = 0
+        #~ 
+      #~ else
+        #~ @escapes = 0
+      #~ end
+    #~ end
+    #~ 
+    #~ $stdout.flush
+    #~ 
+  #~ rescue Errno::EAGAIN
+  #~ rescue EOFError
+  #~ end
+  
+  
+  ######################################
+  # this is all copied from cashreg :P #
+  ######################################
+
+  # yay grep
+  TIOCGWINSZ = 0x5413
+  TCGETS = 0x5401
+  TCSETS = 0x5402
+  ECHO   = 8 # 0000010
+  ICANON = 2 # 0000002
+
+  # thanks google for all of this
+  def terminal_size
+    rows, cols = 25, 80
+    buf = [0, 0, 0, 0].pack("SSSS")
+    if $stdout.ioctl(TIOCGWINSZ, buf) >= 0 then
+      rows, cols, row_pixels, col_pixels = buf.unpack("SSSS")
+    end
+    return [rows, cols]
+  end
+
+  # had to convert these from C... fun
+  def prepare_modes
+    buf = [0, 0, 0, 0, 0, 0, ''].pack("IIIICCA*")
+    $stdout.ioctl(TCGETS, buf)
+    @old_modes = buf.unpack("IIIICCA*")
+    new_modes = @old_modes.clone
+    new_modes[3] &= ~ECHO # echo off
+    new_modes[3] &= ~ICANON # one char @ a time
+    $stdout.ioctl(TCSETS, new_modes.pack("IIIICCA*"))
+    print "\e[2J" # clear screen
+    print "\e[H" # go home
+    print "\e[?47h" # kick xterm into the alt screen
+    print "\e[?1000h" # kindly ask for mouse positions to make up for it
+    self.cursor = false
+    flush
+  end
+  
+  def undo_modes # restore previous terminal mode
+    $stdout.ioctl(TCSETS, @old_modes.pack("IIIICCA*"))
+    print "\e[2J" # clear screen
+    print "\e[H" # go home
+    print "\e[?47l" # kick xterm back into the normal screen
+    print "\e[?1000l" # turn off mouse reporting
+    self.linedrawing = false
+    self.cursor = true # show the mouse
+    flush
+  end
+end
+end

data/lib/luck/button.rb

@@ -0,0 +1,35 @@
+module Luck
+class Button < Label
+  attr_accessor :handler
+  
+  def on_submit &blck
+    @handler = blck
+  end
+  
+  def handle_char char
+    if char == "\n"
+      handler.call self, @text if handler
+    end
+    #redraw
+  end
+  
+  def handle_click button, modifiers, x, y
+    handler.call self, @text if button == :left && handler
+  end
+  
+  def text
+    "[ #{@text} ]"
+  end
+  
+  def handler
+    @handler || @pane.handler
+  end
+  
+  def redraw
+    @display.driver.cursor = false
+    print @display.color(@display.active_control == self ? '1;34' : '0;36')
+    super
+    print @display.color('0')
+  end
+end
+end

data/lib/luck/control.rb

@@ -11,6 +11,10 @@ class Control
     instance_eval &blck if blck
   end
   
+  def focus!
+    @display.active_control = self
+  end
+  
   def x1
     @pane.x1 + ((@x1 < 0) ? (@pane.width + @x1) : @x1)
   end

data/lib/luck/display.rb

@@ -1,160 +1,244 @@
 module Luck
 class Display
-  attr_accessor :width, :height, :client, :panes, :buffer, :dirty, :active_control
+  attr_accessor :driver, :client, :panes, :dirty, :active_pane, :active_control, :modal
   
   def initialize client
     @client = client
     @panes = {}
     @dirty = true
-    prepare_modes
     
-    size = terminal_size
-    @width = size[1]
-    @height = size[0]
+    @driver = ANSIDriver.new
   end
   
-  def pane name, *args, &blck
-    @panes[name] = Pane.new(self, *args, &blck)
-  end
+  def width; @driver.width; end
+  def height; @driver.height; end
+  
+  def place x,y,t; @driver.put x,y,t; end
+  def color c; @driver.color c; end
   
-  def place row, col, text
-    print "\e[#{row.to_i};#{col.to_i}H#{text}"
+  def close
+    @driver.undo_modes
   end
-  def color codes
-    "\e[#{codes}m"
+  
+  def pane name, *args, &blck
+    @panes[name] = Pane.new(self, *args, &blck)
   end
   
-  def cursor=(show)
-    print "\e[?25h" if show
-    print "\e[?25l" unless show
-    $stdout.flush
+  def alert name, *args, &blck
+    @panes[name] = Alert.new(self, *args, &blck)
   end
   
   def dirty! pane=nil
-    if pane && @dirty.is_a?(Array) && !(@dirty.include?(pane))
-      @dirty << pane
-    elsif pane && !@dirty
-      @dirty = [pane]
-    elsif !pane
+    if pane
+      @panes[pane].dirty!
+    else
       @dirty = true
     end
   end
   
+  def [] pane, control=nil
+    if control
+      @panes[pane].controls[control]
+    else
+      @panes[pane]
+    end
+  end
+  
+  def focus *path
+    self.active_control = self[*path]
+  end
+  
   def handle
     handle_stdin
     
-    size = terminal_size
-    if @width != size[1] || @height != size[0]
-      @width = size[1]
-      @height = size[0]
+    if @driver.resized?
       dirty!
     end
     
-    return unless @dirty
-    redraw @dirty
-    @dirty = false
+    if @dirty
+      redraw
+      @dirty = false
+    else
+      panes = @panes.values.select {|pane| pane.dirty? && pane.visible? }
+      redraw panes if panes.any?
+    end
+    
+    @panes.each_value {|pane| pane.dirty = false }
   end
   
-  def redraw panes=true
-    print "\e[H\e[J" if panes == true # clear all and go home
-    self.cursor = active_control
-    
-    panes = @panes.keys if panes == true
-    
-    panes.each do |key|
-      @panes[key].redraw
+  def redraw panes=nil
+    unless panes
+      @driver.clear
+      @driver.cursor_to_home
     end
-    print "\e[u"
     
-    $stdout.flush
+    panes ||= @panes.values
+    panes.each {|pane| pane.redraw if pane.visible? }
+    modal.redraw if modal
+    @panes.each_value {|pane| pane.draw_title if pane.visible? }
+    
+    @driver.restore_cursor
+    @driver.flush
+  end
+  
+  def active_control= control
+    @active_pane = control.pane
+    @active_control = control
+  end
+  
+  def cycle_controls
+    index = @active_pane.controls.keys.index @active_pane.controls.key(@active_control)
+    begin
+      index += 1
+      index = 0 if index >= @active_pane.controls.size
+    end until @active_pane.controls[@active_pane.controls.keys[index]].respond_to? :handle_char
+    old = @active_control
+    @active_control = @active_pane.controls[@active_pane.controls.keys[index]]
+    old.redraw
+    @active_control.redraw
   end
   
+  def cycle_controls_back
+    index = @active_pane.controls.keys.index @active_pane.controls.key(@active_control)
+    begin
+      index -= 1
+      index = @active_pane.controls.size - 1 if index < 0
+    end until @active_pane.controls[@active_pane.controls.keys[index]].respond_to? :handle_char
+    old = @active_control
+    @active_control = @active_pane.controls[@active_pane.controls.keys[index]]
+    old.redraw
+    @active_control.redraw
+  end
+  
+  BUTTONS = {
+    0 => :left,
+    1 => :middle,
+    2 => :right,
+    3 => :release,
+    64 => :scrollup,
+    65 => :scrolldown
+  }
+  
+  # alt-anything => \e*KEY* (same as Esc, key)
+  # alt-[ would become \e[ which is an ANSI escape
+  #
+  # ctrl-stuff becomes weird stuff, i.e. ctrl-space = \x00, ctrl-a = \x01, ctrl-b = \x02
+  #
+  # super is not sent?
   def handle_stdin
+    @escapes ||= 0
+    @ebuff ||= ''
+    
     $stdin.read_nonblock(1024).each_char do |chr|
-      active_control.handle_char chr if active_control
-      #~ if chr == "\n"
-        #~ next if @buffer.empty?
-        #~ 
-        #~ if @buffer.to_i.to_s == @buffer && @results
-          #~ index = @buffer.to_i - 1
-          #~ next if index < 0 || index > @results.size
-          #~ 
-          #~ song = @results[index]
-          #~ @client.queue << song
-          #~ 
-          #~ unless @client.now_playing
-            #~ Thread.new do
-              #~ @client.queue.play_radio
-            #~ end
-          #~ end
-          #~ 
-          #~ @buffer = ''
-          #~ panes[:main].data[0] = @buffer.empty? ? (@search || '') : ''
-          #~ self.cursor = false
-        #~ else
-          #~ @search = @buffer
-          #~ @results = @client.search_songs(@search)['Return']
-          #~ panes[:main].data = @results.map do |result|
-            #~ "#{(@results.index(result)+1).to_s.rjust 2}) #{result['Name']} - #{result['ArtistName']} - #{result['AlbumName']}"
-          #~ end
-          #~ panes[:main].data.unshift @search
-          #~ panes[:main].title = "Search Results for #{@search}"
-#~ 
-          #~ @buffer = ''
-          #~ self.cursor = false
-        #~ end
-      #~ else
-      #~ @buffer << chr
-      #~ @buffer.gsub!(/.\177/, '')
-      #~ @buffer.gsub!("\177", '')
-      #~ panes[:main].data[0] = @buffer.empty? ? (@search || '') : ''
-      #~ self.cursor = !(@buffer.empty?)
-      #~ end
+    
+      if @escapes == 0
+        if chr == "\e"
+          @escapes = 1
+        elsif chr == "\t"
+          cycle_controls
+        elsif chr == "\177"
+          route_key :backspace
+        else
+          route_key chr
+        end
+        
+      elsif @escapes == 1 && chr == '['
+        @escapes = 2
+      elsif @escapes == 1 && chr == 'O'
+        @escapes = 5
+        
+      elsif @escapes == 2
+        if chr == 'A'
+          route_key :up
+        elsif chr == 'B'
+          route_key :down
+        elsif chr == 'C'
+          route_key :right
+        elsif chr == 'D'
+          route_key :left
+        elsif chr == 'E'
+          route_key :center
+        elsif chr == 'Z'
+          cycle_controls_back
+        else
+          @ebuff = chr
+          @escapes = 3
+        end
+        @escapes = 0 if @escapes == 2
+        
+      elsif @escapes == 3
+        if chr == '~' && @ebuff.to_i.to_s == @ebuff
+          route_key case @ebuff.to_i
+            when 2; :insert
+            when 3; :delete
+            when 5; :pageup
+            when 6; :pagedown
+            when 15; :f5
+            when 17; :f6
+            when 18; :f7
+            when 19; :f8
+            when 20; :f9
+            when 24; :f12
+            else; raise @ebuff.inspect
+          end
+        elsif @ebuff[0,1] == 'M' && @ebuff.size == 3
+          @ebuff += chr
+          info, x, y = @ebuff.unpack('xCCC').map{|i| i - 32}
+          modifiers = []
+          modifiers << :shift if info & 4 == 4
+          modifiers << :meta if info & 8 == 8
+          modifiers << :control if info & 16 == 16
+          pane = pane_at(x, y)
+          
+          unless modal && modal != pane
+            pane.handle_click BUTTONS[info & 71], modifiers, x, y if pane
+          end
+        elsif @ebuff.size > 10
+          raise "long ebuff #{@ebuff.inspect} - #{chr.inspect}"
+        else
+          @ebuff += chr
+          @escapes = 4
+        end
+        @escapes = 0 if @escapes == 3
+        @escapes = 3 if @escapes == 4
+        @ebuff = '' if @escapes == 0
+        
+      elsif @escapes == 5
+        if chr == 'H'
+          route_key :home
+        elsif chr == 'F'
+          route_key :end
+        elsif chr == 'Q'
+          route_key :f2
+        elsif chr == 'R'
+          route_key :f3
+        elsif chr == 'S'
+          route_key :f4
+        else
+          raise "escape 5 #{chr.inspect}"
+        end
+        @escapes = 0
+        
+      else
+        @escapes = 0
+      end
     end
     
-    self.cursor = active_control
-    $stdout.flush
+    @driver.flush
     
   rescue Errno::EAGAIN
   rescue EOFError
   end
   
-  ######################################
-  # this is all copied from cashreg :P #
-  ######################################
-
-  # yay grep
-  TIOCGWINSZ = 0x5413
-  TCGETS = 0x5401
-  TCSETS = 0x5402
-  ECHO   = 8 # 0000010
-  ICANON = 2 # 0000002
-
-  # thanks google for all of this
-  def terminal_size
-    rows, cols = 25, 80
-    buf = [0, 0, 0, 0].pack("SSSS")
-    if $stdout.ioctl(TIOCGWINSZ, buf) >= 0 then
-      rows, cols, row_pixels, col_pixels = buf.unpack("SSSS")
+  def pane_at x, y
+    @panes.values.reverse.each do |pane|
+      return pane if pane.visible? && (pane.x1..pane.x2).include?(x) && (pane.y1..pane.y2).include?(y)
     end
-    return [rows, cols]
-  end
-
-  # had to convert these from C... fun
-  def prepare_modes
-    buf = [0, 0, 0, 0, 0, 0, ''].pack("IIIICCA*")
-    $stdout.ioctl(TCGETS, buf)
-    @old_modes = buf.unpack("IIIICCA*")
-    new_modes = @old_modes.clone
-    new_modes[3] &= ~ECHO # echo off
-    new_modes[3] &= ~ICANON # one char @ a time
-    $stdout.ioctl(TCSETS, new_modes.pack("IIIICCA*"))
-    self.cursor = false
+    nil
   end
-  def undo_modes # restore previous terminal mode
-    $stdout.ioctl(TCSETS, @old_modes.pack("IIIICCA*"))
-    print "\e[2J\e[H" # clear all and go home
-    self.cursor = true # show the mouse
+  
+  def route_key chr
+    @active_control.handle_char chr if @active_control
   end
 end
 end

data/lib/luck/listbox.rb

@@ -1,10 +1,21 @@
 module Luck
 class ListBox < Control
-  attr_accessor :data, :numbering, :hanging_indent
+  attr_accessor :data, :numbering, :hanging_indent, :offset, :index, :lastclick
+  
+  def on_submit &blck
+    @handler = blck
+  end
+  
+  def handler
+    @handler || @pane.handler
+  end
   
   def initialize *args
     @data = []
     @hanging_indent = 0
+    @offset = 0
+    @index = 0
+    @lastclick = Time.at 0
     super
   end
   
@@ -13,21 +24,144 @@ class ListBox < Control
     @hanging_indent = 4
   end
   
+  def fit_data offset=nil
+    lines = 0
+    items = 0
+    
+    data[offset || @offset, height].each do |line|
+      _height = line_height(line)
+      if _height + lines > height
+        break
+      else
+        lines += _height
+        items += 1
+      end
+    end
+    
+    [lines, items]
+  end
+  
+  def line_height line
+    lines = 0
+    
+    line = line.to_s
+    line = "##. #{line}" if @numbering
+    length = line.size
+    return 1 if length < 1
+    offset = 0
+    while offset < length
+      lines += 1
+      offset += width - ((offset > 0) ? @hanging_indent : 0)
+    end
+    
+    lines
+  end
+  
+  def fit_data_back offset=nil
+    lines = -1
+    items = 0
+    
+    offset ||= @offset
+    data[([offset - height,0].max)..([offset,0].max)].reverse.each do |line|
+      _height = line_height(line)
+      if _height + lines >= height
+        break
+      else
+        lines += _height
+        items += 1
+      end
+    end
+    
+    [lines, items]
+  end
+  
   def redraw
+    @display.driver.cursor = false if @display.active_control == self
+    
     row = y1
-    data.first(height).each_with_index do |line, index|
+    return unless data
+    data[@offset, height].each_with_index do |line, index|
       line = line.to_s
-      line = "#{(index + 1).to_s.rjust 2}. #{line}" if @numbering
+      number = index + @offset + 1
+      line = "#{number.to_s.rjust 2}. #{line}" if @numbering
+      print @display.color '1;34' if number == @index + 1
       length = line.size
       offset = 0
       while offset < length || offset == 0
-        @display.place row, x1 + ((offset > 0) ? @hanging_indent : 0), line[offset, width - ((offset > 0) ? @hanging_indent : 0)]
+        @display.place row, x1, ((' ' * ((offset > 0) ? @hanging_indent : 0)) + line[offset, width - ((offset > 0) ? @hanging_indent : 0)]).ljust(width, ' ')
         row += 1
         offset += width - ((offset > 0) ? @hanging_indent : 0)
-        break if row >= y2
+        if row >= y2
+          print @display.color '0' if number == @index + 1
+          break
+        end
       end
+      print @display.color '0' if number == @index + 1
       break if row >= y2
     end
+    
+    until row >= y2
+      @display.place row, x1, ' ' * width
+      row += 1
+    end
+  end
+  
+  def handle_char char
+    if char == "\n"
+      handler.call self, @data[@index] if handler
+    elsif char == :up
+      @index -= 1 if @index > 0
+      @offset -= 1 if @offset > @index
+    elsif char == :down
+      if @index < @data.size - 1
+        @index += 1 
+        @offset += 1 if @offset + fit_data[1] <= @index
+      end
+    elsif char == :pageup
+      @offset = [0, @offset - fit_data_back[1]].max
+      @index = [@offset + fit_data[1] - 1, @index].min
+    elsif char == :pagedown
+      @offset = [@data.size - 1, @offset + fit_data[1]].min
+      @offset = [@offset, @data.size - fit_data_back(@data.size)[1]].min
+      @index = [@offset, @index].max
+    end
+    redraw
+  end
+  
+  def handle_click button, modifiers, x, y
+    if button == :scrollup
+      @offset -= 1 if @offset > 0
+      @index = [@offset + fit_data[1] - 1, @index].min
+    elsif button == :scrolldown
+      @offset += 1 if @offset < (@data.size - fit_data_back(@data.size)[1])
+      @index = [@offset, @index].max
+    
+    elsif button == :left
+      if Time.now - @lastclick < 0.5
+        button = :double
+      end
+      @lastclick = Time.now
+      
+      previous = @index
+      
+      row = y1
+      data[@offset, height].each_with_index do |line, index|
+        _height = line_height(line)
+        if _height + row > height
+          break
+        else
+          row += _height
+        end
+        if row > y
+          @index = index + @offset
+          break
+        end
+      end
+      
+      handler.call self, @data[@index] if button == :double && previous == @index && handler
+      
+    end
+    redraw
   end
 end
 end

data/lib/luck/pane.rb

@@ -1,16 +1,45 @@
 module Luck
 class Pane
-  attr_accessor :display, :x1, :y1, :x2, :y2, :title, :controls
+  attr_accessor :display, :x1, :y1, :x2, :y2, :title, :controls, :handler, :dirty, :visible
   
   def initialize display, x1, y1, x2, y2, title, controls={}, &blck
     @display = display
     @x1, @y1 = x1, y1
     @x2, @y2 = x2, y2
     @title, @controls = title, controls
+    @dirty = false
+    @visible = true
     
     instance_eval &blck if blck
   end
   
+  def [] control
+    @controls[control]
+  end
+  
+  alias dirty? dirty
+  def dirty!
+    @dirty = true
+  end
+  
+  alias visible? visible
+  def show!; @visible = true; end
+  def hide!; @visible = false; end
+  
+  def yank_values
+    vals = {}
+    @controls.each_pair do |key, control|
+      next unless control.respond_to? :value
+      vals[key] = control.value
+      control.value = ''
+    end
+    vals
+  end
+  
+  def on_submit &blck
+    @handler = blck
+  end
+  
   def control name, type, *args, &blck
     @controls[name] = type.new(self, *args, &blck)
   end
@@ -39,6 +68,7 @@ class Pane
   def redraw
     draw_frame
     draw_contents
+    draw_title
   end
   
   def draw_contents
@@ -47,29 +77,55 @@ class Pane
     end
   end
   
-  def topbar
-    title = " * #{@title} * "
-    left = (((width - 1).to_f / 2) - (title.size.to_f / 2)).to_i
-
-    if title.size >= width
-      "#{@display.color '1;34'} #{@title[0, width - 3].center(width - 3)} #{@display.color '0;2'}"
-    else
-      title_colored = "#{@display.color '1;34'}#{title}#{@display.color '0;2'}"
-      ('-' * left) + title_colored + ('-' * (width - 1 - title.size - left))
+  def control_at x, y
+    @controls.values.each do |control|
+      return control if (control.x1..control.x2).include?(x) && (control.y1..control.y2).include?(y)
+    end
+    nil
+  end
+  
+  def handle_click button, modifiers, x, y
+    control = control_at x, y
+    if control
+      if button == :left
+        control.focus! if control.respond_to? :handle_char
+        control.redraw
+      end
+      control.handle_click button, modifiers, x, y if control.respond_to?(:handle_click)
     end
   end
 
   def draw_frame
-    bottombar = '-' * (width - 1)
+    linebar = 'q' * (width - 1)
     fillerbar = ' ' * (width - 1)
 
+    @display.driver.linedrawing = true
     print @display.color('0;2')
-    @display.place y1, x1, "+#{topbar}+"
-    @display.place y2, x1, "+#{bottombar}+"
+    
+    @display.place y1, x1, "n#{linebar}n"
+    @display.place y2, x1, "n#{linebar}n"
+    #~ @display.place y1, x1, "l#{topbar}k"
+    #~ @display.place y2, x1, "m#{bottombar}j"
 
     (y1 + 1).upto y2 - 1 do |row|
-      @display.place row, x1, "|#{fillerbar}|"
+      @display.place row, x1, "x#{fillerbar}x"
+    end
+    
+    @display.driver.linedrawing = false
+    print @display.color('0')
+  end
+
+  def draw_title
+    title = " * #{@title} * "
+    left = (((width - 1).to_f / 2) - (title.size.to_f / 2)).to_i
+
+    if title.size >= width
+      title = @title[0, width - 3]
+      left = 0
     end
+    
+    print @display.color('1;34')
+    @display.place y1, x1 + 1 + left, title
     print @display.color('0')
   end
 end

data/lib/luck/textbox.rb

@@ -1,10 +1,12 @@
 module Luck
 class TextBox < Label
-  attr_accessor :multiline, :handler, :label
+  attr_accessor :multiline, :handler, :label, :mask, :index
   
   def initialize *args
     @label = ''
     @text = 'Input box'
+    @index = 0
+    
     super
   end
   
@@ -17,30 +19,73 @@ class TextBox < Label
       when :right
         text.rjust width
       else
-        @display.place y1, x1 + text.size, "\e[s"
+        @display.driver.set_cursor y1, x1 + text.size - @text.size + @index if @display.active_control == self
     end
-    #print "\e[s" # save
+    @display.driver.cursor = true if @display.active_control == self
   end
   
   def on_submit &blck
     @handler = blck
   end
   
+  def value= val
+    @text = val
+    @index = @text.size if @index > @text.size
+  end
+  def value
+    @text
+  end
+  
   def text
-    return @text if @label.empty?
-    "#{@label}: #{@text}"
+    text = @mask ? (@mask * value.size) : value
+    text = "#{label}: #{text}" unless label.empty?
+    text
+  end
+  
+  def handler
+    @handler || @pane.handler
   end
   
   def handle_char char
     if char == "\n" && !@multiline
-      @handler.call @text if @handler
-      @text = ''
-    elsif char == "\177"
-      @text.slice! -1
-    else
-      @text += char
+      handler.call self, @text if handler
+      self.value = ''
+    elsif char == :backspace
+      if @index > 0
+        @index -= 1
+        @text.slice! @index, 1
+      end
+    elsif char == :delete
+      if @index < @text.size
+        @text.slice! @index, 1
+      end
+    elsif char == :left
+      @index -= 1 if @index > 0
+    elsif char == :right
+      @index += 1 if @index < @text.size
+    elsif char == :home
+      @index = 0
+    elsif char == :end
+      @index = @text.size
+    elsif char.is_a? String
+      @text.insert @index, char
+      @index += 1
     end
     redraw
   end
 end
+
+class CommandBox < TextBox
+  def command?
+    @text[0,1] == '/'
+  end
+  
+  def label
+    command? ? 'Command' : @label
+  end
+  
+  def value
+    command? ? super[1..-1] : super
+  end
+end
 end

data/lib/luck.rb

@@ -1,9 +1,12 @@
 Luck = Module.new
 
-require 'luck/display'
-require 'luck/pane'
+require 'luck/alert'
+require 'luck/ansi'
+require 'luck/button'
 require 'luck/control'
+require 'luck/display'
+require 'luck/label'
 require 'luck/listbox'
+require 'luck/pane'
 require 'luck/progressbar'
-require 'luck/label'
 require 'luck/textbox'

data/luck.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{luck}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Daniel Danopia"]
+  s.date = %q{2010-04-10}
+  s.description = %q{Pure-ruby CLI UI system. Includes multiple panes in a display and multiple controls in a pane. luck is lucky (as opposed to ncurses being cursed)}
+  s.email = %q{me.github@danopia.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "lib/luck.rb",
+     "lib/luck/alert.rb",
+     "lib/luck/ansi.rb",
+     "lib/luck/button.rb",
+     "lib/luck/control.rb",
+     "lib/luck/display.rb",
+     "lib/luck/label.rb",
+     "lib/luck/listbox.rb",
+     "lib/luck/pane.rb",
+     "lib/luck/progressbar.rb",
+     "lib/luck/textbox.rb",
+     "luck.gemspec"
+  ]
+  s.homepage = %q{http://github.com/danopia/luck}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Pure-ruby CLI UI system}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: luck
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Daniel Danopia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -05:00
+date: 2010-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,9 @@ files:
 - Rakefile
 - VERSION
 - lib/luck.rb
+- lib/luck/alert.rb
+- lib/luck/ansi.rb
+- lib/luck/button.rb
 - lib/luck/control.rb
 - lib/luck/display.rb
 - lib/luck/label.rb
@@ -45,6 +48,7 @@ files:
 - lib/luck/pane.rb
 - lib/luck/progressbar.rb
 - lib/luck/textbox.rb
+- luck.gemspec
 has_rdoc: true
 homepage: http://github.com/danopia/luck
 licenses: []