rndk 0.0.1 → 0.1.0

data/lib/rndk/calendar.rb

@@ -1,10 +1,48 @@
 require 'rndk'
 
 module RNDK
-  class CALENDAR < RNDK::Widget
-    attr_accessor :week_base
+
+  # Pop-up calendar Widget.
+  #
+  # The Calendar Widget allows the user to traverse through
+  # months/years using the cursor keys.
+  #
+  # ## Keybindings
+  #
+  # Left Arrow::  Moves the cursor to the previous day.
+  # Right Arrow:: Moves the cursor to the next day.
+  # Up Arrow::    Moves the cursor to the next week.
+  # Down Arrow::  Moves the cursor to the previous week.
+  # t::           Sets the calendar to the current date.
+  # T::           Sets the calendar to the current date.
+  # n::           Advances the calendar one month ahead.
+  # N::           Advances the calendar six months ahead.
+  # p::           Advances the calendar one month back.
+  # P::           Advances the calendar six months back.
+  # -::           Advances the calendar one year ahead.
+  # +::           Advances the calendar one year back.
+  # Enter::       Exits the widget and returns a value of
+  #               time_t   which   represents   the   day
+  #               selected at 1  second  after  midnight.
+  #               This also sets the widget data exitType
+  #               to vNORMAL.
+  # Tab::         Exits the widget and returns a value of
+  #               time_t   which   represents   the   day
+  #               selected at 1  second  after  midnight.
+  #               This also sets the widget data exitType
+  #               to vNORMAL.
+  # Escape::      Exits the widget and returns (time_)-1
+  #               This also sets the widget data exitType
+  #               to vESCAPE_HIT.
+  # Ctrl-L::      Refreshes the screen.
+  #
+  class Calendar < RNDK::Widget
+
     attr_reader :day, :month, :year
 
+    # First day of the week - Sunday is 0, Monday is 1, etc.
+    attr_accessor :week_base
+
     MONTHS_OF_THE_YEAR = [
         'NULL',
         'January',
@@ -37,47 +75,96 @@ module RNDK
         31,
     ]
 
-    MAX_DAYS = 32
+    MAX_DAYS   = 32
     MAX_MONTHS = 13
-    MAX_YEARS = 140
+    MAX_YEARS  = 140
 
-    CALENDAR_LIMIT = MAX_DAYS * MAX_MONTHS * MAX_YEARS
+    CALENDAR_LIMIT = (MAX_DAYS * MAX_MONTHS * MAX_YEARS)
 
-    def self.CALENDAR_INDEX(d, m, y)
-      (y * RNDK::CALENDAR::MAX_MONTHS + m) * RNDK::CALENDAR::MAX_DAYS + d
+    # Tells what day of the week the `month` starts on.
+    def self.month_starting_weekday(year, month)
+      return Time.mktime(year, month, 1, 10, 0, 0).wday
     end
 
-    def setCalendarCell(d, m, y, value)
-      @marker[RNDK::CALENDAR.CALENDAR_INDEX(d, m, y)] = value
+    # Tells if `year` is a leap year.
+    def self.leap_year? year
+      result = false
+      if year % 4 == 0
+        if year % 100 == 0
+          if year % 400 == 0
+            result = true
+          end
+        else
+          result = true
+        end
+      end
+      result
     end
 
-    def getCalendarCell(d, m, y)
-      @marker[RNDK::CALENDAR.CALENDAR_INDEX(d, m, y)]
-    end
+    # Returns how many days the `month`/`year` has.
+    def self.days_in_month(year, month)
+      month_length = DAYS_OF_THE_MONTH[month]
+
+      if month == 2
+        month_length += if Calendar.leap_year?(year)
+                        then 1
+                        else 0
+                        end
+      end
 
