rndk 0.2.0 → 1.0.0

data/lib/rndk/fscale.rb

@@ -1,24 +1,44 @@
 require 'rndk/scale'
 
 module RNDK
-  class FSCALE < SCALE
-    def initialize(rndkscreen,
-                   xplace,
-                   yplace,
-                   title,
-                   label,
-                   field_attr,
-                   field_width,
-                   start,
-                   low,
-                   high,
-                   inc,
-                   fast_inc,
-                   digits,
-                   box,
-                   shadow)
+  class Fscale < Scale
+    def initialize(screen, config={})
+      @widget_type = :Fscale
+
+      x           = 0
+      y           = 0
+      title       = "fscale"
+      label       = "label"
+      field_attr  = RNDK::Color[:normal]
+      field_width = 0
+      start       = 0
+      low         = 0
+      high        = 100
+      inc         = 1
+      fast_inc    = 5
+      digits      = 3
+      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
+        field_attr  = val if key == :field_attr
+        field_width = val if key == :field_width
+        start       = val if key == :start
+        low         = val if key == :low
+        high        = val if key == :high
+        inc         = val if key == :inc
+        fast_inc    = val if key == :fast_inc
+        digits      = val if key == :digits
+        box         = val if key == :box
+        shadow      = val if key == :shadow
+      end
+
       @digits = digits
-      super(rndkscreen, xplace, yplace, title, label, field_attr, field_width, start, low, high, inc, fast_inc, box, shadow)
+      super(screen, x, y, title, label, field_attr, field_width, start, low, high, inc, fast_inc, box, shadow)
     end
 
     def drawField
@@ -54,8 +74,6 @@ module RNDK
       '%g%c'
     end
 
-    def object_type
-      :FSCALE
-    end
   end
 end
+

data/lib/rndk/fslider.rb

@@ -1,29 +1,47 @@
 require 'rndk/slider'
 
 module RNDK
-  class FSLIDER < Slider
-    def initialize(rndkscreen,
-                   xplace,
-                   yplace,
-                   title,
-                   label,
-                   filler,
-                   field_width,
-                   start,
-                   low,
-                   high,
-                   inc,
-                   fast_inc,
-                   digits,
-                   box,
-                   shadow)
+  class Fslider < Slider
+    def initialize(screen, config={})
+      x           = 0
+      y           = 0
+      title       = "fslider"
+      label       = "label"
+      filler      = ' '.ord | RNDK::Color[:reverse]
+      field_width = 0
+      start       = 0
+      low         = 0
+      high        = 100
+      inc         = 1
+      fast_inc    = 5
+      digits      = 3
+      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
+        filler      = val if key == :filler
+        field_width = val if key == :field_width
+        start       = val if key == :start
+        low         = val if key == :low
+        high        = val if key == :high
+        inc         = val if key == :inc
+        fast_inc    = val if key == :fast_inc
+        digits      = val if key == :digits
+        box         = val if key == :box
+        shadow      = val if key == :shadow
+      end
 
       @digits = digits
-      super(rndkscreen, xplace, yplace, title, label, filler, field_width, start, low, high, inc, fast_inc, box, shadow)
+      super(screen, x, y, title, label, filler, field_width, start, low, high, inc, fast_inc, box, shadow)
+      @widget_type = :fslider
     end
 
     # This draws the widget.
-    def drawField
+    def draw_field
       step = 1.0 * @field_width / (@high - @low)
 
       # Determine how many filler characters need to be drawn.
@@ -45,7 +63,7 @@ module RNDK
                            @field_width,
                            0,
                            temp,
-                           Ncurses::A_NORMAL,
+                           RNDK::Color[:normal],
                            RNDK::HORIZONTAL,
                            0,
                            temp.size)
@@ -54,7 +72,7 @@ module RNDK
       Ncurses.wrefresh(@field_win)
     end
 
-    def formattedSize(value)
+    def formatted_size(value)
       digits = [@digits, 30].min
       format = '%%.%if' % [digits]
       temp = format % [value]
@@ -73,8 +91,5 @@ module RNDK
       '%g%c'
     end
 
-    def object_type
-      :FSLIDER
-    end
   end
 end

data/lib/rndk/graph.rb

@@ -1,38 +1,75 @@
 require 'rndk'
 
 module RNDK
