cdk 0.9.0 → 0.10.0

data/lib/cdk/{entry.rb → components/entry.rb}

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class ENTRY < CDK::CDKOBJS
@@ -32,7 +32,7 @@ module CDK
       # Translate the label string to a chtype array
       if !(label.nil?) && label.size > 0
         label_len = [@label_len]
-        @label = CDK.char2Chtype(label, label_len, [])
+        @label = char2Chtype(label, label_len, [])
         @label_len = label_len[0]
         box_width += @label_len
       end
@@ -52,7 +52,7 @@ module CDK
       # Rejustify the x and y positions if we need to.
       xtmp = [xpos]
       ytmp = [ypos]
-      CDK.alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
+      alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -82,7 +82,7 @@ module CDK
             xpos + horizontal_adjust + @border_size)
       end
 
-      # cleanChar (entry->info, max + 3, '\0');
+      #entry->info += '\0' * (max + 3)
       @info = ''
       @info_width = max + 3
 
@@ -198,7 +198,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = 1
-      complete = false
+      @complete = false
 
       # Set the exit type
       self.setExitType(0)
@@ -215,7 +215,7 @@ module CDK
       if pp_return != 0
         # Check a predefined binding
         if self.checkBind(:ENTRY, input)
-          complete = true
+          @complete = true
         else
           curr_pos = @screen_col + @left_char
 
@@ -295,7 +295,7 @@ module CDK
             end
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::ERASE
             if @info.size != 0
               self.clean
@@ -326,13 +326,13 @@ module CDK
             if @info.size >= @min
               self.setExitType(input)
               ret = @info
-              complete = true
+              @complete = true
             else
               CDK.Beep
             end
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -341,12 +341,12 @@ module CDK
           end
         end
 
-        if !complete && !(@post_process_func.nil?)
+        if !@complete && !(@post_process_func.nil?)
           @post_process_func.call(:ENTRY, self, @post_process_data, input)
         end
       end
 
-      unless complete
+      unless @complete
         self.setExitType(0)
       end
 
@@ -376,7 +376,7 @@ module CDK
       @left_char = 0
 
       # Refresh the entry field.
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This draws the entry field.
@@ -393,13 +393,13 @@ module CDK
 
       self.drawTitle(@win)
 
-      @win.wrefresh
+      wrefresh
 
       # Draw in the label to the widget.
       unless @label_win.nil?
         Draw.writeChtype(@label_win, 0, 0, @label, CDK::HORIZONTAL, 0,
             @label_len)
-        @label_win.wrefresh
+        wrefresh(@label_win)
       end
 
       self.drawField
@@ -424,7 +424,7 @@ module CDK
         @field_win.wmove(0, @screen_col)
       end
 
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This erases an entry widget from the screen.
@@ -505,7 +505,7 @@ module CDK
     end
 
     # This sets the character to use when a hidden type is used.
-    def setHiddenChar(hidden_characer)
+    def setHiddenChar(hidden_character)
       @hidden = hidden_character
     end
 
@@ -537,12 +537,12 @@ module CDK
 
     def focus
       @field_win.wmove(0, @screen_col)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     def unfocus
       self.draw(box)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     def position

data/lib/cdk/{fscale.rb → components/fscale.rb}

@@ -22,7 +22,7 @@ module CDK
           CDK::HORIZONTAL, 0, temp.size)
 
       self.moveToEditPosition(@field_edit)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     def setDigits(digits)

data/lib/cdk/{fselect.rb → components/fselect.rb}

@@ -1,7 +1,10 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
+require_relative '../mixins/list_support'
 
 module CDK
   class FSELECT < CDK::CDKOBJS
+    include ListSupport
+
     attr_reader :scroll_field, :entry_field
     attr_reader :dir_attribute, :file_attribute, :link_attribute, :highlight
     attr_reader :sock_attribute, :field_attribute, :filler_character
@@ -31,7 +34,7 @@ module CDK
       # Rejustify the x and y positions if we need to.
       xtmp = [xplace]
       ytmp = [yplace]
-      CDK.alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
+      alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -76,7 +79,7 @@ module CDK
 
       # Create the entry field in the selector
       label_len = []
-      CDK.char2Chtype(label, label_len, [])
+      char2Chtype(label, label_len, [])
       label_len = label_len[0]
 
       temp_width = if CDK::FSELECT.isFullWidth(width)
@@ -207,7 +210,7 @@ module CDK
         end
 
         # Look for a unique filename match.
-        index = CDK.searchList(list, fselect.file_counter, filename)
+        index = search_list(list, fselect.file_counter, filename)
 
         # If the index is less than zero, return we didn't find a match.
         if index < 0