-    def initialize(rndkscreen, xplace, yplace, title, day, month, year,
-        day_attrib, month_attrib, year_attrib, highlight, box, shadow)
+      month_length
+    end
+
+    # Creates a Calendar Widget.
+    #
+    # * `day`, `month` and `year` are integers. I suggest
+    #   you to use Ruby's `Time.now.gmtime`.
+    # * `title` can be more than one line - just split them
+    #   with `\n`s.
+    # * `*_attrib` are specific colors.
+    #
+    # @note If `day`, `month` or `year` are zero, we'll use
+    #       the current date for it.
+    #       If all of them are 0, will use the complete date
+    #       of today.
+    def initialize(rndkscreen,
+                   xplace,
+                   yplace,
+                   title,
+                   day,
+                   month,
+                   year,
+                   day_attrib,
+                   month_attrib,
+                   year_attrib,
+                   highlight,
+                   box,
+                   shadow)
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
+      self.set_date(day, month, year)
+      self.set_box box
+
+      parent_width  = Ncurses.getmaxx(rndkscreen.window)
       parent_height = Ncurses.getmaxy(rndkscreen.window)
-      box_width = 24
+
+      box_width  = 24
       box_height = 11
+
       dayname = 'Su Mo Tu We Th Fr Sa '
       bindings = {
-          'T'           => Ncurses::KEY_HOME,
-          't'           => Ncurses::KEY_HOME,
-          'n'           => Ncurses::KEY_NPAGE,
+          'T'            => Ncurses::KEY_HOME,
+          't'            => Ncurses::KEY_HOME,
+          'n'            => Ncurses::KEY_NPAGE,
           RNDK::FORCHAR  => Ncurses::KEY_NPAGE,
-          'p'           => Ncurses::KEY_PPAGE,
+          'p'            => Ncurses::KEY_PPAGE,
           RNDK::BACKCHAR => Ncurses::KEY_PPAGE,
       }
 
-      self.setBox(box)
-
-      box_width = self.setTitle(title, box_width)
+      box_width   = self.set_title(title, box_width)
       box_height += @title_lines
 
-      # Make sure we didn't extend beyond the dimensions of the window.
+      # Make sure we didn't extend beyond the dimensions
+      # of the window.
       box_width = [box_width, parent_width].min
       box_height = [box_height, parent_height].min
 
@@ -103,131 +190,158 @@ module RNDK
       @field_width = box_width - 2 * (1 + @border_size)
 
       # Set months and day names
-      @month_name = RNDK::CALENDAR::MONTHS_OF_THE_YEAR.clone
+      @month_name = Calendar::MONTHS_OF_THE_YEAR.clone
       @day_name = dayname
 
       # Set the rest of the widget values.
       @screen = rndkscreen
       @parent = rndkscreen.window
-      @shadow_win = nil
+
       @xpos = xpos
       @ypos = ypos
-      @box_width = box_width
+
+      @width      = box_width
+      @box_width  = box_width
       @box_height = box_height
-      @day = day
-      @month = month
-      @year = year
-      @day_attrib = day_attrib
+
+      @day_attrib   = day_attrib
       @month_attrib = month_attrib
-      @year_attrib = year_attrib
-      @highlight = highlight
-      @width = box_width
+      @year_attrib  = year_attrib
+      @highlight    = highlight
+
       @accepts_focus = true
-      @input_window = @win
+      @input_window  = @win
+
       @week_base = 0
-      @shadow = shadow
-      @label_win = Ncurses.subwin(@win, 1, @field_width,
-          ypos + @title_lines + 1, xpos + 1 + @border_size)
+
+      @shadow     = shadow
+      @shadow_win = nil
+
+      @label_win = Ncurses.subwin(@win,
+                                  1,
+                                  @field_width,
+                                  ypos + @title_lines + 1,
+                                  xpos + 1 + @border_size)
       if @label_win.nil?
         self.destroy
         return nil
       end
 
-      @field_win = Ncurses.subwin(@win, 7, 20,
-          ypos + @title_lines + 3, xpos + @x_offset)
+      @field_win = Ncurses.subwin(@win,
+                                  7,
+                                  20,
+                                  ypos + @title_lines + 3,
+                                  xpos + @x_offset)
       if @field_win.nil?
         self.destroy
         return nil
       end
