cdk 0.9.0 → 0.10.0

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 module CDK
   class SCROLLER < CDK::CDKOBJS
     def initialize

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

@@ -64,7 +64,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]
 
@@ -108,7 +108,7 @@ module CDK
       # Each choice has to be converted from string to chtype array
       (0...choice_count).each do |j|
         choicelen = []
-        @choice << CDK.char2Chtype(choices[j], choicelen, [])
+        @choice << char2Chtype(choices[j], choicelen, [])
         @choicelen << choicelen[0]
         @maxchoicelen = [@maxchoicelen, choicelen[0]].max
       end
@@ -147,7 +147,7 @@ module CDK
       xpos = self.SCREEN_XPOS(0) + scrollbar_adj
 
       @input_window.wmove(ypos, xpos)
-      @input_window.wrefresh
+      wrefresh(@input_window)
     end
 
     # This actually manages the selection widget
@@ -185,7 +185,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type
       self.setExitType(0)
@@ -203,7 +203,7 @@ module CDK
       if pp_return != 0
         # Check for a predefined binding.
         if self.checkBind(:SELECTION, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_UP
@@ -238,14 +238,14 @@ module CDK
             end
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::KEY_ENTER, CDK::KEY_TAB, CDK::KEY_RETURN
             self.setExitType(input)
             ret = 1
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -253,12 +253,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(:SELECTION, self, @post_process_data, input)
         end
       end
   
-      unless complete
+      unless @complete
         self.drawList(@box)
         self.setExitType(0)
       end
@@ -412,7 +412,7 @@ module CDK
 
     def getItems(list)
       @item.each do |item|
-        list << CDK.chtype2Char(item)
+        list << chtype2Char(item)
       end
       return @list_size
     end
@@ -429,7 +429,7 @@ module CDK
     end
 
     def getTitle
-      return CDK.chtype2Char(@title)
+      return chtype2Char(@title)
     end
 
     # This sets the highlight bar.
@@ -558,7 +558,7 @@ module CDK
         (0...list_size).each do |j|
           lentmp = []
           postmp = []
-          new_list << CDK.char2Chtype(list[j], lentmp, postmp)
+          new_list << char2Chtype(list[j], lentmp, postmp)
           new_len << lentmp[0]
           new_pos << postmp[0]
           #if new_list[j].size == 0
@@ -567,7 +567,7 @@ module CDK
             break
           end
           new_pos[j] =
-              CDK.justifyString(box_width, new_len[j], new_pos[j]) + adjust
+              justify_string(box_width, new_len[j], new_pos[j]) + adjust
           widest_item = [widest_item, new_len[j]].max
         end
 

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class SLIDER < CDK::CDKOBJS
@@ -33,7 +33,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]
         box_width = @label_len + field_width +
             high_value_len + 2 * @border_size
@@ -56,7 +56,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]
 
@@ -190,7 +190,7 @@ module CDK
         return false
       end
       ch = @field_win.winch
-      if CDK.CharOf(ch) != ' '
+      if charOf(ch) != ' '
         return true
       end
       if new_position > 1
@@ -199,7 +199,7 @@ module CDK
           return false
         end
         ch = @field_win.winch
-        return CDK.CharOf(ch) != ' '
+        return charOf(ch) != ' '
       end
       return false
     end
@@ -290,7 +290,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -309,7 +309,7 @@ module CDK
       if pp_return != 0
         # Check for a key binding.
         if self.checkBind(:SLIDER, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_LEFT
@@ -331,13 +331,13 @@ module CDK
           when CDK::KEY_TAB, CDK::KEY_RETURN, Ncurses::KEY_ENTER
             self.setExitType(input)
             ret = @current
-            complete = true
+            @complete = true
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -367,12 +367,12 @@ module CDK
         self.limitCurrentValue
 
         # Should we call a post-process?
-        if !complete && !(@post_process_func.nil?)
+        if !@complete && !(@post_process_func.nil?)
           @post_process_func.call(:SLIDER, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawField
         self.setExitType(0)
       end
@@ -406,9 +406,9 @@ 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
-      @win.wrefresh
+      wrefresh
 
       # Draw the field window.
       self.drawField
@@ -433,7 +433,7 @@ module CDK
           Ncurses::A_NORMAL, CDK::HORIZONTAL, 0, @current.to_s.size)
 
       self.moveToEditPosition(@field_edit)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This sets the background attribute of the widget.

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class SWINDOW < CDK::CDKOBJS
@@ -45,7 +45,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]
 
@@ -109,9 +109,9 @@ module CDK
     def setupLine(list, x)
       list_len = []
       list_pos = []
-      @list[x] = CDK.char2Chtype(list, list_len, list_pos)
+      @list[x] = char2Chtype(list, list_len, list_pos)
       @list_len[x] = list_len[0]
-      @list_pos[x] = CDK.justifyString(@box_width, list_len[0], list_pos[0])
+      @list_pos[x] = justify_string(@box_width, list_len[0], list_pos[0])
       @widest_line = [@widest_line, @list_len[x]].max
     end
 