-  class GRAPH < Widget
-    def initialize(rndkscreen,
-                   xplace,
-                   yplace,
-                   height,
-                   width,
-                   title,
-                   xtitle,
-                   ytitle)
+
+  # TODO Fix how this widget is displayed onscreen.
+  #
+  # ## Signals
+  #
+  # For info, see Signals section on Widget class.
+  #
+  # ### :before_set_data
+  #
+  # * when: right before Graph#set_values fix the new values
+  #         into the widget.
+  # * argument: The **new data** to be fixed
+  # * effect when return false: Interrupt fixing the data,
+  #                             old data is kept.
+  #
+  # ### :after_set_data
+  #
+  # * when: right after Graph#set_values does it's job.
+  # * argument: The **new data** as an argument.
+  #
+  class Graph < Widget
+
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx rndkscreen.window
-      parent_height = Ncurses.getmaxy rndkscreen.window
+      @widget_type = :graph
+      @supported_signals += [:before_set_data, :after_set_data]
+
+      x      = 0
+      y      = 0
+      width  = 0
+      height = 0
+      title  = "  graph"  # MUST HAVE TWO SPACES BECAUSE OF FUCK
+      xtitle = "x"
+      ytitle = "y"
+      box    = true
+
+      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
+        xtitle = val if key == :xtitle
+        ytitle = val if key == :ytitle
+        box    = val if key == :box
+      end
+
+      parent_width = Ncurses.getmaxx screen.window
+      parent_height = Ncurses.getmaxy screen.window
 
       self.set_box(false)
 
-      box_height = RNDK.setWidgetDimension(parent_height, height, 3)
-      box_width = RNDK.setWidgetDimension(parent_width, width, 0)
+      box_height = RNDK.set_widget_dimension(parent_height, height, 3)
+      box_width = RNDK.set_widget_dimension(parent_width, width, 0)
       box_width = self.set_title(title, box_width)
       box_height += @title_lines
       box_width = [parent_width, box_width].min
       box_height = [parent_height, box_height].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]
 
       # Create the widget pointer
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @win = Ncurses.newwin(box_height, box_width, ypos, xpos)
       @box_height = box_height
       @box_width = box_width
@@ -42,6 +79,7 @@ module RNDK
       @yscale = 0
       @count = 0
       @display_type = :LINE
+      @box = box
 
       if @win.nil?
         self.destroy
@@ -84,24 +122,24 @@ module RNDK
       @graph_char = 0
       @values = []
 
-      rndkscreen.register(:GRAPH, self)
+      screen.register(@widget_type, self)
     end
 
     # This was added for the builder.
-    def activate(actions)
-      self.draw(@box)
+    def activate(actions=[])
+      self.draw
     end
 
     # Set multiple attributes of the widget
-    def set(values, count, graph_char, start_at_zero, display_type)
-      ret = self.setValues(values, count, start_at_zero)
+    def set(values, graph_char, start_at_zero, display_type)
+      ret = self.set_values(values, start_at_zero)
       self.setCharacters(graph_char)
       self.setDisplayType(display_type)
       return ret
     end
 
     # Set the scale factors for the graph after wee have loaded new values.
-    def setScales
+    def set_scales
       @xscale = (@maxx - @minx) / [1, @box_height - @title_lines - 5].max
       if @xscale <= 0
         @xscale = 1
@@ -114,7 +152,9 @@ module RNDK
     end
 
     # Set the values of the graph.
-    def setValues(values, count, start_at_zero)
+    def set_values(values, start_at_zero)
+      count = values.size
+
       min = 2**30
       max = -2**30
 
@@ -123,6 +163,9 @@ module RNDK
         return false
       end
 
+      keep_going = self.run_signal_binding(:before_set_data)
+      return if not keep_going
+
       if !(@values.nil?) && @values.size > 0
         @values = []
         @count = 0
@@ -147,18 +190,18 @@ module RNDK
         @minx = 0
       end
 
-      self.setScales
-
-      return true
+      self.set_scales
+      self.run_signal_binding(:after_set_data)
+      true
     end
 
     def getValues(size)
       size << @count
-      return @values
+      @values
     end
 
     # Set the value of the graph at the given index.
-    def setValue(index, value, start_at_zero)
+    def set_value(index, value, start_at_zero)
       # Make sure the index is within range.
       if index < 0 || index >= @count
         return false
@@ -174,9 +217,8 @@ module RNDK
         @minx = 0
       end
 
-      self.setScales
-
-      return true
+      self.set_scales
+      true
     end
 
     def getValue(index)
@@ -236,22 +278,22 @@ module RNDK
     end
 
     # Set the background attribute of the widget.
-    def set_bg_attrib(attrib)
+    def set_bg_color(attrib)
       Ncurses.wbkgd(@win, attrib)
     end
 
     # Move the graph field to the given location.