-      self.setBox(box)
-
-      @marker = [0] * RNDK::CALENDAR::CALENDAR_LIMIT
 
-      # If the day/month/year values were 0, then use today's date.
-      if @day == 0 && @month == 0 && @year == 0
-        date_info = Time.new.gmtime
-        @day = date_info.day
-        @month = date_info.month
-        @year = date_info
-      end
+      # Mon Nov 11 18:54:40
+      # another `set_box box` was here
+      # apparently nothing fucked up, see if I can delete this
 
-      # Verify the dates provided.
-      self.verifyCalendarDate
-
-      # Determine which day the month starts on.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @marker = [0] * Calendar::CALENDAR_LIMIT
 
       # If a shadow was requested, then create the shadow window.
       if shadow
-        @shadow_win = Ncurses.newwin(box_height, box_width,
-            ypos + 1, xpos + 1)
+        @shadow_win = Ncurses.newwin(box_height,
+                                     box_width,
+                                     ypos + 1,
+                                     xpos + 1)
       end
 
       # Setup the key bindings.
       bindings.each do |from, to|
-        self.bind(:CALENDAR, from, :getc, to)
+        self.bind(:calendar, from, :getc, to)
       end
 
-      rndkscreen.register(:CALENDAR, self)
+      rndkscreen.register(:calendar, self)
     end
 
-    # This function lets the user play with this widget.
-    def activate(actions)
-      ret = -1
-      self.draw(@box)
+    # Returns the specific internal index of `d`/`m`/`y`.
+    def self.calendar_index(d, m, y)
+      (y * Calendar::MAX_MONTHS + m) * Calendar::MAX_DAYS + d
+    end
+
+    # Sets `d`/`m`/`y` cell to have `value`.
+    def setCalendarCell(d, m, y, value)
+      @marker[Calendar.calendar_index(d, m, y)] = value
+    end
+
+    # Returns current value on cell `d`/`m`/`y`.
+    def getCalendarCell(d, m, y)
+      @marker[Calendar.calendar_index(d, m, y)]
+    end
+
+    # Activates the Calendar Widget, letting the user interact with it.
+    #
+    # `actions` is an Array of characters. If it's non-null,
+    # will #inject each char on it into the Widget.
+    #
+    # @return The date or `nil` if something bad happened.
+    def activate(actions=[])
+      ret = nil
+      self.draw @box
 
       if actions.nil? || actions.size == 0
-        while true
+        # Interacting with the user
+        loop do
           input = self.getch([])
 
           # Inject the character into the widget.
-          ret = self.inject(input)
-          if @exit_type != :EARLY_EXIT
-            return ret
-          end
+          ret = self.inject input
+
+          return ret if @exit_type != :EARLY_EXIT
         end
+
       else
-        # Inject each character one at a time.
+        # Executing `actions`, one char at a time.
         actions.each do |action|
-          ret = self.inject(action)
-          if @exit_type != :EARLY_EXIT
-            return ret
-          end
+          ret = self.inject action
+
+          return ret if @exit_type != :EARLY_EXIT
         end
       end
-      return ret
+      ret
     end
 
-    # This injects a single character into the widget.
-    def inject(input)
-      # Declare local variables
+    # Makes the Calendar react to `char` just as if the user
+    # had pressed it.
+    #
+    # Nice to simulate batch actions on a Widget.
+    #
+    # Besides normal keybindings (arrow keys and such), see
+    # Widget#set_exit_type to see how the Widget exits.
+    #
+    def inject char
       pp_return = 1
-      ret = -1
-      complete = false
+      ret       = nil
+      complete  = false
 
       # Set the exit type
-      self.setExitType(0)
+      self.set_exit_type(0)
 
       # Refresh the widget field.
       self.drawField
 
       # Check if there is a pre-process function to be called.
       unless @pre_process_func.nil?
-        pp_return = @pre_process_func.call(:CALENDAR, self,
-            @pre_process_data, input)
+        pp_return = @pre_process_func.call(:calendar, self, @pre_process_data, char)
       end
 
       # Should we continue?
       if pp_return != 0
         # Check a predefined binding
