rndk 0.2.0 → 1.0.0

data/lib/rndk/template.rb

@@ -1,21 +1,41 @@
 require 'rndk'
 
 module RNDK
-  class TEMPLATE < Widget
-    def initialize(rndkscreen, xplace, yplace, title, label, plate,
-        overlay, box, shadow)
+  class Template < Widget
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
+      @widget_type = :template
+      @supported_signals += [:before_input, :after_input]
+
+      x       = 0
+      y       = 0
+      title   = "template"
+      label   = "label"
+      plate   = "##/##/####"
+      overlay = "dd/mm/yyyy"
+      box     = true
+      shadow  = false
+
+      config.each do |key, val|
+        x       = val if key == :x
+        y       = val if key == :y
+        title   = val if key == :title
+        label   = val if key == :label
+        plate   = val if key == :plate
+        overlay = val if key == :overlay
+        box     = val if key == :box
+        shadow  = val if key == :shadow
+      end
+
+      parent_width  = Ncurses.getmaxx(screen.window)
+      parent_height = Ncurses.getmaxy(screen.window)
       box_width = 0
       box_height = if box then 3 else 1 end
       plate_len = 0
 
-      if plate.nil? || plate.size == 0
-        return nil
-      end
+      return nil if plate.nil? || plate.size == 0
 
-      self.set_box(box)
+      self.set_box box
 
       field_width = plate.size + 2 * @border_size
 
@@ -36,11 +56,11 @@ module RNDK
         overlay_len = []
         @overlay = RNDK.char2Chtype(overlay, overlay_len, [])
         @overlay_len = overlay_len[0]
-        @field_attr = @overlay[0] & Ncurses::A_ATTRIBUTES
+        @field_attr = @overlay[0] & RNDK::Color[:extract]
       else
         @overlay = []
         @overlay_len = 0
-        @field_attr = Ncurses::A_NORMAL
+        @field_attr = RNDK::Color[:normal]
       end
 
       # Set the box width.
@@ -59,9 +79,9 @@ module RNDK
           box_width - @label_len - 2 * @border_size].min
 
       # Rejustify the x and y positions if we need to.
-      xtmp = [xplace]
-      ytmp = [yplace]
-      RNDK.alignxy(rndkscreen.window, xtmp, ytmp, box_width, box_height)
+      xtmp = [x]
+      ytmp = [y]
+      RNDK.alignxy(screen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -95,8 +115,8 @@ module RNDK
       @plate = plate.clone
 
       # Set up the rest of the structure.
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @shadow_win = nil
       @field_width = field_width
       @box_height = box_height
@@ -161,7 +181,7 @@ module RNDK
           end
 
           if change
-            if self.validTemplate(test)
+            if self.valid_template? test
               @info = test
               self.drawField
             else
@@ -187,16 +207,16 @@ module RNDK
             ypos + 1, xpos + 1)
       end
 
-      rndkscreen.register(:TEMPLATE, self)
+      screen.register(@widget_type, self)
     end
 
     # This actually manages the tempalte widget
-    def activate(actions)
-      self.draw(@box)
+    def activate(actions=[])
+      self.draw
 
       if actions.nil? || actions.size == 0
         while true
-          input = self.getch([])
+          input = self.getch
 
           # Inject each character into the widget.
           ret = self.inject(input)
@@ -220,10 +240,10 @@ module RNDK
     end
 
     # This injects a character into the widget.
-    def inject(input)
-      pp_return = 1
+    def inject input
+      pp_return = true
       complete = false
-      ret = -1
+      ret = false
 
       self.set_exit_type(0)
 
@@ -231,16 +251,14 @@ module RNDK
       self.drawField
 
       # Check if there is a pre-process function to be called.
-      unless @pre_process_func.nil?
-        pp_return = @pre_process_func.call(:TEMPLATE, self,
-            @pre_process_data, input)
-      end
+      keep_going = self.run_signal_binding(:before_input, input)
+
+      if keep_going
 
-      # Should we continue?
-      if pp_return != 0
         # Check a predefined binding
-        if self.checkBind(:TEMPLATE, input)
-          complete = true
+        if self.is_bound? input
+          self.run_key_binding input
+          #complete = true
         else
           case input
           when RNDK::ERASE
@@ -296,26 +314,22 @@ module RNDK
           end
         end
 
-        # Should we call a post-process?
-        if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:TEMPLATE, self, @post_process_data, input)
-        end
+        self.run_signal_binding(:after_input) if not complete
       end
 
-      if !complete
-        self.set_exit_type(0)
-      end
 
+      self.set_exit_type(0) if not complete
       @return_data = ret
-      return ret
+
+      ret
     end
 
-    def validTemplate(input)
+    def valid_template? input
       pp = 0
       ip = 0
       while ip < input.size && pp < @plate.size
         newchar = input[ip]
-        while pp < @plate.size && !RNDK::TEMPLATE.isPlateChar(@plate[pp])
+        while pp < @plate.size && !RNDK::Template.isPlateChar(@plate[pp])
           pp += 1
         end
         if pp == @plate.size
@@ -352,7 +366,7 @@ module RNDK
       if @info.size > 0
         mixed_string = ''
         while plate_pos < @plate_len && info_pos < @info.size
-          mixed_string << if RNDK::TEMPLATE.isPlateChar(@plate[plate_pos])
+          mixed_string << if RNDK::Template.isPlateChar(@plate[plate_pos])
                           then info_pos += 1; @info[info_pos - 1]
                           else @plate[plate_pos]
                           end
@@ -369,7 +383,7 @@ module RNDK
       unmixed_string = ''
 
       while pos < @info.size
-        if RNDK::TEMPLATE.isPlateChar(@plate[pos])
+        if RNDK::Template.isPlateChar(@plate[pos])
           unmixed_string << info[pos]
         end
         pos += 1
@@ -379,9 +393,9 @@ module RNDK
     end
 
     # Move the template field to the given location.