@@ -285,7 +288,7 @@ module CDK
         buttons = ['No', 'Yes']
 
         # Get the filename which is to be deleted.
-        filename = CDK.chtype2Char(fscroll.item[fscroll.current_item])
+        filename = chtype2Char(fscroll.item[fscroll.current_item])
         filename = filename[0...-1]
 
         # Create the dialog message.
@@ -334,8 +337,8 @@ module CDK
           fselect.injectMyScroller(key)
 
           # Get the currently highlighted filename.
-          current = CDK.chtype2Char(scrollp.item[scrollp.current_item])
-          #current = CDK.chtype2String(scrollp.item[scrollp.current_item])
+          current = chtype2Char(scrollp.item[scrollp.current_item])
+          #current = chtype2String(scrollp.item[scrollp.current_item])
           current = current[0...-1]
 
           temp = CDK::FSELECT.make_pathname(fselect.pwd, current)
@@ -486,7 +489,7 @@ module CDK
     # This injects a single character into the file selector.
     def inject(input)
       ret = -1
-      complete = false
+      @complete = false
 
       # Let the user play.
       filename = @entry_field.inject(input)
@@ -512,7 +515,7 @@ module CDK
 
         # Return the complete pathname.
         ret = @pathname
-        complete = true
+        @complete = true
       else
         # Set the file selector information.
         self.set(filename, @field_attribute, @filler_character, @highlight,
@@ -523,7 +526,7 @@ module CDK
         self.drawMyScroller
       end
 
-      if !complete
+      if !@complete
         self.setExitType(0)
       end
 
@@ -869,9 +872,9 @@ module CDK
     # Return the plain string that corresponds to an item in dir_contents
     def contentToPath(content)
       # XXX direct translation of original but might be redundant
-      temp_chtype = CDK.char2Chtype(content, [], [])
-      temp_char = CDK.chtype2Char(temp_chtype)
-      temp_char = temp_char[0..-1]
+      temp_chtype = char2Chtype(content, [], [])
+      temp_char   = chtype2Char(temp_chtype)
+      temp_char   = temp_char[0..-1]
 
       # Create the pathname.
       result = CDK::FSELECT.make_pathname(@pwd, temp_char)

data/lib/cdk/{fslider.rb → components/fslider.rb}

@@ -32,7 +32,7 @@ module CDK
           Ncurses::A_NORMAL, CDK::HORIZONTAL, 0, temp.size)
 
       self.moveToEditPosition(@field_edit)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     def formattedSize(value)

data/lib/cdk/components/graph.rb