-        if self.checkBind(:CALENDAR, input)
+        if self.checkBind(:calendar, char)
 
           ## FIXME What the heck? Missing method?
           #self.checkEarlyExit
 
           complete = true
+
         else
-          case input
+          case char
           when Ncurses::KEY_UP    then self.decrementCalendarDay 7
           when Ncurses::KEY_DOWN  then self.incrementCalendarDay 7
           when Ncurses::KEY_LEFT  then self.decrementCalendarDay 1
@@ -239,16 +353,17 @@ module RNDK
           when '-'.ord then self.decrementCalendarYear 1
           when '+'.ord then self.incrementCalendarYear 1
 
-          when Ncurses::KEY_HOME then self.setDate(-1, -1, -1)
+          when Ncurses::KEY_HOME
+            self.set_date(0, 0, 0)
 
           when RNDK::KEY_ESC
-            self.setExitType(input)
+            self.set_exit_type char
             complete = true
           when Ncurses::ERR
-            self.setExitType(input)
+            self.set_exit_type char
             complete = true
           when RNDK::KEY_TAB, RNDK::KEY_RETURN, Ncurses::KEY_ENTER
-            self.setExitType(input)
+            self.set_exit_type char
             ret = self.getCurrentTime
             complete = true
           when RNDK::REFRESH
@@ -259,12 +374,12 @@ module RNDK
 
         # Should we do a post-process?
         if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:CALENDAR, self, @post_process_data, input)
+          @post_process_func.call(:calendar, self, @post_process_data, char)
         end
       end
 
       if !complete
-        self.setExitType(0)
+        self.set_exit_type(0)
       end
 
       @result_data = ret
@@ -278,22 +393,21 @@ module RNDK
       self.move_specific(xplace, yplace, relative, refresh_flag, windows, [])
     end
 
-    # This draws the calendar widget.
-    def draw(box)
+    # Draws the Calendar Widget on the Screen.
+    #
+    # If `box` is true, it is drawn with a box.
+    def draw(box=false)
+
       header_len = @day_name.size
       col_len = (6 + header_len) / 7
 
       # Is there a shadow?
-      unless @shadow_win.nil?
-        Draw.drawShadow(@shadow_win)
-      end
+      Draw.drawShadow(@shadow_win) unless @shadow_win.nil?
 
       # Box the widget if asked.
-      if box
-        Draw.drawObjBox(@win, self)
-      end
+      Draw.drawObjBox(@win, self) if box
 
-      self.drawTitle(@win)
+      self.drawTitle @win
 
       # Draw in the day-of-the-week header.
       (0...7).each do |col|
@@ -312,11 +426,11 @@ module RNDK
       self.drawField
     end
 
-    # This draws the month field.
+    # Draws the month field.
     def drawField
       month_name = @month_name[@month]
-      month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
-      year_index = RNDK::CALENDAR.YEAR2INDEX(@year)
+      month_length = Calendar.days_in_month(@year, @month)
+      year_index = Calendar.global_year_index(@year)
       year_len = 0
       save_y = -1
       save_x = -1
@@ -370,70 +484,76 @@ module RNDK
       end
     end
 
-    # This sets multiple attributes of the widget
+    # Sets multiple attributes of the Widget.
+    #
+    # See Calendar#initialize.
     def set(day, month, year, day_attrib, month_attrib, year_attrib, highlight, box)
-      self.setDate(day, month, yar)
-      self.setDayAttribute(day_attrib)
-      self.setMonthAttribute(month_attrib)
-      self.setYearAttribute(year_attrib)
-      self.setHighlight(highlight)
-      self.setBox(box)
-    end
+      self.set_date(day, month, yar)
+      self.set_day_attrib(day_attrib)
+      self.set_month_attrib(month_attrib)
+      self.set_year_attrib(year_attrib)
+      self.set_highlight(highlight)
+      self.set_box(box)
+    end
+
+    # Sets the current date.
+    #
+    # @note If `day`, `month` or `year` are zero, we'll use
+    #       the current date for it.
+    #       If all of them are 0, will use the complete date
+    #       of today.
+    def set_date(day, month, year)
 