-    def move(xplace, yplace, relative, refresh_flag)
+    def move(x, y, relative, refresh_flag)
       windows = [@win, @label_win, @field_win, @shadow_win]
-      self.move_specific(xplace, yplace, relative, refresh_flag,
+      self.move_specific(x, y, relative, refresh_flag,
           windows, [])
     end
 
@@ -397,7 +411,7 @@ module RNDK
         Draw.drawObjBox(@win, self)
       end
 
-      self.drawTitle(@win)
+      self.draw_title(@win)
 
       Ncurses.wrefresh @win
 
@@ -408,7 +422,7 @@ module RNDK
     def drawField
       field_color = 0
 
-      # Draw in the label and the template object.
+      # Draw in the label and the template widget.
       unless @label_win.nil?
         Draw.writeChtype(@label_win, 0, 0, @label, RNDK::HORIZONTAL,
             0, @label_len)
@@ -425,8 +439,8 @@ module RNDK
       if @info.size > 0
         pos = 0
         (0...[@field_width, @plate.size].min).each do |x|
-          if RNDK::TEMPLATE.isPlateChar(@plate[x]) && pos < @info.size
-            field_color = @overlay[x] & Ncurses::A_ATTRIBUTES
+          if RNDK::Template.isPlateChar(@plate[x]) && pos < @info.size
+            field_color = @overlay[x] & RNDK::Color[:extract]
             Ncurses.mvwaddch(@field_win, 0, x, @info[pos].ord | field_color)
             pos += 1
           end
@@ -441,7 +455,7 @@ module RNDK
     # Adjust the cursor for the template
     def adjustCursor(direction)
       while @plate_pos < [@field_width, @plate.size].min &&
-          !RNDK::TEMPLATE.isPlateChar(@plate[@plate_pos])
+          !RNDK::Template.isPlateChar(@plate[@plate_pos])
         @plate_pos += direction
         @screen_pos += direction
       end
@@ -450,7 +464,7 @@ module RNDK
     end
 
     # Set the background attribute of the widget.
-    def set_bg_attrib(attrib)
+    def set_bg_color(attrib)
       Ncurses.wbkgd(@win, attrib)
       Ncurses.wbkgd(@field_win, attrib)
       Ncurses.wbkgd(@label_win, attrib) unless @label_win.nil?
@@ -458,7 +472,7 @@ module RNDK
 
     # Destroy this widget.
     def destroy
-      self.cleanTitle
+      self.clean_title
 
       # Delete the windows
       RNDK.window_delete(@field_win)
@@ -467,14 +481,14 @@ module RNDK
       RNDK.window_delete(@win)
 
       # Clean the key bindings.
-      self.clean_bindings(:TEMPLATE)
+      self.clean_bindings
 
-      RNDK::Screen.unregister(:TEMPLATE, self)
+      @screen.unregister self
     end
 
     # Erase the widget.
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase(@field_win)
         RNDK.window_erase(@label_win)
         RNDK.window_erase(@shadow_win)
@@ -538,11 +552,11 @@ module RNDK
     end
 
     def focus
-      self.draw(@box)
+      self.draw
     end
 
     def unfocus
-      self.draw(@box)
+      self.draw
     end
 
     def self.isPlateChar(c)
@@ -553,8 +567,7 @@ module RNDK
       super(@win)
     end
 
-    def object_type
-      :TEMPLATE
-    end
+
+
   end
 end

data/lib/rndk/version.rb

@@ -1,5 +1,5 @@
 module RNDK
-  VERSION="0.2.0"
+  VERSION="1.0.0"
   VERSION_MAJOR = VERSION.split('.')[0]
   VERSION_MINOR = VERSION.split('.')[1]
   VERSION_PATCH = VERSION.split('.')[2]

data/lib/rndk/viewer.rb

@@ -1,41 +1,144 @@
 require 'rndk'
+require 'rndk/label'
+require 'rndk/entry'
 
 module RNDK
-  class VIEWER < Widget
-    DOWN = 0
-    UP = 1
 
-    def initialize(rndkscreen, xplace, yplace, height, width,
-        buttons, button_count, button_highlight, box, shadow)
+  # Shows a list of lines with lots of fancy things.
+  # Generally used to view files, has Buttons, Label and Entry.
+  #
+  # ## Example
+  #
+  # ```
+  # viewer = RNDK::Viewer.new(screen, {
+  #                             :x => RNDK::CENTER,
+  #                             :y => RNDK::CENTER,
+  #                             :title => "</77>Awesome Viewer",
+  #                             :buttons => buttons,
+  #                             :shadow => true
+  #                           })
+  #
+  # # To set the lines of Viewer we must use Viewer#set.
+  # # No way to do it on the constructor :(
+  # viewer.set :items => lines
+  # ```
+  #
+  # ## Keybindings
+  #
+  # Left Arrow::  Shifts the viewport one column left.
+  # Right Arrow:: Shifts the viewport one column left
+  # Up Arrow::    Scrolls the viewport one line up.
+  # Down Arrow::  Scrolls the viewport one line down.
+  # Prev Page::   Scroll one page backward.
+  # Ctrl-B::      Scroll one page backward.
+  # B::           Scroll one page backward.
+  # b::           Scroll one page backward.
+  # Next Page::   Scroll one page forward.
+  # Ctrl-F::      Scroll one page forward.
+  # Space::       Scroll one page forward.
+  # F::           Scroll one page forward.
+  # f::           Scroll one page forward.
+  # Home::        Shift the whole list to the far left.
+  # |::           Shift the whole list to the far left.
+  # End::         Shift the whole list to the far right.
+  # $::           Shift the whole list to the far right.
+  # 1::           Moves to the first line in the viewer.
+  # <::           Moves to the first line in the viewer.
+  # g::           Moves to the first line in the viewer.
+  # >::           Moves to the last line in the viewer.
+  # G::           Moves to the last line in the viewer.
+  # L::           Moves half the distance to  the  end  of the viewer.
+  # l::           Moves  half  the  distance to the top of the viewer.
+  # ?::           Searches up for a pattern.
+  # /::           Searches down for a pattern.
+  # n::           Repeats last search.
+  # N::           Repeats last search, reversed direction.
+  # :::           Jumps to a given line.
+  # i::           Displays file statistics.
+  # s::              Displays file statistics.
+  # Tab::            Switches buttons.
+  # Return::         Exit the widget and return the index  of the  selected  button.   Set `exit_type` to `:NORMAL`.
+  # Escape::         Exit the widget and return -1.  Set `exit_type` to `:ESCAPE_HIT`.
+  # Ctrl-L::         Refreshes the screen.
+  #
+  #
+  # TODO There's something wrong with this widget
+  #      why wont it work with Traverse?
+  class Viewer < Widget
+
+    DOWN = 0
+    UP   = 1
+
+    # Creates a new Viewer Widget.
+    #
+    # ## Settings
+    #
+    # * `x` is the x position - can be an integer or
+    #   `RNDK::LEFT`, `RNDK::RIGHT`, `RNDK::CENTER`.
+    # * `y` is the y position - can be an integer or
+    #   `RNDK::TOP`, `RNDK::BOTTOM`, `RNDK::CENTER`.
+    # * `width`/`height` are integers - if either are 0, Widget
+    #   will be created with full width/height of the screen.
+    #   If it's a negative value, will create with full width/height
+    #   minus the value.
+    # * `title` can be more than one line - just split them
+    #   with `\n`s.
+    # * `buttons` is an Array of Strings with all buttons.
+    #
+    # @todo complete documentation
+    #
+    # @note To set the data inside Viewer, you _must_ call
+    #       Viewer#set! No stuffin' things on the constructor.
+    #
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
-      box_width = width
+      @widget_type = :viewer
+      @supported_signals += [:before_input, :after_input]
+
+      # This is UGLY AS HELL
+      # But I don't have time to clean this up right now
+      # (lots of widgets, you know)  :(
+      x                = 0
+      y                = 0
+      width            = 0
+      height           = 0
+      title            = "viewer"
+      buttons          = []
+      button_highlight = RNDK::Color[:reverse]
+      box              = true
+      shadow           = false
+
+      config.each do |key, val|
+        x                = val if key == :x
+        y                = val if key == :y
+        width            = val if key == :width
+        height           = val if key == :height
+        title            = val if key == :title
+        buttons          = val if key == :buttons
+        button_highlight = val if key == :button_highlight
+        box              = val if key == :box
+        shadow           = val if key == :shadow
+      end
+
+      parent_width  = Ncurses.getmaxx screen.window
+      parent_height = Ncurses.getmaxy screen.window
+
+      box_width  = width
       box_height = height
+
       button_width = 0
       button_adj = 0
       button_pos = 1
-      bindings = {
-          RNDK::BACKCHAR => Ncurses::KEY_PPAGE,
-          'b'           => Ncurses::KEY_PPAGE,
-          'B'           => Ncurses::KEY_PPAGE,
-          RNDK::FORCHAR  => Ncurses::KEY_NPAGE,
-          ' '           => Ncurses::KEY_NPAGE,
-          'f'           => Ncurses::KEY_NPAGE,
-          'F'           => Ncurses::KEY_NPAGE,
-          '|'           => Ncurses::KEY_HOME,
-          '$'           => Ncurses::KEY_END,
-      }
-
-      self.set_box(box)
-
-      box_height = RNDK.setWidgetDimension(parent_height, height, 0)
-      box_width = RNDK.setWidgetDimension(parent_width, width, 0)
+
+      self.set_box box
+
+      box_width  = RNDK.set_widget_dimension(parent_width, width, 0)
+      box_height = RNDK.set_widget_dimension(parent_height, height, 0)
 
       # Rejustify the x and y positions if we need to.
-      xtmp = [xplace]
-      ytmp = [yplace]
-      RNDK.alignxy(rndkscreen.window, xtmp, ytmp, box_width, box_height)
+      xtmp = [x]
+      ytmp = [y]
+      RNDK.alignxy(screen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -50,28 +153,29 @@ module RNDK
       Ncurses.keypad(@win, true)
 
       # Create the buttons.
-      @button_count = button_count
+      @button_count = buttons.size
       @button = []
       @button_len = []
       @button_pos = []
-      if button_count > 0
-        (0...button_count).each do |x|
+
+      if @button_count > 0
+        (0...@button_count).each do |x|
           button_len = []
           @button << RNDK.char2Chtype(buttons[x], button_len, [])
           @button_len << button_len[0]
           button_width += @button_len[x] + 1
         end
-        button_adj = (box_width - button_width) / (button_count + 1)
+        button_adj = (box_width - button_width) / (@button_count + 1)
         button_pos = 1 + button_adj
-        (0...button_count).each do |x|
+        (0...@button_count).each do |x|
           @button_pos << button_pos
           button_pos += button_adj + @button_len[x]
         end
       end
 
       # Set the rest of the variables.
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @shadow_win = nil
       @button_highlight = button_highlight
       @box_height = box_height
@@ -86,10 +190,14 @@ module RNDK
       @max_left_char = 0
       @max_top_line = 0
       @characters = 0
-      @list_size = -1
-      @show_line_info = 1
+      @items_size = -1
+      @show_line_items = 1
       @exit_type = :EARLY_EXIT
 
+      @search_pattern = []
+
+      self.set_title title
+
       # Do we need to create a shadow?
       if shadow
         @shadow_win = Ncurses.newwin(box_height,
@@ -103,26 +211,53 @@ module RNDK
       end
 
       # Setup the key bindings.
-      bindings.each do |from, to|
-        self.bind(:VIEWER, from, :getc, to)
-      end
-
-      rndkscreen.register(:VIEWER, self)
+      self.bind_key('b') { self.scroll_page_up   }
+      self.bind_key('B') { self.scroll_page_up   }
+      self.bind_key(' ') { self.scroll_page_down }
+      self.bind_key('f') { self.scroll_page_down }
+      self.bind_key('F') { self.scroll_page_down }
+      self.bind_key('|') { self.scroll_begin     }
+      self.bind_key('$') { self.scroll_end       }
+
+      screen.register(@widget_type, self)
     end
 
     # This function sets various attributes of the widget.
-    def set(title, list, list_size, button_highlight,
-        attr_interp, show_line_info, box)
-      self.set_title(title)
-      self.set_highlight(button_highlight)
-      self.setInfoLine(show_line_info)
-      self.set_box(box)
-      return self.setInfo(list, list_size, attr_interp)
+    def set(config)
+      items            = @items
+      hide_control_chars = @hide_control_chars
+      show_line_items   = @show_line_items
+      title            = @title
+      buttons          = @buttons
+      button_highlight = @button_highlight
+      box              = @box
+      shadow           = @shadow
+
+      config.each do |key, val|
+        x                  = val if key == :x
+        y                  = val if key == :y
+        width              = val if key == :width
+        height             = val if key == :height
+        title              = val if key == :title
+        items              = val if key == :items
+        hide_control_chars = val if key == :hide_control_chars
+        show_line_items    = val if key == :show_line_items
+        buttons            = val if key == :buttons
+        button_highlight   = val if key == :button_highlight
+        box                = val if key == :box
+        shadow             = val if key == :shadow
+      end
+
+      self.set_title(title)                  if title != @title
+      self.set_highlight(button_highlight)   if button_highlight != @button_highlight
+      self.set_items_line(show_line_items)   if show_line_items != @show_line_items
+      self.set_box(box)                      if box != @box
+      self.set_items(items, hide_control_chars) if items != @items
     end
 
     # This sets the title of the viewer. (A nil title is allowed.
     # It just means that the viewer will not have a title when drawn.)
-    def set_title(title)
+    def set_title title
       super(title, -(@box_width + 1))
       @title_adj = @title_lines
 
@@ -130,66 +265,64 @@ module RNDK
       @view_size = @box_height - (@title_lines + 1) - 2
     end
 
-    def getTitle
-      return @title
+    def get_title
+      @title
     end
 
-    def setupLine(interpret, list, x)
+    def setup_line(interpret, items, x)
       # Did they ask for attribute interpretation?
       if interpret
-        list_len = []
-        list_pos = []
-        @list[x] = RNDK.char2Chtype(list, list_len, list_pos)
-        @list_len[x] = list_len[0]
-        @list_pos[x] = RNDK.justifyString(@box_width, @list_len[x], list_pos[0])
+        items_len = []
+        items_pos = []
+        @items[x] = RNDK.char2Chtype(items, items_len, items_pos)
+        @items_len[x] = items_len[0]
+        @items_pos[x] = RNDK.justifyString(@box_width, @items_len[x], items_pos[0])
       else
         # We must convert tabs and other nonprinting characters. The curses
         # library normally does this, but we are bypassing it by writing
         # chtypes directly.
         t = ''
         len = 0
-        (0...list.size).each do |y|
-          if list[y] == "\t".ord
+        (0...items.size).each do |y|
+          if items[y] == "\t".ord
             begin
               t  << ' '
               len += 1
             end while (len & 7) != 0
-          elsif RNDK.CharOf(list[y].ord).match(/^[[:print:]]$/)
-            t << RNDK.CharOf(list[y].ord)
+          elsif RNDK.char_of(items[y].ord).match(/^[[:print:]]$/)
+            t << RNDK.char_of(items[y].ord)
             len += 1
           else
-            t << Ncurses.unctrl(list[y].ord)
+            t << Ncurses.unctrl(items[y].ord)
             len += 1
           end
         end
-        @list[x] = t
-        @list_len[x] = t.size
-        @list_pos[x] = 0
+        @items[x] = t
+        @items_len[x] = t.size
+        @items_pos[x] = 0
       end
-      @widest_line = [@widest_line, @list_len[x]].max
+      @widest_line = [@widest_line, @items_len[x]].max
     end
 
-    def freeLine(x)
-      if x < @list_size
-        @list[x] = ''
-      end
+    def free_line(x)
+      @items[x] = '' if x < @items_size
     end
 
     # This function sets the contents of the viewer.
-    def setInfo(list, list_size, interpret)
+    def set_items(items, interpret)
       current_line = 0
-      viewer_size = list_size
+      viewer_size = items.size
 
-      if list_size < 0
-        list_size = list.size
+      if items.size < 0
+        items.size = items.size
       end
 
       # Compute the size of the resulting display
-      viewer_size = list_size
-      if list.size > 0 && interpret
-        (0...list_size).each do |x|
+      viewer_size = items.size
+      if items.size > 0 && interpret
+        (0...items.size).each do |x|
           filename = ''
-          if RNDK.checkForLink(list[x], filename) == 1
+          if RNDK.checkForLink(items[x], filename) == 1
             file_contents = []
             file_len = RNDK.read_file(filename, file_contents)
 
@@ -200,27 +333,27 @@ module RNDK
         end
       end
 
-      # Clean out the old viewer info. (if there is any)
+      # Clean out the old viewer items. (if there is any)
       @in_progress = true
       self.clean
-      self.createList(viewer_size)
+      self.create_items(viewer_size)
 
-      # Keep some semi-permanent info
+      # Keep some semi-permanent items
       @interpret = interpret
 
-      # Copy the information given.
+      # Copy the itemsrmation given.
       current_line = 0
       x = 0
-      while x < list_size && current_line < viewer_size
-        if list[x].size == 0
-          @list[current_line] = ''
-          @list_len[current_line] = 0
-          @list_pos[current_line] = 0
+      while x < items.size && current_line < viewer_size
+        if items[x].size == 0
+          @items[current_line] = ''
+          @items_len[current_line] = 0
+          @items_pos[current_line] = 0
           current_line += 1
         else
           # Check if we have a file link in this line.
           filename = []
-          if RNDK.checkForLink(list[x], filename) == 1
+          if RNDK.checkForLink(items[x], filename) == 1
             # We have a link, open the file.
             file_contents = []
             file_len = 0
@@ -233,7 +366,7 @@ module RNDK
                           else '<C></K>Link Failed: Could not open the file %s'
                           end
               temp = fopen_fmt % filename
-              self.setupLine(true, temp, current_line)
+              self.setup_line(true, temp, current_line)
               current_line += 1
             else
               # For each line read, copy it into the viewer.
@@ -242,14 +375,14 @@ module RNDK
                 if current_line >= viewer_size
                   break
                 end
-                self.setupLine(false, file_contents[file_line], current_line)
-                @characters += @list_len[current_line]
+                self.setup_line(false, file_contents[file_line], current_line)
+                @characters += @items_len[current_line]
                 current_line += 1
               end
             end
           elsif current_line < viewer_size
-            self.setupLine(@interpret, list[x], current_line)
-            @characters += @list_len[current_line]
+            self.setup_line(@interpret, items[x], current_line)
+            @characters += @items_len[current_line]
             current_line += 1
           end
         end
@@ -264,20 +397,20 @@ module RNDK
         @max_left_char = 0
       end
 
-      # Set up the needed vars for the viewer list.
+      # Set up the needed vars for the viewer items.
       @in_progress = false
-      @list_size = viewer_size
-      if @list_size <= @view_size
+      @items_size = viewer_size
+      if @items_size <= @view_size
         @max_top_line = 0
       else
-        @max_top_line = @list_size - 1
+        @max_top_line = @items_size - 1
       end
-      return @list_size
+      return @items_size
     end
 
-    def getInfo(size)
-      size << @list_size
-      return @list
+    def get_items(size)
+      size << @items_size
+      @items
     end
 
     # This function sets the highlight type of the buttons.
@@ -285,72 +418,101 @@ module RNDK
       @button_highlight = button_highlight
     end
 
-    def getHighlight
-      return @button_highlight
+    def get_highlight
+      @button_highlight
     end
 
-    # This sets whether or not you wnat to set the viewer info line.
-    def setInfoLine(show_line_info)
-      @show_line_info = show_line_info
+    # This sets whether or not you wnat to set the viewer
+    # items line.
+    def set_items_line(show_line_items)
+      @show_line_items = show_line_items
     end
 
-    def getInfoLine
-      return @show_line_info
+    def get_items_line
+      @show_line_items
     end
 
     # This removes all the lines inside the scrolling window.
     def clean
       # Clean up the memory used...
-      (0...@list_size).each do |x|
-        self.freeLine(x)
+      (0...@items_size).each do |x|
+        self.free_line(x)
       end
 
       # Reset some variables.
-      @list_size = 0
+      @items_size = 0
       @max_left_char = 0
       @widest_line = 0
       @current_top = 0
       @max_top_line = 0
 
       # Redraw the window.
-      self.draw @box
+      self.draw
     end
 
     def PatternNotFound(pattern)
-      temp_info = [
+      temp_items = [
           "</U/5>Pattern '%s' not found.<!U!5>" % pattern,
       ]
-      self.popUpLabel(temp_info)
+      @screen.popup_label temp_items
     end
 
     # This function actually controls the viewer...
-    def activate(actions)
+    def activate(actions=[])
+      self.draw
+
+      if actions.nil? || actions.size == 0
+        loop do
+          input = self.getch
+
+          # Inject the character into the widget.
+          ret = self.inject input
+
+          return ret if @exit_type != :EARLY_EXIT
+        end
+      else
+        # Inject each character one at a time.
+        actions.each do |action|
+          ret = self.inject action
+
+          return ret if @exit_type != :EARLY_EXIT
+        end
+      end
+
+      # Set the exit type for the widget and return
+      self.set_exit_type(0)
+      return nil
+    end
+
+    def inject input
+
       refresh = false
-      # Create the information about the file stats.
-      file_info = [
+      # Create the itemsrmation about the file stats.
+      file_items = [
           '</5>      </U>File Statistics<!U>     <!5>',
           '</5>                          <!5>',
           '</5/R>Character Count:<!R> %-4d     <!5>' % @characters,
-          '</5/R>Line Count     :<!R> %-4d     <!5>' % @list_size,
+          '</5/R>Line Count     :<!R> %-4d     <!5>' % @items_size,
           '</5>                          <!5>',
           '<C></5>Press Any Key To Continue.<!5>'
       ]
 
-      temp_info = ['<C></5>Press Any Key To Continue.<!5>']
+      temp_items = ['<C></5>Press Any Key To Continue.<!5>']
 
-      # Set the current button.
-      @current_button = 0
+      # Calls a pre-process block if exists.
+      # They can interrup input.
+      continue = run_signal_binding(:before_input, input)
 
-      # Draw the widget list.
-      self.draw(@box)
+      if continue
 
-      # Do this until KEY_ENTER is hit.
-      while true
         # Reset the refresh flag.
         refresh = false
 
-        input = self.getch([])
-        if !self.checkBind(:VIEWER, input)
+        if self.is_bound? input
+          self.run_key_binding input
+          #complete = true
+
+        else
           case input
           when RNDK::KEY_TAB
             if @button_count > 1
@@ -361,7 +523,7 @@ module RNDK
               end
 
               # Redraw the buttons.
-              self.drawButtons
+              self.draw_buttons
             end
           when RNDK::PREV
             if @button_count > 1
@@ -372,78 +534,36 @@ module RNDK
               end
 
               # Redraw the buttons.
-              self.drawButtons
-            end
-          when Ncurses::KEY_UP
-            if @current_top > 0
-              @current_top -= 1
-              refresh = true
-            else
-              RNDK.beep
-            end
-          when Ncurses::KEY_DOWN
-            if @current_top < @max_top_line
-              @current_top += 1
-              refresh = true
-            else
-              RNDK.beep
-            end
-          when Ncurses::KEY_RIGHT
-            if @left_char < @max_left_char
-              @left_char += 1
-              refresh = true
-            else
-              RNDK.beep
-            end
-          when Ncurses::KEY_LEFT
-            if @left_char > 0
-              @left_char -= 1
-              refresh = true
-            else
-              RNDK.beep
-            end
-          when Ncurses::KEY_PPAGE
-            if @current_top > 0
-              if @current_top - (@view_size - 1) > 0
-                @current_top = @current_top - (@view_size - 1)
-              else
-                @current_top = 0
-              end
-              refresh = true
-            else
-              RNDK.beep
-            end
-          when Ncurses::KEY_NPAGE
-            if @current_top < @max_top_line
-              if @current_top + @view_size < @max_top_line
-                @current_top = @current_top + (@view_size - 1)
-              else
-                @current_top = @max_top_line
-              end
-              refresh = true
-            else
-              RNDK.beep
+              self.draw_buttons
             end
-          when Ncurses::KEY_HOME
-            @left_char = 0
-            refresh = true
-          when Ncurses::KEY_END
-            @left_char = @max_left_char
-            refresh = true
+          when Ncurses::KEY_UP    then self.scroll_up
+          when Ncurses::KEY_DOWN  then self.scroll_down
+          when Ncurses::KEY_RIGHT then self.scroll_right
+          when Ncurses::KEY_LEFT  then self.scroll_left
+          when Ncurses::KEY_HOME  then self.scroll_begin
+          when Ncurses::KEY_END   then self.scroll_end
+          when Ncurses::KEY_PPAGE, RNDK::BACKCHAR
+            self.scroll_page_up
+          when Ncurses::KEY_NPAGE, RNDK::FORCHAR
+            self.scroll_page_down
+
           when 'g'.ord, '1'.ord, '<'.ord
             @current_top = 0
             refresh = true
+
           when 'G'.ord, '>'.ord
             @current_top = @max_top_line
             refresh = true
+
           when 'L'.ord
-            x = (@list_size + @current_top) / 2
+            x = (@items_size + @current_top) / 2
             if x < @max_top_line
               @current_top = x
               refresh = true
             else
               RNDK.beep
             end
+
           when 'l'.ord
             x = @current_top / 2
             if x >= 0
@@ -452,25 +572,29 @@ module RNDK
             else
               RNDK.beep
             end
+
           when '?'.ord
-            @search_direction = RNDK::VIEWER::UP
-            self.getAndStorePattern(@screen)
-            if !self.searchForWord(@search_pattern, @search_direction)
+            @search_direction = Viewer::UP
+            self.get_and_store_pattern(@screen)
+            if !self.search_for_word(@search_pattern, @search_direction)
               self.PatternNotFound(@search_pattern)
             end
             refresh = true
+
           when '/'.ord
-            @search_direction = RNDK::VIEWER:DOWN
-            self.getAndStorePattern(@screen)
-            if !self.searchForWord(@search_pattern, @search_direction)
+            @search_direction = Viewer::DOWN
+            self.get_and_store_pattern(@screen)
+            if !self.search_for_word(@search_pattern, @search_direction)
               self.PatternNotFound(@search_pattern)
             end
             refresh = true
+
           when 'N'.ord, 'n'.ord
             if @search_pattern == ''
-              temp_info[0] = '</5>There is no pattern in the buffer.<!5>'
-              self.popUpLabel(temp_info)
-            elsif !self.searchForWord(@search_pattern,
+              temp_items[0] = '</5>There is no pattern in the buffer.<!5>'
+              @screen.popup_label temp_items
+
+            elsif !self.search_for_word(@search_pattern,
                 if input == 'n'.ord
                 then @search_direction
                 else 1 - @search_direction
@@ -478,11 +602,12 @@ module RNDK
               self.PatternNotFound(@search_pattern)
             end
             refresh = true
+
           when ':'.ord
-            @current_top = self.jumpToLine
+            @current_top = self.jump_to_line
             refresh = true
           when 'i'.ord, 's'.ord, 'S'.ord
-            self.popUpLabel(file_info)
+            @screen.popup_label file_items
             refresh = true
           when RNDK::KEY_ESC
             self.set_exit_type(input)
@@ -494,36 +619,41 @@ module RNDK
             self.set_exit_type(input)
             return @current_button
           when RNDK::REFRESH
-            @screen.erase
-            @screen.refresh
+            self.draw
           else
             RNDK.beep
           end
+
+          run_signal_binding(:after_input, input)
         end
 
         # Do we need to redraw the screen?
-        if refresh
-          self.drawInfo
-        end
+        self.draw_items if refresh
       end
+      self.draw
     end
 
     # This searches the document looking for the given word.
-    def getAndStorePattern(screen)
+    def get_and_store_pattern(screen)
       temp = ''
 
       # Check the direction.
-      if @search_direction == RNDK::VIEWER::UP
+      if @search_direction == Viewer::UP
         temp = '</5>Search Up  : <!5>'
       else
         temp = '</5>Search Down: <!5>'
       end
 
       # Pop up the entry field.
-      get_pattern = RNDK::Entry.new(screen, RNDK::CENTER, RNDK::CENTER,
-          '', label, Ncurses.COLOR_PAIR(5) | Ncurses::A_BOLD,
-          '.' | Ncurses.COLOR_PAIR(5) | Ncurses::A_BOLD,
-          :MIXED, 10, 0, 256, true, false)
+      get_pattern = RNDK::Entry.new(screen, {
+                                      :x => RNDK::CENTER,
+                                      :y => RNDK::CENTER,
+                                      :title => '',
+                                      :label => temp,
+                                      :field_color => RNDK::Color[:white_blue] | RNDK::Color[:bold],
+                                      :filler => '.'.ord | RNDK::Color[:white_blue] | RNDK::Color[:bold],
+                                      :field_width => 10
+                                    })
 
       # Is there an old search pattern?
       if @search_pattern.size != 0
@@ -532,11 +662,11 @@ module RNDK
       end
 
       # Activate this baby.
-      list = get_pattern.activate([])
+      items = get_pattern.activate([])
 
-      # Save teh list.
-      if list.size != 0
-        @search_pattern = list
+      # Save teh items.
+      if items.size != 0
+        @search_pattern = items
       end
 
       # Clean up.
@@ -545,22 +675,22 @@ module RNDK
 
     # This searches for a line containing the word and realigns the value on
     # the screen.
-    def searchForWord(pattern, direction)
+    def search_for_word(pattern, direction)
       found = false
 
       # If the pattern is empty then return.
       if pattern.size != 0
-        if direction == RNDK::VIEWER::DOWN
+        if direction == Viewer::DOWN
           # Start looking from 'here' down.
           x = @current_top + 1
-          while !found && x < @list_size
+          while !found && x < @items_size
             pos = 0
             y = 0
-            while y < @list[x].size
-              plain_char = RNDK.CharOf(@list[x][y])
+            while y < @items[x].size
+              plain_char = RNDK.char_of(@items[x][y])
 
               pos += 1
-              if @RNDK.CharOf(pattern[pos-1]) != plain_char
+              if RNDK.char_of(pattern[pos-1]) != plain_char
                 y -= (pos - 1)
                 pos = 0
               elsif pos == pattern.size
@@ -579,11 +709,11 @@ module RNDK
           while ! found && x >= 0
             y = 0
             pos = 0
-            while y < @list[x].size
-              plain_char = RNDK.CharOf(@list[x][y])
+            while y < @items[x].size
+              plain_char = RNDK.char_of(@items[x][y])
 
               pos += 1
-              if RNDK.CharOf(pattern[pos-1]) != plain_char
+              if RNDK.char_of(pattern[pos-1]) != plain_char
                 y -= (pos - 1)
                 pos = 0
               elsif pos == pattern.size
@@ -596,62 +726,55 @@ module RNDK
           end
         end
       end
-      return found
+      found
     end
 
     # This allows us to 'jump' to a given line in the file.
-    def jumpToLine
-      newline = RNDK::SCALE.new(@screen, RNDK::CENTER, RNDK::CENTER,
-          '<C>Jump To Line', '</5>Line :', Ncurses::A_BOLD,
-          @list_size.size + 1, @current_top + 1, 0, @max_top_line + 1,
-          1, 10, true, true)
-      line = newline.activate([])
+    def jump_to_line
+      newline = RNDK::Scale.new(@screen, {
+                                  :x => RNDK::CENTER,
+                                  :y => RNDK::CENTER,
+                                  :title => '<C>Jump To Line',
+                                  :label => '</5>Line :',
+                                  :field_color => RNDK::Color[:bold],
+                                  :field_width => @items_size.size + 1,
+                                  :start => @current_top + 1,
+                                  :high => @max_top_line + 1,
+                                  :fast_increment => 10,
+                                  :shador => true
+                                })
+
+      line = newline.activate
       newline.destroy
-      return line - 1
-    end
-
-    # This pops a little message up on the screen.
-    def popUpLabel(mesg)
-      # Set up variables.
-      label = RNDK::Label.new(@screen, RNDK::CENTER, RNDK::CENTER,
-          mesg, mesg.size, true, false)
-
-      # Draw the label and wait.
-      label.draw(true)
-      label.getch([])
-
-      # Clean up.
-      label.destroy
+      line - 1
     end
 
     # This moves the viewer field to the given location.
     # Inherited
-    # def move(xplace, yplace, relative, refresh_flag)
+    # def move(x, y, relative, refresh_flag)
     # end
 
     # This function draws the viewer widget.
-    def draw(box)
+    def draw
       # Do we need to draw in the shadow?
       unless @shadow_win.nil?
         Draw.drawShadow @shadow_win
       end
 
       # Box it if it was asked for.
-      if box
+      if @box
         Draw.drawObjBox(@win, self)
         Ncurses.wrefresh @win
       end
 
-      # Draw the info in the viewer.
-      self.drawInfo
+      # Draw the items in the viewer.
+      self.draw_items
     end
 
     # This redraws the viewer buttons.
-    def drawButtons
+    def draw_buttons
       # No buttons, no drawing
-      if @button_count == 0
-        return
-      end
+      return if @button_count == 0
 
       # Redraw the buttons.
       (0...@button_count).each do |x|
@@ -667,7 +790,7 @@ module RNDK
       # Highlight the current button.
       (0...@button_len[@current_button]).each do |x|
         # Strip the character of any extra attributes.
-        character = RNDK.CharOf(@button[@current_button][x])
+        character = RNDK.char_of @button[@current_button][x]
 
         # Add the character into the window.
         Ncurses.mvwaddch(@win,
@@ -681,73 +804,72 @@ module RNDK
     end
 
     # This sets the background attribute of the widget.
-    def set_bg_attrib(attrib)
+    def set_bg_color(attrib)
       Ncurses.wbkgd(@win, attrib)
     end
 
-    def destroyInfo
-      @list = []
-      @list_pos = []
-      @list_len = []
+    def destroy_items
+      @items = []
+      @items_pos = []
+      @items_len = []
     end
 
     # This function destroys the viewer widget.
     def destroy
-      self.destroyInfo
-
-      self.cleanTitle
+      self.destroy_items
+      self.clean_title
 
       # Clean up the windows.
-      RNDK.window_delete(@shadow_win)
-      RNDK.window_delete(@win)
+      RNDK.window_delete @shadow_win
+      RNDK.window_delete @win
 
       # Clean the key bindings.
-      self.clean_bindings(:VIEWER)
+      self.clean_bindings
 
-      # Unregister this object.
-      RNDK::Screen.unregister(:VIEWER, self)
+      # Unregister this widget.
+      @screen.unregister self
     end
 
     # This function erases the viewer widget from the screen.
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase(@win)
         RNDK.window_erase(@shadow_win)
       end
     end
 
-    # This draws the viewer info lines.
-    def drawInfo
+    # This draws the viewer items lines.
+    def draw_items
       temp = ''
       line_adjust = false
 
       # Clear the window.
       Ncurses.werase(@win)
 
-      self.drawTitle(@win)
+      self.draw_title @win
 
       # Draw in the current line at the top.
-      if @show_line_info == true
-        # Set up the info line and draw it.
+      if @show_line_items == true
+        # Set up the items line and draw it.
         if @in_progress
           temp = 'processing...'
-        elsif @list_size != 0
-          temp = '%d/%d %2.0f%%' % [@current_top + 1, @list_size,
-              ((1.0 * @current_top + 1) / (@list_size)) * 100]
+        elsif @items_size != 0
+          temp = '%d/%d %2.0f%%' % [@current_top + 1, @items_size,
+              ((1.0 * @current_top + 1) / (@items_size)) * 100]
         else
           temp = '%d/%d %2.0f%%' % [0, 0, 0.0]
         end
 
-        # The list_adjust variable tells us if we have to shift down one line
+        # The items_adjust variable tells us if we have to shift down one line
         # because the person asked for the line X of Y line at the top of the
-        # screen. We only want to set this to true if they asked for the info
+        # screen. We only want to set this to true if they asked for the items
         # line and there is no title or if the two items overlap.
         if @title_lines == '' || @title_pos[0] < temp.size + 2
-          list_adjust = true
+          items_adjust = true
         end
         Draw.writeChar(@win,
                        1,
-                       if list_adjust then @title_lines else 0 end + 1,
+                       if items_adjust then @title_lines else 0 end + 1,
                        temp,
                        RNDK::HORIZONTAL,
                        0,
@@ -755,24 +877,24 @@ module RNDK
       end
 
       # Determine the last line to draw.
-      last_line = [@list_size, @view_size].min
-      last_line -= if list_adjust then 1 else 0 end
+      last_line = [@items_size, @view_size].min
+      last_line -= if items_adjust then 1 else 0 end
 
-      # Redraw the list.
+      # Redraw the items.
       (0...last_line).each do |x|
-        if @current_top + x < @list_size
-          screen_pos = @list_pos[@current_top + x] + 1 - @left_char
+        if @current_top + x < @items_size
+          screen_pos = @items_pos[@current_top + x] + 1 - @left_char
 
           Draw.writeChtype(@win,
                            if screen_pos >= 0 then screen_pos else 1 end,
-                           x + @title_lines + if list_adjust then 1 else 0 end + 1,
-                           @list[x + @current_top],
+                           x + @title_lines + if items_adjust then 1 else 0 end + 1,
+                           @items[x + @current_top],
                            RNDK::HORIZONTAL,
                            if screen_pos >= 0
                            then 0
-                           else @left_char - @list_pos[@current_top + x]
+                           else @left_char - @items_pos[@current_top + x]
                            end,
-                           @list_len[x + @current_top])
+                           @items_len[x + @current_top])
         end
       end
 
@@ -795,21 +917,21 @@ module RNDK
       end
 
       # Draw the buttons. This will call refresh on the viewer win.
-      self.drawButtons
+      self.draw_buttons
     end
 
-    # The list_size may be negative, to assign no definite limit.
-    def createList(list_size)
+    # The items_size may be negative, to assign no definite limit.
+    def create_items(items_size)
       status = false
 
-      self.destroyInfo
+      self.destroy_items
 
-      if list_size >= 0
+      if items_size >= 0
         status = true
 
-        @list = []
-        @list_pos = []
-        @list_len = []
+        @items = []
+        @items_pos = []
+        @items_len = []
       end
       return status
     end
@@ -818,8 +940,87 @@ module RNDK
       super(@win)
     end
 
-    def object_type
-      :VIEWER
+    def scroll_up
+      if @current_top > 0
+        @current_top -= 1
+        refresh = true
+      else
+        RNDK.beep
+      end
+    end
+
+    def scroll_down
+      if @current_top < @max_top_line
+        @current_top += 1
+        refresh = true
+      else
+        RNDK.beep
+      end
+    end
+
+    def scroll_right
+      if @left_char < @max_left_char
+        @left_char += 1
+        refresh = true
+      else
+        RNDK.beep
+      end
+    end
+
+    def scroll_left
+      if @left_char > 0
+        @left_char -= 1
+        refresh = true
+      else
+        RNDK.beep
+      end
+    end
+
+    def scroll_page_up
+      if @current_top > 0
+        if @current_top - (@view_size - 1) > 0
+          @current_top = @current_top - (@view_size - 1)
+        else
+          @current_top = 0
+        end
+        refresh = true
+      else
+        RNDK.beep
+      end
+
+    end
+
+    def scroll_page_down
+      if @current_top < @max_top_line
+        if @current_top + @view_size < @max_top_line
+          @current_top = @current_top + (@view_size - 1)
+        else
+          @current_top = @max_top_line
+        end
+        refresh = true
+      else
+        RNDK.beep
+      end
     end
+
+    def scroll_begin
+      @left_char = 0
+      refresh = true
+    end
+
+    def scroll_end
+      @left_char = @max_left_char
+      refresh = true
+    end
+
+    def focus
+      self.draw
+    end
+
+    def unfocus
+      self.draw
+    end
+
   end
 end
+