-    def move(xplace, yplace, relative, refresh_flag)
+    def move(x, y, relative, refresh_flag)
       current_x = Ncurses.getbegx(@win)
       current_y = Ncurses.getbegy(@win)
-      xpos = xplace
-      ypos = yplace
+      xpos = x
+      ypos = y
 
       # If this is a relative move, then we will adjust where we want
       # to move to
       if relative
-        xpos = Ncurses.getbegx(@win) + xplace
-        ypos = Ncurses.getbegy(@win) + yplace
+        xpos = Ncurses.getbegx(@win) + x
+        ypos = Ncurses.getbegy(@win) + y
       end
 
       # Adjust the window if we need to.
@@ -274,15 +316,15 @@ module RNDK
 
       # Reraw the windowk if they asked for it
       if refresh_flag
-        self.draw(@box)
+        self.draw
       end
     end
 
-    # Draw the grpah widget
-    def draw(box)
+    # Draw the graph widget
+    def draw(box=false)
       adj = 2 + (if @xtitle.nil? || @xtitle.size == 0 then 0 else 1 end)
       spacing = 0
-      attrib = ' '.ord | Ncurses::A_REVERSE
+      attrib = ' '.ord | RNDK::Color[:reverse]
 
       if box
         Draw.drawObjBox(@win, self)
@@ -304,12 +346,12 @@ module RNDK
                     @box_height - 3,
                     Ncurses::ACS_HLINE)
 
-      self.drawTitle(@win)
+      self.draw_title(@win)
 
       # Draw in the X axis title.
       if !(@xtitle.nil?) && @xtitle.size > 0
         Draw.writeChtype(@win, 0, @xtitle_pos, @xtitle, RNDK::VERTICAL, 0, @xtitle_len)
-        attrib = @xtitle[0] & Ncurses::A_ATTRIBUTES
+        attrib = @xtitle[0] & RNDK::Color[:extract]
       end
 
       # Draw in the X axis high value
@@ -377,25 +419,22 @@ module RNDK
     end
 
     def destroy
-      self.cleanTitle
-      self.clean_bindings(:GRAPH)
-      RNDK::Screen.unregister(:GRAPH, self)
+      self.clean_title
+      self.clean_bindings
+      @screen.unregister self
       RNDK.window_delete(@win)
     end
 
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase(@win)
       end
     end
 
-    def object_type
-      :GRAPH
-    end
-
     def position
       super(@win)
     end
+
   end
 end
 

data/lib/rndk/itemlist.rb

@@ -1,15 +1,40 @@
 require 'rndk'
 
 module RNDK
-  class ITEMLIST < Widget
-    def initialize(rndkscreen, xplace, yplace, title, label, item, count,
-        default_item, box, shadow)
+
+  class Itemlist < Widget
+
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
+      @widget_type = :itemlist
+      @supported_signals += [:before_input, :after_input]
+
+      x            = 0
+      y            = 0
+      title        = "itemlist"
+      label        = "label"
+      items        = []
+      default_item = 0
+      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
+        items        = val if key == :items
+        default_item = val if key == :default_item
+        box          = val if key == :box
+        shadow       = val if key == :shadow
+      end
+
+      count = items.size
+      parent_width = Ncurses.getmaxx(screen.window)
+      parent_height = Ncurses.getmaxy(screen.window)
       field_width = 0
 
-      if !self.createList(item, count)
+      if !self.create_list items
         self.destroy
         return nil
       end
@@ -41,9 +66,9 @@ module RNDK
       self.updateFieldWidth
 
       # 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]
 
@@ -77,8 +102,8 @@ module RNDK
       end
 
       # Set up the rest of the structure
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @shadow_win = nil
       @accepts_focus = true
       @shadow = shadow
@@ -103,22 +128,22 @@ module RNDK
       end
 
       # Register this baby.
-      rndkscreen.register(:ITEMLIST, self)
+      screen.register(@widget_type, self)
     end
 
     # This allows the user to play with the widget.
-    def activate(actions)
-      ret = -1
+    def activate(actions=[])
+      ret = false
 
       # Draw the widget.
-      self.draw(@box)
-      self.drawField(true)
+      self.draw
+      self.draw_field(true)
 
       if actions.nil? || actions.size == 0
         input = 0
 
         while true
-          input = self.getch([])
+          input = self.getch
 
           # Inject the character into the widget.
           ret = self.inject(input)
@@ -142,28 +167,26 @@ module RNDK
     end
 
     # This injects a single character into the widget.
-    def inject(input)
-      pp_return = 1
-      ret = -1
+    def inject input
+      pp_return = true
+      ret = false
       complete = false
 
       # Set the exit type.
       self.set_exit_type(0)
 
       # Draw the widget field
