cdk 0.9.0 → 0.10.0

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class HISTOGRAM < CDK::CDKOBJS
@@ -34,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]
 
@@ -377,7 +377,7 @@ module CDK
       end
 
       # Refresh the window
-      @win.wrefresh
+      wrefresh
     end
 
     # Destroy the widget.

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class ITEMLIST < CDK::CDKOBJS
@@ -25,7 +25,7 @@ module CDK
       # Translate the label string to a chtype array
       if !(label.nil?) && label.size > 0
         label_len = []
-        @label = CDK.char2Chtype(label, label_len, [])
+        @label = char2Chtype(label, label_len, [])
         @label_len = label_len[0]
       end
 
@@ -43,7 +43,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]
 
@@ -145,7 +145,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -163,7 +163,7 @@ module CDK
       if pp_return != 0
         # Check a predefined binding.
         if self.checkBind(:ITEMLIST, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_UP, Ncurses::KEY_RIGHT, ' '.ord, '+'.ord, 'n'.ord
@@ -186,14 +186,14 @@ module CDK
             @current_item = @list_size - 1
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::KEY_TAB, CDK::KEY_RETURN, Ncurses::KEY_ENTER
             self.setExitType(input)
             ret = @current_item
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -203,12 +203,12 @@ module CDK
         end
 
         # Should we call a post-process?
-        if !complete && !(@post_process_func.nil?)
+        if !@complete && !(@post_process_func.nil?)
           @post_process_func.call(:ITEMLIST, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawField(true)
         self.setExitType(0)
       end
@@ -244,7 +244,7 @@ module CDK
         Draw.drawObjBox(@win, self)
       end
 
-      @win.wrefresh
+      wrefresh
 
       # Draw in the field.
       self.drawField(false)
@@ -282,7 +282,7 @@ module CDK
       end
 
       # Redraw the field window.
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This function removes the widget from the screen.
@@ -402,7 +402,7 @@ module CDK
           # Copy the item to the list.
           lentmp = []
           postmp = []
-          new_items << CDK.char2Chtype(item[x], lentmp, postmp)
+          new_items << char2Chtype(item[x], lentmp, postmp)
           new_len << lentmp[0]
           new_pos << postmp[0]
           if new_items[0] == 0
@@ -414,7 +414,7 @@ module CDK
 
         # Now we need to justify the strings.
         (0...count).each do |x|
-          new_pos[x] = CDK.justifyString(field_width + 1,
+          new_pos[x] = justify_string(field_width + 1,
               new_len[x], new_pos[x])
         end
 

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class LABEL < CDK::CDKOBJS
@@ -30,7 +30,7 @@ module CDK
         #Translate the string to a chtype array
         info_len = []
         info_pos = []
-        @info << CDK.char2Chtype(mesg[x], info_len, info_pos)
+        @info << char2Chtype(mesg[x], info_len, info_pos)
         @info_len << info_len[0]
         @info_pos << info_pos[0]
         box_width = [box_width, @info_len[x]].max
@@ -39,7 +39,7 @@ module CDK
 
       # Create the string alignments.
       (0...rows).each do |x|
-        @info_pos[x] = CDK.justifyString(box_width - 2 * @border_size,
+        @info_pos[x] = justify_string(box_width - 2 * @border_size,
             @info_len[x], @info_pos[x])
       end
 
@@ -54,7 +54,7 @@ module CDK
                    end
 
       # Rejustify the x and y positions if we need to
-      CDK.alignxy(cdkscreen.window, xpos, ypos, box_width, box_height)
+      alignxy(cdkscreen.window, xpos, ypos, box_width, box_height)
       @screen = cdkscreen
       @parent = cdkscreen.window
       @win = Ncurses::WINDOW.new(box_height, box_width, ypos[0], xpos[0])
@@ -114,9 +114,9 @@ module CDK
       (0...@rows).each do |x|
         info_len = []
         info_pos = []
-        @info[x] = CDK.char2Chtype(info[x], info_len, info_pos)
+        @info[x] = char2Chtype(info[x], info_len, info_pos)
         @info_len[x] = info_len[0]
-        @info_pos[x] = CDK.justifyString(@box_width - 2 * @border_size,
+        @info_pos[x] = justify_string(@box_width - 2 * @border_size,
             @info_len[x], info_pos[0])
       end
 
@@ -163,7 +163,7 @@ module CDK
       end
 
       # Refresh the window
-      @win.wrefresh
+      wrefresh
     end
 
     # This erases the label widget

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class MARQUEE < CDK::CDKOBJS
@@ -42,7 +42,7 @@ module CDK
       padding = if mesg[-1] == ' ' then 0 else 1 end
 
       # Translate the string to a chtype array
-      message = CDK.char2Chtype(mesg, mesg_length, [])
+      message = char2Chtype(mesg, mesg_length, [])
 
       # Draw in the widget.
       self.draw(@box)
@@ -67,7 +67,7 @@ module CDK
           @win.mvwaddch(@border_size, x, ch)
           y += 1
         end
-        @win.wrefresh
+        wrefresh
 
         # Set my variables
         if mesg_length[0] < view_limit
@@ -112,7 +112,7 @@ module CDK
 
           # Time to start over.
           @win.mvwaddch(@border_size, @border_size, ' '.ord)
-          @win.wrefresh
+          wrefresh
           first_time = true
         end
 
@@ -152,7 +152,7 @@ module CDK
       end
 
       # Refresh the window.
-      @win.wrefresh
+      wrefresh
     end
 
     # This destroys the widget.
@@ -212,7 +212,7 @@ module CDK
       # Rejustify the x and y positions if we need to.
       xtmp = [xpos]
       ytmp = [ypos]
-      CDK.alignxy(@screen.window, xtmp, ytmp, box_width, box_height)
+      alignxy(@screen.window, xtmp, ytmp, box_width, box_height)
       window = Ncurses::WINDOW.new(box_height, box_width, ytmp[0], xtmp[0])
 
       unless window.nil?
@@ -233,7 +233,7 @@ module CDK
     def self.discardWin(winp)
       unless winp.nil?
         winp.werase
-        winp.wrefresh
+        SCREEN.wrefresh(winp)
         winp.delwin
       end
     end

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class MATRIX < CDK::CDKOBJS
@@ -82,7 +82,7 @@ module CDK
         end
         rowtitle_len = []
         rowtitle_pos = []
-        @rowtitle[x] = CDK.char2Chtype((rowtitles[x] || ''),
+        @rowtitle[x] = char2Chtype((rowtitles[x] || ''),
             rowtitle_len, rowtitle_pos)
         @rowtitle_len[x] = rowtitle_len[0]
         @rowtitle_pos[x] = rowtitle_pos[0]
@@ -94,7 +94,7 @@ module CDK
 
         # We need to rejustify the row title cell info.
         (1..rows).each do |x|
-          @rowtitle_pos[x] = CDK.justifyString(@maxrt,
+          @rowtitle_pos[x] = justify_string(@maxrt,
               @rowtitle_len[x], @rowtitle_pos[x])
         end
       else
@@ -118,7 +118,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]
 
@@ -146,10 +146,10 @@ module CDK
         end
         coltitle_len = []
         coltitle_pos = []
-        @coltitle[x] = CDK.char2Chtype(coltitles[x] || '',
+        @coltitle[x] = char2Chtype(coltitles[x] || '',
             coltitle_len, coltitle_pos)
         @coltitle_len[x] = coltitle_len[0]
-        @coltitle_pos[x] = @border_size + CDK.justifyString(
+        @coltitle_pos[x] = @border_size + justify_string(
             colwidths[x], @coltitle_len[x], coltitle_pos[0])
         @colwidths[x] = colwidths[x]
       end
@@ -244,7 +244,7 @@ module CDK
               then matrix.filler
               else plainchar
               end)
-          matrix.CurMatrixCell.wrefresh
+          wrefresh(matrix.CurMatrixCell)
 
           # Update the info string
           matrix.info[matrix.row][matrix.col] =
@@ -317,7 +317,7 @@ module CDK
       charcount = @info[@row][@col].size
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -343,7 +343,7 @@ module CDK
       if pp_return != 0
         # Check the key bindings.
         if self.checkBind(:MATRIX, input)
-          complete = true
+          @complete = true
         else
           case input
           when CDK::TRANSPOSE
@@ -357,7 +357,7 @@ module CDK
               self.CurMatrixCell.mvwdelch(1, charcount + 1)
               self.CurMatrixCell.mvwinsch(1, charcount + 1, @filler)
 
-              self.CurMatrixCell.wrefresh
+              wrefresh(self.CurMatrixCell)
               @info[@row][@col] = @info[@row][@col][0...charcount]
             end
           when Ncurses::KEY_RIGHT, CDK::KEY_TAB
@@ -540,13 +540,13 @@ module CDK
             else
               self.drawOldCell
             end
-            self.CurMatrixCell.wrefresh
+            wrefresh(self.CurMatrixCell)
             self.setExitType(input)
             ret = 1
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::KEY_ESC
             if !@box_cell
               Draw.attrbox(@cell[@oldcrow][@oldccol], ' '.ord, ' '.ord,
@@ -554,9 +554,9 @@ module CDK
             else
               self.drawOldCell
             end
-            self.CurMatrixCell.wrefresh
+            wrefresh(self.CurMatrixCell)
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -565,7 +565,7 @@ module CDK
           end
         end
 
-        if !complete
+        if !@complete
           # Did we change cells?
           if moved_cell
             # un-highlight the old box
@@ -575,7 +575,7 @@ module CDK
             else
               self.drawOldCell
             end
-            @cell[@oldcrow][@oldccol].wrefresh
+            wrefresh(@cell[@oldcrow][@oldccol])
 
             self.focusCurrent
           end
@@ -593,7 +593,7 @@ module CDK
             else
               self.CurMatrixCell.wmove(1, self.CurMatrixInfo.size + 1)
             end
-            self.CurMatrixCell.wrefresh
+            wrefresh(self.CurMatrixCell)
           end
 
           # Should we call a post-process?
@@ -603,7 +603,7 @@ module CDK
         end
       end
 
-      if !complete
+      if !@complete
         # Set the variables we need.
         @oldcrow = @crow
         @oldccol = @ccol
@@ -635,13 +635,13 @@ module CDK
       # If the column is only one char.
       (1..@colwidths[@ccol]).each do |x|
         ch = if x <= infolen && !Display.isHiddenDisplayType(disptype)
-             then CDK.CharOf(@info[@row][@col][x - 1])
+             then charOf(@info[@row][@col][x - 1])
              else @filler
              end
         self.CurMatrixCell.mvwaddch(1, x, ch.ord | highlight)
       end
       self.CurMatrixCell.wmove(1, infolen + 1)
-      self.CurMatrixCell.wrefresh
+      wrefresh(self.CurMatrixCell)
     end
 
     # This moves the matrix field to the given location.
@@ -678,14 +678,14 @@ module CDK
       # Draw in the cell info.
       (1..@colwidths[col]).each do |x|
         ch = if x <= infolen && !Display.isHiddenDisplayType(disptype)
-             then CDK.CharOf(@info[vrow][vcol][x-1]).ord | highlight
+             then charOf(@info[vrow][vcol][x-1]).ord | highlight
              else @filler
              end
         @cell[row][col].mvwaddch(1, x, ch.ord | highlight)
       end
 
       @cell[row][col].wmove(1, infolen + 1)
-      @cell[row][col].wrefresh
+      wrefresh(@cell[row][col])
 
       # Only draw the box iff the user asked for a box.
       if !box
@@ -804,7 +804,7 @@ module CDK
               @coltitle_pos[@lcol + x - 1], 0,
               @coltitle[@lcol + x - 1], CDK::HORIZONTAL, 0,
               @coltitle_len[@lcol + x - 1])
-          @cell[0][x].wrefresh
+          wrefresh(@cell[0][x])
         end
       end
     end
@@ -817,7 +817,7 @@ module CDK
               @rowtitle_pos[@trow + x - 1], 1,
               @rowtitle[@trow + x - 1], CDK::HORIZONTAL, 0,
               @rowtitle_len[@trow + x - 1])
-          @cell[x][0].wrefresh
+          wrefresh(@cell[x][0])
         end
       end
     end
@@ -855,7 +855,7 @@ module CDK
 
       self.drawTitle(@win)
 
-      @win.wrefresh
+      wrefresh
 
       self.drawEachColTitle
       self.drawEachRowTitle
@@ -1134,7 +1134,7 @@ module CDK
           Ncurses::ACS_URCORNER, Ncurses::ACS_LLCORNER,
           Ncurses::ACS_LRCORNER, Ncurses::ACS_HLINE,
           Ncurses::ACS_VLINE, Ncurses::A_BOLD)
-      self.CurMatrixCell.wrefresh
+      wrefresh(self.CurMatrixCell)
       self.highlightCell
     end
 

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class MENTRY < CDK::CDKOBJS
@@ -32,7 +32,7 @@ module CDK
       # We need to translate the string label to a chtype array
       if label.size > 0
         label_len = []
-        @label = CDK.char2Chtype(label, label_len, [])
+        @label = char2Chtype(label, label_len, [])
         @label_len = label_len[0]
       end
       box_width = @label_len + field_width + 2
@@ -52,7 +52,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]
 
@@ -137,7 +137,7 @@ module CDK
               mentry.drawField
             end
             mentry.field_win.wmove(mentry.current_row, mentry.current_col)
-            mentry.field_win.wrefresh
+            wrefresh(mentry.field_win)
           end
         end
       end
@@ -230,7 +230,7 @@ module CDK
       cursor_pos = self.getCursorPos
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -249,7 +249,7 @@ module CDK
       if pp_return != 0
         # Check for a key binding...
         if self.checkBind(:MENTRY, input)
-          complete = true
+          @complete = true
         else
           moved = false
           redraw = false
@@ -382,14 +382,14 @@ module CDK
             else
               self.setExitType(input)
               ret = @info
-              complete = true
+              @complete = true
             end
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -405,17 +405,17 @@ module CDK
             self.drawField
           elsif moved
             @field_win.wmove(@current_row, @current_col)
-            @field_win.wrefresh
+            wrefresh(@field_win)
           end
         end
 
         # Should we do a post-process?
-        if !complete && !(@post_process_func.nil?)
+        if !@complete && !(@post_process_func.nil?)
           @post_process_func.call(:MENTRY, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.setExitType(0)
       end
 
@@ -435,7 +435,7 @@ module CDK
       currchar = @field_width * @top_row
   
       self.drawTitle(@win)
-      @win.wrefresh
+      wrefresh
   
       lastpos = @info.size
   
@@ -457,7 +457,7 @@ module CDK
   
       # Refresh the screen.
       @field_win.wmove(@current_row, @current_col)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
   
     # This function draws the multiple line entry field.
@@ -465,7 +465,7 @@ module CDK
       # Box the widget if asked.
       if box
         Draw.drawObjBox(@win, self)
-        @win.wrefresh
+        wrefresh
       end
   
       # Do we need to draw in the shadow?
@@ -477,7 +477,7 @@ module CDK
       unless @label_win.nil?
         Draw.writeChtype(@label_win, 0, 0, @label, CDK::HORIZONTAL,
             0, @label_len)
-        @label_win.wrefresh
+        wrefresh(@label_win)
       end
   
       # Draw the mentry field
@@ -596,11 +596,11 @@ module CDK
   
     def focus
       @field_win.wmove(0, @current_col)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
   
     def unfocus
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     def position