-    # This sets the date and some attributes.
-    def setDate(day, month, year)
       # Get the current dates and set the default values for the
       # day/month/year values for the calendar
       date_info = Time.new.gmtime
 
-      # Set the date elements if we need to.
-      @day = if day == -1 then date_info.day else day end
-      @month = if month == -1 then date_info.month else month end
-      @year = if year == -1 then date_info.year else year end
+      @day   = if day   == 0 then date_info.day   else day   end
+      @month = if month == 0 then date_info.month else month end
+      @year  = if year  == 0 then date_info.year  else year  end
 
-      # Verify the date information.
-      self.verifyCalendarDate
+      self.normalize_date
 
       # Get the start of the current month.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @week_day = Calendar.month_starting_weekday(@year, @month)
     end
 
-    # This returns the current date on the calendar.
-    def getDate(day, month, year)
-      day << @day
-      month << @month
-      year << @year
+    # Returns the current date the calendar is displaying.
+    #
+    # @return An array with `[day, month, year]` numbers.
+    def get_date
+      [@day, @month, @year]
     end
 
-    # This sets the attribute of the days in the calendar.
-    def setDayAttribute(attribute)
+    # Sets the appearance/color of the days.
+    def set_day_attrib attribute
       @day_attrib = attribute
     end
 
-    def getDayAttribute
+    def get_day_attrib
       return @day_attrib
     end
 
-    # This sets the attribute of the month names in the calendar.
-    def setMonthAttribute(attribute)
+    # Sets the appearance/color of the month name.
+    def set_month_attrib attribute
       @month_attrib = attribute
     end
 
-    def getMonthAttribute
+    def get_month_attrib
       return @month_attrib
     end
 
-    # This sets the attribute of the year in the calendar.
-    def setYearAttribute(attribute)
+    # Sets the appearance/color of the year number.
+    def set_year_attrib attribute
       @year_attrib = attribute
     end
 
-    def getYearAttribute
+    def get_year_attrib
       return @year_attrib
     end
 
-    # This sets the attribute of the highlight box.
-    def setHighlight(highlight)
+    # Sets the attribute/color of the highlight bar of the scrolling list.
+    def set_highlight highlight
       @highlight = highlight
     end
 
@@ -441,128 +561,110 @@ module RNDK
       return @highlight
     end
 
-    # This sets the background attribute of the widget.
-    def setBKattr(attrib)
+    # Sets the background attribute/color of the widget.
+    def set_bg_attrib attrib
       Ncurses.wbkgd(@win, attrib)
       Ncurses.wbkgd(@field_win, attrib)
       Ncurses.wbkgd(@label_win, attrib) unless @label_win.nil?
     end
 
-    # This erases the calendar widget.
+    # Erases the Calendar from the Screen.
+    # @note It does not destroy the widget.
     def erase
-      if self.validRNDKObject
-        RNDK.eraseCursesWindow @label_win
-        RNDK.eraseCursesWindow @field_win
-        RNDK.eraseCursesWindow @win
-        RNDK.eraseCursesWindow @shadow_win
-      end
+      return unless self.valid_widget?
+
+      RNDK.window_erase @label_win
+      RNDK.window_erase @field_win
+      RNDK.window_erase @win
+      RNDK.window_erase @shadow_win
     end
 
-    # This destroys the calendar
+    # Destroys all windows inside the Widget and
+    # removes it from the Screen.
     def destroy
       self.cleanTitle
 
-      RNDK.deleteCursesWindow @label_win
-      RNDK.deleteCursesWindow @field_win
-      RNDK.deleteCursesWindow @shadow_win
-      RNDK.deleteCursesWindow @win
+      RNDK.window_delete @label_win
+      RNDK.window_delete @field_win
+      RNDK.window_delete @shadow_win
+      RNDK.window_delete @win
 