-      self.drawField(true)
+      self.draw_field(true)
 
       # Check if there is a pre-process function to be called.
-      unless @pre_process_func.nil?
-        pp_return = @pre_process_func.call(:ITEMLIST, 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(:ITEMLIST, input)
-          complete = true
+        if self.is_bound? input
+          self.run_key_binding input
+          #complete = true
         else
           case input
           when Ncurses::KEY_UP, Ncurses::KEY_RIGHT, ' '.ord, '+'.ord, 'n'.ord
@@ -203,13 +226,11 @@ module RNDK
         end
 
         # Should we call a post-process?
-        if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:ITEMLIST, self, @post_process_data, input)
-        end
+        self.run_signal_binding(:after_input) if not complete
       end
 
       if !complete
-        self.drawField(true)
+        self.draw_field(true)
         self.set_exit_type(0)
       end
 
@@ -218,20 +239,18 @@ module RNDK
     end
 
     # This moves the itemlist field to the given location.
-    def move(xplace, yplace, relative, refresh_flag)
+    def move(x, y, relative, refresh_flag)
       windows = [@win, @field_win, @label_win, @shadow_win]
-      self.move_specific(xplace, yplace, relative, refresh_flag,
-          windows, [])
+
+      self.move_specific(x, y, relative, refresh_flag, windows, [])
     end
 
     # This draws the widget on the screen.
-    def draw(box)
+    def draw
       # Did we ask for a shadow?
-      unless @shadow_win.nil?
-        Draw.drawShadow(@shadow_win)
-      end
+      Draw.drawShadow(@shadow_win) unless @shadow_win.nil?
 
-      self.drawTitle(@win)
+      self.draw_title(@win)
 
       # Draw in the label to the widget.
       unless @label_win.nil?
@@ -240,25 +259,23 @@ module RNDK
       end
 
       # Box the widget if asked.
-      if box
-        Draw.drawObjBox(@win, self)
-      end
+      Draw.drawObjBox(@win, self) if @box
 
       Ncurses.wrefresh @win
 
       # Draw in the field.
-      self.drawField(false)
+      self.draw_field(false)
     end
 
     # This sets 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?
     end
 
     # This function draws the contents of the field.
-    def drawField(highlight)
+    def draw_field(highlight)
       # Declare local vars.
       current_item = @current_item
 
@@ -273,7 +290,7 @@ module RNDK
         c = @item[current_item][x]
 
         if highlight
-          c = c.ord | Ncurses::A_REVERSE
+          c = c.ord | RNDK::Color[:reverse]
         end
 
         Ncurses.mvwaddch(@field_win, 0, x + @item_pos[current_item], c)
@@ -285,7 +302,7 @@ module RNDK
 
     # This function removes the widget from the screen.
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase(@field_win)
         RNDK.window_erase(@label_win)
         RNDK.window_erase(@win)
@@ -300,7 +317,7 @@ module RNDK
 
     # This function destroys the widget and all the memory it used.
     def destroy
-      self.cleanTitle
+      self.clean_title
       self.destroyInfo
 
       # Delete the windows
@@ -310,20 +327,20 @@ module RNDK
       RNDK.window_delete(@win)
 
       # Clean the key bindings.
-      self.clean_bindings(:ITEMLIST)
+      self.clean_bindings
 
-      RNDK::Screen.unregister(:ITEMLIST, self)
+      @screen.unregister self
     end
 
     # This sets multiple attributes of the widget.
     def set(list, count, current, box)
-      self.setValues(list, count, current)
+      self.set_values(list, count, current)
       self.set_box(box)
     end
 
     # This function sets the contents of the list
-    def setValues(item, count, default_item)
-      if self.createList(item, count)
+    def set_values(item, default_item)
+      if self.create_list item
         old_width = @field_width
 
         # Set the default item.
@@ -341,7 +358,7 @@ module RNDK
 
         # Draw the field.
         self.erase
-        self.draw(@box)
+        self.draw
       end
     end
 
@@ -379,14 +396,16 @@ module RNDK
     end
 
     def focus
-      self.drawField(true)
+      self.draw_field(true)
     end
 
     def unfocus
-      self.drawField(false)
+      self.draw_field(false)
     end
 
-    def createList(item, count)
+    def create_list item
+      count = item.size
+
       status = false
       new_items = []
       new_pos = []
@@ -467,8 +486,7 @@ module RNDK
       super(@win)
     end
 
-    def object_type
-      :ITEMLIST
-    end
+
+
   end
 end