cdk 0.9.0 → 0.10.0

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class MENU < CDK::CDKOBJS
@@ -69,7 +69,7 @@ module CDK
         (CDK::MENU::TITLELINES...subsize[x]).to_a.each do |y|
           y0 = y - CDK::MENU::TITLELINES
           sublist_len = []
-          @sublist[x1][y0] = CDK.char2Chtype(menu_list[x][y],
+          @sublist[x1][y0] = char2Chtype(menu_list[x][y],
               sublist_len, [])
           @sublist_len[x1][y0] = sublist_len[0]
           max = [max, sublist_len[0]].max
@@ -82,7 +82,7 @@ module CDK
         end
 
         title_len = []
-        @title[x1] = CDK.char2Chtype(menu_list[x][0], title_len, [])
+        @title[x1] = char2Chtype(menu_list[x][0], title_len, [])
         @title_len[x1] = title_len[0]
         @subsize[x1] = subsize[x] - CDK::MENU::TITLELINES
         @title_win[x1] = cdkscreen.window.subwin(CDK::MENU::TITLELINES,
@@ -185,7 +185,7 @@ module CDK
           # Draw the new sub-title.
           self.selectItem(@current_subtitle, 0)
 
-          @pull_win[@current_title].wrefresh
+          wrefresh(@pull_win[@current_title])
         end
 
         @input_window = @title_win[@current_title]
@@ -214,7 +214,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -231,7 +231,7 @@ module CDK
       if pp_return != 0
         # Check for key bindings.
         if self.checkBind(:MENU, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_LEFT
@@ -247,16 +247,16 @@ module CDK
             self.setExitType(input)
             @last_selection = @current_title * 100 + @current_subtitle
             ret = @last_selection
-            complete = true
+            @complete = true
           when CDK::KEY_ESC
             self.cleanUpMenu
             self.setExitType(input)
             @last_selection = -1
             ret = @last_selection
-            complete = true
+            @complete = true
           when Ncurses::ERR
             self.setExitType(input)
-            complete = true
+            @complete = true
           when CDK::REFRESH
             self.erase
             self.refresh
@@ -264,12 +264,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(:MENU, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.setExitType(0)
       end
 
@@ -308,13 +308,13 @@ module CDK
       end
 
       self.selectItem(@current_subtitle, x0)
-      @pull_win[@current_title].wrefresh
+      wrefresh(@pull_win[@current_title])
 
       # Highlight the title.
       Draw.writeChtypeAttrib(@title_win[@current_title], 0, 0,
           @title[@current_title], @title_attr, CDK::HORIZONTAL,
           0, @title_len[@current_title])
-      @title_win[@current_title].wrefresh
+      wrefresh(@title_win[@current_title])
     end
 
     # Erase a menu item subwindow
@@ -323,7 +323,7 @@ module CDK
 
       # Redraw the sub-menu title.
       self.drawTitle(@current_title)
-      @title_win[@current_title].wrefresh
+      wrefresh(@title_win[@current_title])
     end
 
     # Draw the menu.
@@ -331,7 +331,7 @@ module CDK
       # Draw in the menu titles.
       (0...@menu_items).each do |x|
         self.drawTitle(x)
-        @title_win[x].wrefresh
+        wrefresh(@title_win[x])
       end
     end
 
@@ -373,9 +373,9 @@ module CDK
       if self.validCDKObject
         (0...@menu_items).each do |x|
           @title_win[x].werase
-          @title_win[x].wrefresh
+          wrefresh(@title_win[x])
           @pull_win[x].werase
-          @pull_win[x].wrefresh
+          wrefresh(@pull_win[x])
         end
       end
     end
@@ -420,7 +420,7 @@ module CDK
     def cleanUpMenu
       # Erase the sub-menu.
       self.eraseSubwin
-      @pull_win[@current_title].wrefresh
+      wrefresh(@pull_win[@current_title])
 
       # Refresh the screen.
       @screen.refresh

data/lib/cdk/{radio.rb → components/radio.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]
 
@@ -130,7 +130,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 radio widget.
@@ -167,7 +167,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type
       self.setExitType(0)
@@ -186,7 +186,7 @@ module CDK
       if pp_return != 0
         # Check for a predefined key binding.
         if self.checkBind(:RADIO, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_UP
@@ -214,14 +214,14 @@ module CDK
           when CDK::KEY_ESC
             self.setExitType(input)
             ret = -1
-            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 = @selected_item
-            complete = true
+            @complete = true
           when CDK::REFRESH
             @screen.erase
             @screen.refresh
@@ -229,12 +229,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(:RADIO, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawList(@box)
         self.setExitType(0)
       end
@@ -399,7 +399,7 @@ module CDK
 
     def getItems(list)
       (0...@list_size).each do |j|
-        list << CDK.chtype2Char(@item[j])
+        list << chtype2Char(@item[j])
       end
       return @list_size
     end
@@ -484,14 +484,14 @@ 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].nil? || new_list[j].size == 0
             status = false
             break
           end
-          new_pos[j] = CDK.justifyString(box_width, new_len[j], new_pos[j]) + 3
+          new_pos[j] = justify_string(box_width, new_len[j], new_pos[j]) + 3
           widest_item = [widest_item, new_len[j]].max
         end
         if status

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

@@ -1,4 +1,4 @@
-require_relative 'cdk_objs'
+require_relative '../cdk_objs'
 
 module CDK
   class SCALE < CDK::CDKOBJS
@@ -37,7 +37,7 @@ module CDK
       # Translate the label string to a chtype array
       unless label.nil?
         label_len = []
-        @label = CDK.char2Chtype(label, label_len, [])
+        @label = char2Chtype(label, label_len, [])
         @label_len = label_len[0]
         box_width = @label_len + field_width + 2
       end
@@ -57,7 +57,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]
 
@@ -286,7 +286,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type.
       self.setExitType(0)
@@ -305,7 +305,7 @@ module CDK
       if pp_return != 0
         # Check for a key bindings.
         if self.checkBind(self.object_type, input)
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_LEFT
@@ -327,13 +327,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
@@ -363,13 +363,13 @@ 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(self.object_type, self,
               @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawField
         self.setExitType(0)
       end
@@ -403,9 +403,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
@@ -422,7 +422,7 @@ module CDK
           CDK::HORIZONTAL, 0, temp.size)
 
       self.moveToEditPosition(@field_edit)
-      @field_win.wrefresh
+      wrefresh(@field_win)
     end
 
     # This sets the background attribute of teh widget.

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

@@ -2,6 +2,8 @@ require_relative 'scroller'
 
 module CDK
   class SCROLL < CDK::SCROLLER
+    include CommonControls
+
     attr_reader :item, :list_size, :current_item, :highlight
 
     def initialize (cdkscreen, xplace, yplace, splace, height, width, title,
@@ -64,7 +66,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]
 
@@ -148,7 +150,7 @@ module CDK
       xpos = self.SCREEN_XPOS(0) + scrollbar_adj
 
       @input_window.wmove(ypos, xpos)
-      @input_window.wrefresh
+      wrefresh(@input_window)
     end
 
     # This actually does all the 'real' work of managing the scrolling list.
@@ -186,7 +188,7 @@ module CDK
     def inject(input)
       pp_return = 1
       ret = -1
-      complete = false
+      @complete = false
 
       # Set the exit type for the widget.
       self.setExitType(0)
@@ -205,7 +207,7 @@ module CDK
         # Check for a predefined key binding.
         if self.checkBind(:SCROLL, input) != false
           #self.checkEarlyExit
-          complete = true
+          @complete = true
         else
           case input
           when Ncurses::KEY_UP
@@ -230,26 +232,28 @@ module CDK
             @left_char = 0
           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
           when CDK::KEY_TAB, Ncurses::KEY_ENTER, CDK::KEY_RETURN
-            self.setExitType(input)
-            ret = @current_item
-            complete = true
+            if quit_on_enter?
+              self.setExitType(input)
+              ret = @current_item
+              @complete = true
+            end
           end
         end
 
-        if !complete && !(@post_process_func.nil?)
+        if !@complete && !(@post_process_func.nil?)
           @post_process_func.call(:SCROLL, self, @post_process_data, input)
         end
       end
 
-      if !complete
+      if !@complete
         self.drawList(@box)
         self.setExitType(0)
       end
@@ -361,7 +365,7 @@ module CDK
       end
 
       # Refresh the window
-      @win.wrefresh
+      wrefresh
     end
 
     # This sets the background attribute of the widget.
@@ -422,11 +426,11 @@ module CDK
 
       item_len = []
       item_pos = []
-      @item[which] = CDK.char2Chtype(value, item_len, item_pos)
+      @item[which] = char2Chtype(value, item_len, item_pos)
       @item_len[which] = item_len[0]
       @item_pos[which] = item_pos[0]
 
-      @item_pos[which] = CDK.justifyString(@box_width,
+      @item_pos[which] = justify_string(@box_width,
           @item_len[which], @item_pos[which])
       return true
     end
@@ -492,7 +496,7 @@ module CDK
 
     def getItems(list)
       (0...@list_size).each do |x|
-        list << CDK.chtype2Char(@item[x])
+        list << chtype2Char(@item[x])
       end
 
       return @list_size
@@ -601,12 +605,12 @@ module CDK
     
     def focus
       self.drawCurrent
-      @list_win.wrefresh
+      wrefresh(@list_win)
     end
 
     def unfocus
       self.drawCurrent
-      @list_win.wrefresh
+      wrefresh(@list_win)
     end
 
     def AvailableWidth
@@ -623,372 +627,5 @@ module CDK
     def WidestItem
       @max_left_char + self.AvailableWidth
     end
-  end
-
-  class BUTTON < CDK::CDKOBJS
-    def initialize(cdkscreen, xplace, yplace, text, callback, box, shadow)
-      super()
-      parent_width = cdkscreen.window.getmaxx
-      parent_height = cdkscreen.window.getmaxy
-      box_width = 0
-      xpos = xplace
-      ypos = yplace
-
-      self.setBox(box)
-      box_height = 1 + 2 * @border_size
-
-      # Translate the string to a chtype array.
-      info_len = []
-      info_pos = []
-      @info = CDK.char2Chtype(text, info_len, info_pos)
-      @info_len = info_len[0]
-      @info_pos = info_pos[0]
-      box_width = [box_width, @info_len].max + 2 * @border_size
-
-      # Create the string alignments.
-      @info_pos = CDK.justifyString(box_width - 2 * @border_size,
-          @info_len, @info_pos)
-
-      # Make sure we didn't extend beyond the dimensions of the window.
-      box_width = if box_width > parent_width
-                  then parent_width
-                  else box_width
-                  end
-      box_height = if box_height > parent_height
-                   then parent_height
-                   else box_height
-                   end
-
-      # Rejustify the x and y positions if we need to.
-      xtmp = [xpos]
-      ytmp = [ypos]
-      CDK.alignxy(cdkscreen.window, xtmp, ytmp, box_width, box_height)
-      xpos = xtmp[0]
-      ypos = ytmp[0]
-
-      # Create the button.
-      @screen = cdkscreen
-      # ObjOf (button)->fn = &my_funcs;
-      @parent = cdkscreen.window
-      @win = Ncurses::WINDOW.new(box_height, box_width, ypos, xpos)
-      @shadow_win = nil
-      @xpos = xpos
-      @ypos = ypos
-      @box_width = box_width
-      @box_height = box_height
-      @callback = callback
-      @input_window = @win
-      @accepts_focus = true
-      @shadow = shadow
-
-      if @win.nil?
-        self.destroy
-        return nil
-      end
-
-      @win.keypad(true)
-
-      # If a shadow was requested, then create the shadow window.
-      if shadow
-        @shadow_win = Ncurses::WINDOW.new(box_height, box_width,
-            ypos + 1, xpos + 1)
-      end
-
-      # Register this baby.
-      cdkscreen.register(:BUTTON, self)
-    end
-
-    # This was added for the builder.
-    def activate(actions)
-      self.draw(@box)
-      ret = -1
-
-      if actions.nil? || actions.size == 0
-        while true
-          input = self.getch([])
-
-          # Inject the character into the widget.
-          ret = self.inject(input)
-          if @exit_type != :EARLY_EXIT
-            return ret
-          end
-        end
-      else
-        # Inject each character one at a time.
-        actions.each do |x|
-          ret = self.inject(action)
-          if @exit_type == :EARLY_EXIT
-            return ret
-          end
-        end
-      end
-
-      # Set the exit type and exit
-      self.setExitType(0)
-      return -1
-    end
-
-    # This sets multiple attributes of the widget.
-    def set(mesg, box)
-      self.setMessage(mesg)
-      self.setBox(box)
-    end
-
-    # This sets the information within the button.
-    def setMessage(info)
-      info_len = []
-      info_pos = []
-      @info = CDK.char2Chtype(info, info_len, info_pos)
-      @info_len = info_len[0]
-      @info_pos = CDK.justifyString(@box_width - 2 * @border_size,
-          info_pos[0])
-
-      # Redraw the button widget.
-      self.erase
-      self.draw(box)
-    end
-
-    def getMessage
-      return @info
-    end
-
-    # This sets the background attribute of the widget.
-    def setBKattr(attrib)
-      @win.wbkgd(attrib)
-    end
-
-    def drawText
-      box_width = @box_width
-
-      # Draw in the message.
-      (0...(box_width - 2 * @border_size)).each do |i|
-        pos = @info_pos
-        len = @info_len
-        if i >= pos && (i - pos) < len
-          c = @info[i - pos]
-        else
-          c = ' '
-        end
-
-        if @has_focus
-          c = Ncurses::A_REVERSE | c
-        end
-
-        @win.mvwaddch(@border_size, i + @border_size, c)
-      end
-    end
-
-    # This draws the button widget
-    def draw(box)
-      # Is there a shadow?
-      unless @shadow_win.nil?
-        Draw.drawShadow(@shadow_win)
-      end
-
-      # Box the widget if asked.
-      if @box
-        Draw.drawObjBox(@win, self)
-      end
-      self.drawText
-      @win.wrefresh
-    end
-
-    # This erases the button widget.
-    def erase
-      if self.validCDKObject
-        CDK.eraseCursesWindow(@win)
-        CDK.eraseCursesWindow(@shadow_win)
-      end
-    end
-
-    # This moves the button 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]
-      ytmp = [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)
-
-      # Thouch the windows so they 'move'.
-      CDK::SCREEN.refreshCDKWindow(@screen.window)
-
-      # Redraw the window, if they asked for it.
-      if refresh_flag
-        self.draw(@box)
-      end
-    end
-
-    # This allows the user to use the cursor keys to adjust the
-    # position of the widget.
-    def position
-      # Declare some variables
-      orig_x = @win.getbegx
-      orig_y = @win.getbegy
-      key = 0
-
-      # Let them move the widget around until they hit return
-      while key != Ncurses::KEY_ENTER && key != CDK::KEY_RETURN
-        key = self.getch([])
-        if key == Ncurses::KEY_UP || key == '8'.ord
-          if @win.getbegy > 0
-            self.move(0, -1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == Ncurses::KEY_DOWN || key == '2'.ord
-          if @win.getbegy + @win.getmaxy < @screen.window.getmaxy - 1
-            self.move(0, 1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == Ncurses::KEY_LEFT || key == '4'.ord
-          if @win.getbegx > 0
-            self.move(-1, 0, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == Ncurses::KEY_RIGHT || key == '6'.ord
-          if @win.getbegx + @win.getmaxx < @screen.window.getmaxx - 1
-            self.move(1, 0, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == '7'.ord
-          if @win.getbegy > 0 && @win.getbegx > 0
-            self.move(-1, -1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == '9'.ord
-          if @win.getbegx + @win.getmaxx < @screen.window.getmaxx - 1 &&
-              @win.getbegy > 0
-            self.move(1, -1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == '1'.ord
-          if @win.getbegx > 0 &&
-              @win.getbegx + @win.getmaxx < @screen.window.getmaxx - 1
-            self.move(-1, 1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == '3'.ord
-          if @win.getbegx + @win.getmaxx < @screen.window.getmaxx - 1 &&
-              @win.getbegy + @win.getmaxy < @screen.window.getmaxy - 1
-            self.move(1, 1, true, true)
-          else
-            CDK.Beep
-          end
-        elsif key == '5'.ord
-          self.move(CDK::CENTER, CDK::CENTER, false, true)
-        elsif key == 't'.ord
-          self.move(@win.getbegx, CDK::TOP, false, true)
-        elsif key == 'b'.ord
-          self.move(@win.getbegx, CDK::BOTTOM, false, true)
-        elsif key == 'l'.ord
-          self.move(CDK::LEFT, @win.getbegy, false, true)
-        elsif key == 'r'
-          self.move(CDK::RIGHT, @win.getbegy, false, true)
-        elsif key == 'c'
-          self.move(CDK::CENTER, @win.getbegy, false, true)
-        elsif key == 'C'
-          self.move(@win.getbegx, CDK::CENTER, false, true)
-        elsif key == CDK::REFRESH
-          @screen.erase
-          @screen.refresh
-        elsif key == CDK::KEY_ESC
-          self.move(orig_x, orig_y, false, true)
-        elsif key != CDK::KEY_RETURN && key != Ncurses::KEY_ENTER
-          CDK.Beep
-        end
-      end
-    end
-
-    # This destroys the button object pointer.
-    def destroy
-      CDK.deleteCursesWindow(@shadow_win)
-      CDK.deleteCursesWindow(@win)
-
-      self.cleanBindings(:BUTTON)
-
-      CDK::SCREEN.unregister(:BUTTON, self)
-    end
-
-    # This injects a single character into the widget.
-    def inject(input)
-      ret = -1
-      complete = false
-
-      self.setExitType(0)
-
-      # Check a predefined binding.
-      if self.checkBind(:BUTTON, input)
-        complete = true
-      else
-        case input
-        when CDK::KEY_ESC
-          self.setExitType(input)
-          complete = true
-        when Ncurses::ERR
-          self.setExitType(input)
-          complete = true
-        when ' '.ord, CDK::KEY_RETURN, Ncurses::KEY_ENTER
-          unless @callback.nil?
-            @callback.call(self)
-          end
-          self.setExitType(Ncurses::KEY_ENTER)
-          ret = 0
-          complete = true
-        when CDK::REFRESH
-          @screen.erase
-          @screen.refresh
-        else
-          CDK.Beep
-        end
-      end
-
-      unless complete
-        self.setExitType(0)
-      end
-
-      @result_data = ret
-      return ret
-    end
-
-    def focus
-      self.drawText
-      @win.wrefresh
-    end
-
-    def unfocus
-      self.drawText
-      @win.wrefresh
-    end
-
-    def object_type
-      :BUTTON
-    end
-  end
-end
+  end # class SCROLL
+end # module CDK