-      # Clean the key bindings.
-      self.cleanBindings(:CALENDAR)
+      self.clean_bindings :calendar
 
-      # Unregister the object.
-      RNDK::Screen.unregister(:CALENDAR, self)
+      RNDK::Screen.unregister(:calendar, self)
     end
 
-    # This sets a marker on the calendar.
+    # Sets a marker on a specific date.
     def setMarker(day, month, year, marker)
-      year_index = RNDK::CALENDAR.YEAR2INDEX(year)
+      year_index = Calendar.global_year_index(year)
       oldmarker = self.getMarker(day, month, year)
 
       # Check to see if a marker has not already been set
       if oldmarker != 0
-        self.setCalendarCell(day, month, year_index,
-            oldmarker | Ncurses::A_BLINK)
+        self.setCalendarCell(day, month, year_index, oldmarker | Ncurses::A_BLINK)
       else
         self.setCalendarCell(day, month, year_index, marker)
       end
     end
 
+    # Returns the marker on a specific date.
     def getMarker(day, month, year)
       result = 0
-      year = RNDK::CALENDAR.YEAR2INDEX(year)
+      year = Calendar.global_year_index(year)
       if @marker != 0
         result = self.getCalendarCell(day, month, year)
       end
       return result
     end
 
-    # This sets a marker on the calendar.
+    # Removes a marker from the Calendar.
     def removeMarker(day, month, year)
-      year_index = RNDK::CALENDAR.YEAR2INDEX(year)
+      year_index = Calendar.global_year_index(year)
       self.setCalendarCell(day, month, year_index, 0)
     end
 
-    # THis function sets the month name.
+    # Sets the month name.
     def setMonthNames(months)
       (1...[months.size, @month_name.size].min).each do |x|
         @month_name[x] = months[x]
       end
     end
 
-    # This function sets the day's name
-    def setDaysNames(days)
+
+    # Sets the names of the days of the week.
+    #
+    # `days` is a String listing the 2-character
+    # abbreviations for the days.
+    #
+    # The default value is `"Su Mo Tu We Th Fr Sa"`
+    #
+    # "Su" (Sunday) is numbered zero internally, making it by default
+    # the first day of the week. Set the `week_base` member of the
+    # widget to select a different day.
+    #
+    # For example, Monday would be 1, Tuesday 2, etc.
+    #
+    def set_days_names days
       @day_name = days.clone
     end
 
-    # This makes sure that the dates provided exist.
-    def verifyCalendarDate
-      # Make sure the given year is not less than 1900.
-      if @year < 1900
-        @year = 1900
-      end
-
-      # Make sure the month is within range.
-      if @month > 12
-        @month = 12
-      end
-      if @month < 1
-        @month = 1
-      end
+    # Makes sure that the internal dates exist, capping
+    # the values if too big/small.
+    def normalize_date
+      @year  = 1900 if @year  < 1900
+      @month = 12   if @month > 12
+      @month = 1    if @month < 1
+      @day   = 1    if @day   < 1
 
       # Make sure the day given is within range of the month.
-      month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
-      if @day < 1
-        @day = 1
-      end
-      if @day > month_length
-        @day = month_length
-      end
-    end
+      month_length = Calendar.days_in_month(@year, @month)
 
-    # This returns what day of the week the month starts on.
-    def self.getMonthStartWeekday(year, month)
-      return Time.mktime(year, month, 1, 10, 0, 0).wday
-    end
-
-    # This function returns a 1 if it's a leap year and 0 if not.
-    def self.isLeapYear(year)
-      result = false
-      if year % 4 == 0
-        if year % 100 == 0
-          if year % 400 == 0
-            result = true
-          end
-        else
-          result = true
-        end
-      end
-      return result
+      @day = month_length if @day > month_length
     end
 
     # This increments the current day by the given value.
     def incrementCalendarDay(adjust)
-      month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
+      month_length = Calendar.days_in_month(@year, @month)
 
       # Make sure we adjust the day correctly.
       if adjust + @day > month_length