@@ -328,7 +328,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -347,7 +347,7 @@ module CDK
       if pp_return != 0
         # Check for a key binding.
         if self.checkBind(:SWINDOW, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_UP
@@ -409,13 +409,13 @@ module CDK
           when CDK::KEY_TAB, CDK::KEY_RETURN, Ncurses::KEY_ENTER
             self.setExitType(input)
             ret = 1
-            complete = true
+            @complete = true
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -423,12 +423,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(:SWINDOW, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawList(@box)
         self.setExitType(0)
       end
@@ -456,7 +456,7 @@ module CDK
 
       self.drawTitle(@win)
 
-      @win.wrefresh
+      wrefresh
 
       # Draw in the list.
       self.drawList(box)
@@ -490,7 +490,7 @@ module CDK
         end
       end
 
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This sets the background attribute of the widget.
@@ -713,7 +713,7 @@ module CDK
 
       # Start writing out the file.
       @list.each do |item|
-        raw_line = CDK.chtype2Char(item)
+        raw_line = chtype2Char(item)
         output_file << "%s\n" % raw_line
       end
 

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class TEMPLATE < CDK::CDKOBJS
@@ -26,17 +26,17 @@ module CDK
 
       # Translate the label string to achtype array
       if !(label.nil?) && label.size > 0
-        label_len = []
-        @label = CDK.char2Chtype(label, label_len, [])
+        label_len  = []
+        @label     = char2Chtype(label, label_len, [])
         @label_len = label_len[0]
       end
 
       # Translate the char * overlay to a chtype array
       if !(overlay.nil?) && overlay.size > 0
-        overlay_len = []
-        @overlay = CDK.char2Chtype(overlay, overlay_len, [])
+        overlay_len  = []
+        @overlay     = char2Chtype(overlay, overlay_len, [])
         @overlay_len = overlay_len[0]
-        @field_attr = @overlay[0] & Ncurses::A_ATTRIBUTES
+        @field_attr  = @overlay[0] & Ncurses::A_ATTRIBUTES
       else
         @overlay = []
         @overlay_len = 0
@@ -61,7 +61,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]
 
@@ -222,7 +222,7 @@ module CDK
     # This injects a character into the widget.
     def inject(input)
       pp_return = 1
-      complete = false
+      @complete = false
       ret = -1
 
       self.setExitType(0)
@@ -240,7 +240,7 @@ module CDK
       if pp_return != 0
         # Check a predefined binding
         if self.checkBind(:TEMPLATE, input)
-          complete = true
+          @complete = true
         else
           case input
           when CDK::ERASE
@@ -280,14 +280,14 @@ module CDK
             else
               self.setExitType(input)
               ret = @info
-              complete = true
+              @complete = true
             end
           when CDK::KEY_ESC
             self.setExitType(input)
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -297,12 +297,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(:TEMPLATE, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.setExitType(0)
       end
 
@@ -399,7 +399,7 @@ module CDK
 
       self.drawTitle(@win)
 
-      @win.wrefresh
+      wrefresh
 
       self.drawField
     end
@@ -412,7 +412,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 in the template
@@ -435,7 +435,7 @@ module CDK
       else
         self.adjustCursor(1)
       end
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # Adjust the cursor for the template
@@ -446,7 +446,7 @@ module CDK
         @screen_pos += direction
       end
       @field_win.wmove(0, @screen_pos)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # Set the background attribute of the widget.

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class VIEWER < CDK::CDKOBJS
@@ -35,7 +35,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]
 
@@ -57,7 +57,7 @@ module CDK
       if button_count > 0
         (0...button_count).each do |x|
           button_len = []
-          @button << CDK.char2Chtype(buttons[x], button_len, [])
+          @button << char2Chtype(buttons[x], button_len, [])
           @button_len << button_len[0]
           button_width += @button_len[x] + 1
         end
@@ -137,9 +137,9 @@ module CDK
       if interpret
         list_len = []
         list_pos = []
-        @list[x] = CDK.char2Chtype(list, list_len, list_pos)
+        @list[x] = char2Chtype(list, list_len, list_pos)
         @list_len[x] = list_len[0]
-        @list_pos[x] = CDK.justifyString(@box_width, @list_len[x], list_pos[0])
+        @list_pos[x] = justify_string(@box_width, @list_len[x], list_pos[0])
       else
         # We must convert tabs and other nonprinting characters. The curses
         # library normally does this, but we are bypassing it by writing
@@ -152,8 +152,8 @@ module CDK
               t  << ' '
               len += 1
             end while (len & 7) != 0
-          elsif CDK.CharOf(list[y].ord).match(/^[[:print:]]$/)
-            t << CDK.CharOf(list[y].ord)
+          elsif charOf(list[y].ord).match(/^[[:print:]]$/)
+            t << charOf(list[y].ord)
             len += 1
           else
             t << Ncurses.unctrl(list[y].ord)
@@ -187,7 +187,7 @@ module CDK
       if list.size > 0 && interpret
         (0...list_size).each do |x|
           filename = ''
-          if CDK.checkForLink(list[x], filename) == 1
+          if check_for_link(list[x], filename) == 1
             file_contents = []
             file_len = CDK.readFile(filename, file_contents)
 
@@ -218,7 +218,7 @@ module CDK
         else
           # Check if we have a file link in this line.
           filename = []
-          if CDK.checkForLink(list[x], filename) == 1
+          if check_for_link(list[x], filename) == 1
             # We have a link, open the file.
             file_contents = []
             file_len = 0
@@ -555,10 +555,10 @@ module CDK
             pos = 0
             y = 0
             while y < @list[x].size
-              plain_char = CDK.CharOf(@list[x][y])
+              plain_char = charOf(@list[x][y])
 
               pos += 1
-              if @CDK.CharOf(pattern[pos-1]) != plain_char
+              if charOf(pattern[pos-1]) != plain_char
                 y -= (pos - 1)
                 pos = 0
               elsif pos == pattern.size
@@ -578,10 +578,10 @@ module CDK
             y = 0
             pos = 0
             while y < @list[x].size
-              plain_char = CDK.CharOf(@list[x][y])
+              plain_char = charOf(@list[x][y])
 
               pos += 1
-              if CDK.CharOf(pattern[pos-1]) != plain_char
+              if charOf(pattern[pos-1]) != plain_char
                 y -= (pos - 1)
                 pos = 0
               elsif pos == pattern.size
@@ -596,7 +596,7 @@ module CDK
       end
       return found
     end
-    
+
     # This allows us to 'jump' to a given line in the file.
     def jumpToLine
       newline = CDK::SCALE.new(@screen, CDK::CENTER, CDK::CENTER,
@@ -637,7 +637,7 @@ module CDK
       # Box it if it was asked for.
       if box
         Draw.drawObjBox(@win, self)
-        @win.wrefresh
+        wrefresh
       end
 
       # Draw the info in the viewer.
@@ -660,7 +660,7 @@ module CDK
       # Highlight the current button.
       (0...@button_len[@current_button]).each do |x|
         # Strip the character of any extra attributes.
-        character = CDK.CharOf(@button[@current_button][x])
+        character = charOf(@button[@current_button][x])
 
         # Add the character into the window.
         @win.mvwaddch(@box_height - 2, @button_pos[@current_button] + x,
@@ -668,7 +668,7 @@ module CDK
       end
 
       # Refresh the window.
-      @win.wrefresh
+      wrefresh
     end
 
     # This sets the background attribute of the widget.
@@ -765,7 +765,7 @@ module CDK
       # Box it if we have to.
       if @box
         Draw.drawObjBox(@win, self)
-        @win.wrefresh
+        wrefresh
       end
 
       # Draw the separation line.
@@ -808,5 +808,75 @@ module CDK
     def object_type
       :VIEWER
     end
+
+    private
+
+    # This function checks to see if a link has been requested
+    def check_for_link (line, filename)
+      f_pos = 0
+      x = 3
+      if line.nil?
+        return -1
+      end
+
+      # Strip out the filename.
+      if line[0] == L_MARKER && line[1] == 'F' && line[2] == '='
+        while x < line.size
+          if line[x] == R_MARKER
+            break
+          end
+          if f_pos < CDK_PATHMAX
+            filename << line[x]
+            f_pos += 1
+          end
+          x += 1
+        end
+      end
+      return f_pos != 0
+    end
+
+    # This allows the user to view information.
+    def self.viewInfo(screen, title, info, count, buttons, button_count,
+        interpret)
+      selected = -1
+
+      # Create the file viewer to view the file selected.
+      viewer = CDK::VIEWER.new(screen, CDK::CENTER, CDK::CENTER, -6, -16,
+          buttons, button_count, Ncurses::A_REVERSE, true, true)
+
+      # Set up the viewer title, and the contents to the widget.
+      viewer.set(title, info, count, Ncurses::A_REVERSE, interpret, true, true)
+
+      # Activate the viewer widget.
+      selected = viewer.activate([])
+
+      # Make sure they exited normally.
+      if viewer.exit_type != :NORMAL
+        viewer.destroy
+        return -1
+      end
+
+      # Clean up and return the button index selected
+      viewer.destroy
+      return selected
+    end
+
+    # This allows the user to view a file.
+    def self.viewFile(screen, title, filename, buttons, button_count)
+      info = []
+      result = 0
+
+      # Open the file and read the contents.
+      lines = CDK.readFile(filename, info)
+
+      # If we couldn't read the file, return an error.
+      if lines == -1
+        result = lines
+      else
+        result = self.viewInfo(screen, title, info, lines, buttons,
+            button_count, true)
+      end
+      return result
+    end
   end
 end