@@ -0,0 +1,386 @@
+require_relative '../cdk_objs'
+
+module CDK
+  class GRAPH < CDK::CDKOBJS
+    def initialize(cdkscreen, xplace, yplace, height, width,
+        title, xtitle, ytitle)
+      super()
+      parent_width = cdkscreen.window.getmaxx
+      parent_height = cdkscreen.window.getmaxy
+
+      self.setBox(false)
+
+      box_height = CDK.setWidgetDimension(parent_height, height, 3)
+      box_width = CDK.setWidgetDimension(parent_width, width, 0)
+      box_width = self.setTitle(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]
+      alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
+      xpos = xtmp[0]
+      ypos = ytmp[0]
+
+      # Create the widget pointer
+      @screen = cdkscreen
+      @parent = cdkscreen.window
+      @win = Ncurses::WINDOW.new(box_height, box_width, ypos, xpos)
+      @box_height = box_height
+      @box_width = box_width
+      @minx = 0
+      @maxx = 0
+      @xscale = 0
+      @yscale = 0
+      @count = 0
+      @display_type = :LINE
+
+      if @win.nil?
+        self.destroy
+        return nil
+      end
+      @win.keypad(true)
+
+      # Translate the X axis title string to a chtype array
+      if !(xtitle.nil?) && xtitle.size > 0
+        xtitle_len = []
+        xtitle_pos = []
+        @xtitle = char2Chtype(xtitle, xtitle_len, xtitle_pos)
+        @xtitle_len = xtitle_len[0]
+        @xtitle_pos = justify_string(@box_height, @xtitle_len, xtitle_pos[0])
+
+      else
+        xtitle_len = []
+        xtitle_pos = []
+        @xtitle = char2Chtype("<C></5>X Axis", xtitle_len, xtitle_pos)
+        @xtitle_len = title_len[0]
+        @xtitle_pos = justify_string(@box_height, @xtitle_len, xtitle_pos[0])
+      end
+
+      # Translate the Y Axis title string to a chtype array
+      if !(ytitle.nil?) && ytitle.size > 0
+        ytitle_len = []
+        ytitle_pos = []
+        @ytitle = char2Chtype(ytitle, ytitle_len, ytitle_pos)
+        @ytitle_len = ytitle_len[0]
+        @ytitle_pos = justify_string(@box_width, @ytitle_len, ytitle_pos[0])
+      else
+        ytitle_len = []
+        ytitle_pos = []
+        @ytitle = char2Chtype("<C></5>Y Axis", ytitle_len, ytitle_pos)
+        @ytitle_len = ytitle_len[0]
+        @ytitle_pos = justify_string(@box_width, @ytitle_len, ytitle_pos[0])
+      end
+
+      @graph_char = 0
+      @values = []
+
+      cdkscreen.register(:GRAPH, self)
+    end
+
+    # This was added for the builder.
+    def activate(actions)
+      self.draw(@box)
+    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)
+      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
+      @xscale = (@maxx - @minx) / [1, @box_height - @title_lines - 5].max
+      if @xscale <= 0
+        @xscale = 1
+      end
+
+      @yscale = (@box_width - 4) / [1, @count].max
+      if @yscale <= 0
+        @yscale = 1
+      end
+    end
+
+    # Set the values of the graph.
+    def setValues(values, count, start_at_zero)
+      min = 2**30
+      max = -2**30
+
+      # Make sure everything is happy.
+      if count < 0
+        return false
+      end
+
+      if !(@values.nil?) && @values.size > 0
+        @values = []
+        @count = 0
+      end
+
+      # Copy the X values
+      values.each do |value|
+        min = [value, @minx].min
+        max = [value, @maxx].max
+
+        # Copy the value.
+        @values << value
+      end
+
+      # Keep the count and min/max values
+      @count = count
+      @minx = min
+      @maxx = max
+
+      # Check the start at zero status.
+      if start_at_zero
+        @minx = 0
+      end
+
+      self.setScales
+
+      return true
+    end
+
+    def getValues(size)
+      size << @count
+      return @values
+    end
+
+    # Set the value of the graph at the given index.
+    def setValue(index, value, start_at_zero)
+      # Make sure the index is within range.
+      if index < 0 || index >= @count
+        return false
+      end
+
+      # Set the min, max, and value for the graph
+      @minx = [value, @minx].min
+      @maxx = [value, @maxx].max
+      @values[index] = value
+
+      # Check the start at zero status
+      if start_at_zero
+        @minx = 0
+      end
+
+      self.setScales
+
+      return true
+    end
+
+    def getValue(index)
+      if index >= 0 && index < @count then @values[index] else 0 end
+    end
+
+    # Set the characters of the graph widget.
+    def setCharacters(characters)
+      char_count = []
+      new_tokens = char2Chtype(characters, char_count, [])
+
+      if char_count[0] != @count
+        return false
+      end
+
+      @graph_char = new_tokens
+      return true
+    end
+
+    def getCharacters
+      return @graph_char
+    end
+
+    # Set the character of the graph widget of the given index.
+    def setCharacter(index, character)
+      # Make sure the index is within range
+      if index < 0 || index > @count
+        return false
+      end
+
+      # Convert the string given to us
+      char_count = []
+      new_tokens = char2Chtype(character, char_count, [])
+
+      # Check if the number of characters back is the same as the number
+      # of elements in the list.
+      if char_count[0] != @count
+        return false
+      end
+
+      # Everything OK so far. Set the value of the array.
+      @graph_char[index] = new_tokens[0]
+      return true
+    end
+
+    def getCharacter(index)
+      return graph_char[index]
+    end
+
+    # Set the display type of the graph.
+    def setDisplayType(type)
+      @display_type = type
+    end
+
+    def getDisplayType
+      @display_type
+    end
+
+    # Set the background attribute of the widget.
+    def setBKattr(attrib)
+      @win.wbkgd(attrib)
+    end
+
+    # Move the graph field to the given location.
+    def move(xplace, yplace, relative, refresh_flag)
+      current_x = @win.getbegx
+      current_y = @win.getbegy
+      xpos = xplace
+      ypos = yplace
+
+      # If this is a relative move, then we will adjust where we want
+      # to move to
+      if relative
+        xpos = @win.getbegx + xplace
+        ypos = @win.getbegy + yplace
+      end
+
+      # Adjust the window if we need to.
+      xtmp = [xpos]
+      tymp = [ypos]
+      CDK.alignxy(@screen.window, xtmp, ytmp, @box_width, @box_height)
+      xpos = xtmp[0]
+      ypos = ytmp[0]
+
+      # Get the difference
+      xdiff = current_x - xpos
+      ydiff = current_y - ypos
+
+      # Move the window to the new location.
+      CDK.moveCursesWindow(@win, -xdiff, -ydiff)
+      CDK.moveCursesWindow(@shadow_win, -xdiff, -ydiff)
+
+      # Touch the windows so they 'move'.
+      CDK::SCREEN.refreshCDKWindow(@screen.window)
+
+      # Reraw the windowk if they asked for it
+      if refresh_flag
+        self.draw(@box)
+      end
+    end
+
+    # Draw the grpah widget
+    def draw(box)
+      adj = 2 + (if @xtitle.nil? || @xtitle.size == 0 then 0 else 1 end)
+      spacing = 0
+      attrib = ' '.ord | Ncurses::A_REVERSE
+
+      if box
+        Draw.drawObjBox(@win, self)
+      end
+
+      # Draw in the vertical axis
+      Draw.drawLine(@win, 2, @title_lines + 1, 2, @box_height - 3,
+          Ncurses::ACS_VLINE)
+
+      # Draw in the horizontal axis
+      Draw.drawLine(@win, 3, @box_height - 3, @box_width, @box_height - 3,
+          Ncurses::ACS_HLINE)
+
+      self.drawTitle(@win)
+
+      # Draw in the X axis title.
+      if !(@xtitle.nil?) && @xtitle.size > 0
+        Draw.writeChtype(@win, 0, @xtitle_pos, @xtitle, CDK::VERTICAL,
+            0, @xtitle_len)
+        attrib = @xtitle[0] & Ncurses::A_ATTRIBUTES
+      end
+
+      # Draw in the X axis high value
+      temp = "%d" % [@maxx]
+      Draw.writeCharAttrib(@win, 1, @title_lines + 1, temp, attrib,
+          CDK::VERTICAL, 0, temp.size)
+
+      # Draw in the X axis low value.
+      temp = "%d" % [@minx]
+      Draw.writeCharAttrib(@win, 1, @box_height - 2 - temp.size, temp, attrib,
+          CDK::VERTICAL, 0, temp.size)
+
+      # Draw in the Y axis title
+      if !(@ytitle.nil?) && @ytitle.size > 0
+        Draw.writeChtype(@win, @ytitle_pos, @box_height - 1, @ytitle,
+            CDK::HORIZONTAL, 0, @ytitle_len)
+      end
+
+      # Draw in the Y axis high value.
+      temp = "%d" % [@count]
+      Draw.writeCharAttrib(@win, @box_width - temp.size - adj,
+          @box_height - 2, temp, attrib, CDK::HORIZONTAL, 0, temp.size)
+
+      # Draw in the Y axis low value.
+      Draw.writeCharAttrib(@win, 3, @box_height - 2, "0", attrib,
+          CDK::HORIZONTAL, 0, "0".size)
+
+      # If the count is zero then there aren't any points.
+      if @count == 0
+        wrefresh(@win)
+        return
+      end
+
+      spacing = (@box_width - 3) / @count  # FIXME magic number (TITLE_LM)
+
+      # Draw in the graph line/plot points.
+      (0...@count).each do |y|
+        colheight = (@values[y] / @xscale) - 1
+        # Add the marker on the Y axis.
+        @win.mvwaddch(@box_height - 3, (y + 1) * spacing + adj,
+            Ncurses::ACS_TTEE)
+
+        # If this is a plot graph, all we do is draw a dot.
+        if @display_type == :PLOT
+          xpos = @box_height - 4 - colheight
+          ypos = (y + 1) * spacing + adj
+          @win.mvwaddch(xpos, ypos, @graph_char[y])
+        else
+          (0..@yscale).each do |x|
+            xpos = @box_height - 3
+            ypos = (y + 1) * spacing - adj
+            Draw.drawLine(@win, ypos, xpos - colheight, ypos, xpos,
+                @graph_char[y])
+          end
+        end
+      end
+
+      # Draw in the axis corners.
+      @win.mvwaddch(@title_lines, 2, Ncurses::ACS_URCORNER)
+      @win.mvwaddch(@box_height - 3, 2, Ncurses::ACS_LLCORNER)
+      @win.mvwaddch(@box_height - 3, @box_width, Ncurses::ACS_URCORNER)
+
+      # Refresh and lets see it
+      wrefresh
+    end
+
+    def destroy
+      self.cleanTitle
+      self.cleanBindings(:GRAPH)
+      CDK::SCREEN.unregister(:GRAPH, self)
+      CDK.deleteCursesWindow(@win)
+    end
+
+    def erase
+      if self.validCDKObject
+        CDK.eraseCursesWindow(@win)
+      end
+    end
+
+    def object_type
+      :GRAPH
+    end
+
+    def position
+      super(@win)
+    end
+  end # class Graph
+end # module CDK