@@ -588,12 +690,12 @@ module RNDK
                 'Can not go past the year 1900'
             ]
             RNDK.beep
-            @screen.popupLabel(mesg, 2)
+            @screen.popup_label(mesg, 2)
             return
           end
-          month_length = RNDK::CALENDAR.getMonthLength(@year - 1, 12)
+          month_length = Calendar.days_in_month(@year - 1, 12)
         else
-          month_length = RNDK::CALENDAR.getMonthLength(@year, @month - 1)
+          month_length = Calendar.days_in_month(@year, @month - 1)
         end
 
         @day = month_length - (adjust - @day)
@@ -617,13 +719,13 @@ module RNDK
       end
 
       # Get the length of the current month.
-      month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
+      month_length = Calendar.days_in_month(@year, @month)
       if @day > month_length
         @day = month_length
       end
 
       # Get the start of the current month.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @week_day = Calendar.month_starting_weekday(@year, @month)
 
       # Redraw the calendar.
       self.erase
@@ -640,7 +742,7 @@ module RNDK
               'Can not go past the year 1900',
           ]
           RNDK.beep
-          @screen.popupLabel(mesg, 2)
+          @screen.popup_label(mesg, 2)
           return
         else
           @month = 13 - adjust
@@ -651,13 +753,13 @@ module RNDK
       end
 
       # Get the length of the current month.
-      month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
+      month_length = Calendar.days_in_month(@year, @month)
       if @day > month_length
         @day = month_length
       end
 
       # Get the start o the current month.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @week_day = Calendar.month_starting_weekday(@year, @month)
 
       # Redraw the calendar.
       self.erase
@@ -671,14 +773,14 @@ module RNDK
 
       # If we are in Feb make sure we don't trip into voidness.
       if @month == 2
-        month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
+        month_length = Calendar.days_in_month(@year, @month)
         if @day > month_length
           @day = month_length
         end
       end
 
       # Get the start of the current month.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @week_day = Calendar.month_starting_weekday(@year, @month)
 
       # Redraw the calendar.
       self.erase
@@ -694,7 +796,7 @@ module RNDK
             'Can not go past the year 1900',
         ]
         RNDK.beep
-        @screen.popupLabel(mesg, 2)
+        @screen.popup_label(mesg, 2)
         return
       end
 
@@ -703,34 +805,20 @@ module RNDK
 
       # If we are in Feb make sure we don't trip into voidness.
       if @month == 2
-        month_length = RNDK::CALENDAR.getMonthLength(@year, @month)
+        month_length = Calendar.days_in_month(@year, @month)
         if @day > month_length
           @day = month_length
         end
       end
 
       # Get the start of the current month.
-      @week_day = RNDK::CALENDAR.getMonthStartWeekday(@year, @month)
+      @week_day = Calendar.month_starting_weekday(@year, @month)
 
       # Redraw the calendar.
       self.erase
       self.draw(@box)
     end
 
-    # This returns the length of the current month.
-    def self.getMonthLength(year, month)
-      month_length = DAYS_OF_THE_MONTH[month]
-
-      if month == 2
-        month_length += if RNDK::CALENDAR.isLeapYear(year)
-                        then 1
-                        else 0
-                        end
-      end
-
-      return month_length
-    end
-
     # This returns what day of the week the month starts on.
     def getCurrentTime
       # Determine the current time and determine if we are in DST.
@@ -747,20 +835,25 @@ module RNDK
       self.draw(@box)
     end
 
-    def self.YEAR2INDEX(year)
-      if year >= 1900
-        year - 1900
-      else
-        year
-      end
-    end
-
+    # @see Widget#position
     def position
       super(@win)
     end
 
     def object_type
-      :CALENDAR
+      :calendar
     end
+
+    private
+
+    # Returns the internal widget `year` index.
+    # Minimum year is 1900.
+    def self.global_year_index year
+      return (year - 1900) if year >= 1900
+
+      year
+    end
+
   end
 end
+