rndk 0.2.0 → 1.0.0

data/lib/rndk/buttonbox.rb

@@ -1,14 +1,43 @@
 require 'rndk'
 
 module RNDK
-  class BUTTONBOX < Widget
+  class Buttonbox < Widget
     attr_reader :current_button
 
-    def initialize(rndkscreen, x_pos, y_pos, height, width, title, rows, cols,
-        buttons, button_count, highlight, box, shadow)
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
+      @widget_type = :buttonbox
+      @supported_signals += [:before_pressing, :pressed]
+
+      x            = 0
+      y            = 0
+      width        = 0
+      height       = 0
+      title        = "buttonbox"
+      buttons      = []
+      button_rows         = 0
+      button_cols         = 0
+      highlight    = RNDK::Color[:reverse]
+      box          = true
+      shadow       = false
+
+      config.each do |key, val|
+        x            = val if key == :x
+        y            = val if key == :y
+        width        = val if key == :width
+        height       = val if key == :height
+        title        = val if key == :title
+        button_rows         = val if key == :button_rows
+        button_cols         = val if key == :button_cols
+        buttons      = val if key == :buttons
+        highlight    = val if key == :highlight
+        box          = val if key == :box
+        shadow       = val if key == :shadow
+      end
+
+      button_count = buttons.size
+      parent_width = Ncurses.getmaxx(screen.window)
+      parent_height = Ncurses.getmaxy(screen.window)
       col_width = 0
       current_button = 0
       @button = []
@@ -28,12 +57,12 @@ module RNDK
       @col_adjust = 0
 
       # If the height is a negative value, the height will be
-      # ROWS-height, otherwise the height will be the given height.
-      box_height = RNDK.setWidgetDimension(parent_height, height, rows + 1)
+      # BUTTON_ROWS-height, otherwise the height will be the given height.
+      box_height = RNDK.set_widget_dimension(parent_height, height, button_rows + 1)
 
       # If the width is a negative value, the width will be
       # COLS-width, otherwise the width will be the given width.
-      box_width = RNDK.setWidgetDimension(parent_width, width, 0)
+      box_width = RNDK.set_widget_dimension(parent_width, width, 0)
 
       box_width = self.set_title(title, box_width)
 
@@ -45,11 +74,11 @@ module RNDK
       end
 
       # Set the button positions.
-      (0...cols).each do |x|
+      (0...button_cols).each do |x|
         max_col_width = -2**31
 
         # Look for the widest item in this column.
-        (0...rows).each do |y|
+        (0...button_rows).each do |y|
           if current_button < button_count
             max_col_width = [@button_len[current_button], max_col_width].max
             current_button += 1
@@ -67,37 +96,37 @@ module RNDK
       box_height = [box_height, parent_height].min
 
       # Now we have to readjust the x and y positions
-      xtmp = [x_pos]
-      ytmp = [y_pos]
-      RNDK.alignxy(rndkscreen.window, xtmp, ytmp, box_width, box_height)
+      xtmp = [x]
+      ytmp = [y]
+      RNDK.alignxy(screen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
       # Set up the buttonbox box attributes.
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @win = Ncurses.newwin(box_height, box_width, ypos, xpos)
       @shadow_win = nil
       @button_count = button_count
       @current_button = 0
-      @rows = rows
-      @cols = [button_count, cols].min
+      @button_rows = button_rows
+      @button_cols = [button_count, button_cols].min
       @box_height = box_height
       @box_width = box_width
       @highlight = highlight
       @accepts_focus = true
       @input_window = @win
       @shadow = shadow
-      @button_attrib = Ncurses::A_NORMAL
+      @button_color = RNDK::Color[:normal]
 
       # Set up the row adjustment.
-      if box_height - rows - @title_lines > 0
-        @row_adjust = (box_height - rows - @title_lines) / @rows
+      if box_height - button_rows - @title_lines > 0
+        @row_adjust = (box_height - button_rows - @title_lines) / @button_rows
       end
 
       # Set the col adjustment
       if box_width - col_width > 0
-        @col_adjust = ((box_width - col_width) / @cols) - 1
+        @col_adjust = ((box_width - col_width) / @button_cols) - 1
       end
 
       # If we couldn't create the window, we should return a null value.
@@ -114,17 +143,17 @@ module RNDK
       end
 
       # Register this baby.
-      rndkscreen.register(:BUTTONBOX, self)
+      screen.register(@widget_type, self)
     end
 
     # This activates the widget.
-    def activate(actions)
+    def activate(actions=[])
       # Draw the buttonbox box.
-      self.draw(@box)
+      self.draw
 
       if actions.nil? || actions.size == 0
         while true
-          input = self.getch([])
+          input = self.getch
 
           # Inject the characer into the widget.
           ret = self.inject(input)
@@ -148,39 +177,39 @@ module RNDK
     end
 
     # This injects a single character into the widget.
-    def inject(input)
+    def inject input
       first_button = 0
       last_button = @button_count - 1
-      pp_return = 1
-      ret = -1
+      pp_return = true
+      ret = false
       complete = false
 
       # Set the exit type
       self.set_exit_type(0)
 
-      unless @pre_process_func.nil?
-        pp_return = @pre_process_func.call(:BUTTONBOX, self,
-            @pre_process_data, input)
-      end
+      keep_going = self.run_signal_binding(:before_input, input)
 
       # Should we continue?
-      if pp_return != 0
+      if keep_going
+
         # Check for a key binding.
-        if self.checkBind(:BUTTONBOX, input)
-          complete = true
+        if self.is_bound? input
+          self.run_key_binding input
+          #complete = true
+
         else
           case input
           when Ncurses::KEY_LEFT, Ncurses::KEY_BTAB, Ncurses::KEY_BACKSPACE
-            if @current_button - @rows < first_button
+            if @current_button - @button_rows < first_button
               @current_button = last_button
             else
-              @current_button -= @rows
+              @current_button -= @button_rows
             end
           when Ncurses::KEY_RIGHT, RNDK::KEY_TAB, ' '.ord
-            if @current_button + @rows > last_button
+            if @current_button + @button_rows > last_button
               @current_button = first_button
             else
-              @current_button += @rows
+              @current_button += @button_rows
             end
           when Ncurses::KEY_UP
             if @current_button -1 < first_button
@@ -197,28 +226,32 @@ module RNDK
           when RNDK::REFRESH
             @screen.erase
             @screen.refresh
+
           when RNDK::KEY_ESC
             self.set_exit_type(input)
             complete = true
+
           when Ncurses::ERR
             self.set_exit_type(input)
             complete = true
+
           when RNDK::KEY_RETURN, Ncurses::KEY_ENTER
-            self.set_exit_type(input)
-            ret = @current_button
-            complete = true
-          end
-        end
+            keep_going = self.run_signal_binding(:before_pressing)
 
-        if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:BUTTONBOX, self, @post_process_data,
-              input)
+            if keep_going
+              self.run_signal_binding(:pressed)
+              self.set_exit_type input
+              ret = @current_button
+              complete = true
+            end
+          end
         end
 
+        self.run_signal_binding(:after_input) if not complete
       end
 
       unless complete
-        self.drawButtons
+        self.draw_buttons
         self.set_exit_type(0)
       end
 
@@ -242,12 +275,12 @@ module RNDK
     end
 
     # This sets th background attribute of the widget.
-    def set_bg_attrib(attrib)
+    def set_bg_color(attrib)
       Ncurses.wbkgd(@win, attrib)
     end
 
     # This draws the buttonbox box widget.
-    def draw(box)
+    def draw
       # Is there a shadow?
       unless @shadow_win.nil?
         Draw.drawShadow(@shadow_win)
@@ -259,56 +292,15 @@ module RNDK
       end
 
       # Draw in the title if there is one.
-      self.drawTitle @win
+      self.draw_title @win
 
       # Draw in the buttons.
-      self.drawButtons
-    end
-
-    # This draws the buttons on the button box widget.
-    def drawButtons
-      row = @title_lines + 1
-      col = @col_adjust / 2
-      current_button = 0
-      cur_row = -1
-      cur_col = -1
-
-      # Draw the buttons.
-      while current_button < @button_count
-        (0...@cols).each do |x|
-          row = @title_lines + @border_size
-
-          (0...@rows).each do |y|
-            attr = @button_attrib
-            if current_button == @current_button
-              attr = @highlight
-              cur_row = row
-              cur_col = col
-            end
-            Draw.writeChtypeAttrib(@win,
-                                   col,
-                                   row,
-                                   @button[current_button],
-                                   attr,
-                                   RNDK::HORIZONTAL,
-                                   0,
-                                   @button_len[current_button])
-            row += (1 + @row_adjust)
-            current_button += 1
-          end
-          col += @column_widths[x] + @col_adjust + @border_size
-        end
-      end
-
-      if cur_row >= 0 && cur_col >= 0
-        Ncurses.wmove(@win, cur_row, cur_col)
-      end
-      Ncurses.wrefresh @win
+      self.draw_buttons
     end
 
     # This erases the buttonbox box from the screen.
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase @win
         RNDK.window_erase @shadow_win
       end
@@ -316,14 +308,14 @@ module RNDK
 
     # This destroys the widget
     def destroy
-      self.cleanTitle
+      self.clean_title
 
       RNDK.window_delete @shadow_win
       RNDK.window_delete @win
 
-      self.clean_bindings(:BUTTONBOX)
+      self.clean_bindings
 
-      RNDK::Screen.unregister(:BUTTONBOX, self)
+      @screen.unregister self
     end
 
     def setCurrentButton(button)
@@ -341,19 +333,60 @@ module RNDK
     end
 
     def focus
-      self.draw(@box)
+      self.draw
     end
 
     def unfocus
-      self.draw(@box)
-    end
-
-    def object_type
-      :BUTTONBOX
+      self.draw
     end
 
     def position
       super(@win)
     end
+
+    protected
+
+    # This draws the buttons on the button box widget.
+    def draw_buttons
+      row = @title_lines + 1
+      col = @col_adjust / 2
+      current_button = 0
+      cur_row = -1
+      cur_col = -1
+
+      # Draw the buttons.
+      while current_button < @button_count
+        (0...@button_cols).each do |x|
+          row = @title_lines + @border_size
+
+          (0...@button_rows).each do |y|
+            attr = @button_color
+            if current_button == @current_button
+              attr = @highlight
+              cur_row = row
+              cur_col = col
+            end
+            Draw.writeChtypeAttrib(@win,
+                                   col,
+                                   row,
+                                   @button[current_button],
+                                   attr,
+                                   RNDK::HORIZONTAL,
+                                   0,
+                                   @button_len[current_button])
+            row += (1 + @row_adjust)
+            current_button += 1
+          end
+          col += @column_widths[x] + @col_adjust + @border_size
+        end
+      end
+
+      if cur_row >= 0 && cur_col >= 0
+        Ncurses.wmove(@win, cur_row, cur_col)
+      end
+      Ncurses.wrefresh @win
+    end
+
+
   end
 end

data/lib/rndk/calendar.rb

@@ -117,52 +117,66 @@ module RNDK
 
     # Creates a Calendar Widget.
     #
-    # * `xplace` is the x position - can be an integer or
+    # * `x` is the x position - can be an integer or
     #   `RNDK::LEFT`, `RNDK::RIGHT`, `RNDK::CENTER`.
-    # * `yplace` is the y position - can be an integer or
+    # * `y` is the y position - can be an integer or
     #   `RNDK::TOP`, `RNDK::BOTTOM`, `RNDK::CENTER`.
-    # * `day`, `month` and `year` are integers. I suggest
-    #   you to use Ruby's `Time.now.gmtime`.
+    # * `day`, `month` and `year` are integers on the
+    #   format `dd`, `mm`, `yyyy`.
     # * `title` can be more than one line - just split them
     #   with `\n`s.
-    # * `*_attrib` are specific colors.
+    # * `*_color` are specific colors.
     #
     # @note If `day`, `month` or `year` are zero, we'll use
-    #       the current date for it.
+    #       the current date for it (`Time.now.gmtime`).
     #       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)
+    def initialize(screen, config={})
       super()
+      @widget_type = :calendar
+      @supported_signals += [:before_input, :after_input]
+
+      # This is UGLY AS HELL
+      # But I don't have time to clean this up right now
+      # (lots of widgets, you know)  :(
+      x            = 0
+      y            = 0
+      title        = "calendar"
+      day          = 0
+      month        = 0
+      year         = 0
+      day_color   = 0
+      month_color = 0
+      year_color  = 0
+      highlight    = RNDK::Color[:reverse]
+      box          = true
+      shadow       = false
+
+      config.each do |key, val|
+        x            = val if key == :x
+        y            = val if key == :y
+        title        = val if key == :title
+        day          = val if key == :day
+        month        = val if key == :month
+        year         = val if key == :year
+        day_color    = val if key == :day_color
+        month_color  = val if key == :month_color
+        year_color   = val if key == :year_color
+        highlight    = val if key == :highlight
+        box          = val if key == :box
+        shadow       = val if key == :shadow
+      end
+
       self.set_date(day, month, year)
       self.set_box box
 
-      parent_width  = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
+      parent_width  = Ncurses.getmaxx(screen.window)
+      parent_height = Ncurses.getmaxy(screen.window)
 
       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,
-          RNDK::FORCHAR  => Ncurses::KEY_NPAGE,
-          'p'            => Ncurses::KEY_PPAGE,
-          RNDK::BACKCHAR => Ncurses::KEY_PPAGE,
-      }
 
       box_width   = self.set_title(title, box_width)
       box_height += @title_lines
@@ -173,9 +187,9 @@ module RNDK
       box_height = [box_height, parent_height].min
 
       # Rejustify the x and y positions if we need to.
-      xtmp = [xplace]
-      ytmp = [yplace]
-      RNDK.alignxy(rndkscreen.window, xtmp, ytmp, box_width, box_height)
+      xtmp = [x]
+      ytmp = [y]
+      RNDK.alignxy(screen.window, xtmp, ytmp, box_width, box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -198,8 +212,8 @@ module RNDK
       @day_name = dayname
 
       # Set the rest of the widget values.
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
 
       @xpos = xpos
       @ypos = ypos
@@ -208,9 +222,9 @@ module RNDK
       @box_width  = box_width
       @box_height = box_height
 
-      @day_attrib   = day_attrib
-      @month_attrib = month_attrib
-      @year_attrib  = year_attrib
+      @day_color   = day_color
+      @month_color = month_color
+      @year_color  = year_color
       @highlight    = highlight
 
       @accepts_focus = true
@@ -255,17 +269,16 @@ module RNDK
                                      xpos + 1)
       end
 
-      # Setup the key bindings.
-      bindings.each do |from, to|
-        self.bind(:calendar, from, :getc, to)
-      end
+      self.bind_key('t') { self.set_date(0, 0, 0)        }
+      self.bind_key('T') { self.set_date(0, 0, 0)        }
+      self.bind_key('n') { self.incrementCalendarMonth 1 }
+      self.bind_key('p') { self.decrementCalendarMonth 1 }
+      self.bind_key('N') { self.incrementCalendarMonth 6 }
+      self.bind_key('P') { self.decrementCalendarMonth 6 }
+      self.bind_key('-') { self.decrementCalendarYear 1  }
+      self.bind_key('+') { self.incrementCalendarYear 1  }
 
-      rndkscreen.register(:calendar, self)
-    end
-
-    # 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
+      screen.register(:calendar, self)
     end
 
     # Sets `d`/`m`/`y` cell to have `value`.
@@ -286,12 +299,12 @@ module RNDK
     # @return The date or `nil` if something bad happened.
     def activate(actions=[])
       ret = nil
-      self.draw @box
+      self.draw
 
       if actions.nil? || actions.size == 0
         # Interacting with the user
         loop do
-          input = self.getch([])
+          input = self.getch
 
           # Inject the character into the widget.
           ret = self.inject input
@@ -311,57 +324,53 @@ module RNDK
     end
 
     # @see Widget#inject
-    def inject char
-      pp_return = 1
+    def inject input
+      pp_return = true
       ret       = nil
       complete  = false
 
-      # Set the exit type
       self.set_exit_type(0)
-
-      # Refresh the widget field.
-      self.drawField
+      self.draw_field
 
       # 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, char)
-      end
+      keep_going = self.run_signal_binding(:before_input, input)
+
+      if keep_going
 
-      # Should we continue?
-      if pp_return != 0
         # Check a predefined binding
-        if self.checkBind(:calendar, char)
+        if self.is_bound? input
+          self.run_key_binding input
 
           ## FIXME What the heck? Missing method?
           #self.checkEarlyExit
 
-          complete = true
+          #complete = true
 
         else
-          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
-          when Ncurses::KEY_RIGHT then self.incrementCalendarDay 1
+          case input
+          when Ncurses::KEY_UP,    RNDK::PREV
+            self.decrementCalendarDay 7
+          when Ncurses::KEY_DOWN,  RNDK::NEXT
+            self.incrementCalendarDay 7
+          when Ncurses::KEY_LEFT,  RNDK::BACKCHAR
+            self.decrementCalendarDay 1
+          when Ncurses::KEY_RIGHT, RNDK::FORCHAR
+            self.incrementCalendarDay 1
           when Ncurses::KEY_NPAGE then self.incrementCalendarMonth 1
           when Ncurses::KEY_PPAGE then self.decrementCalendarMonth 1
-          when 'N'.ord then self.incrementCalendarMonth 6
-          when 'P'.ord then self.decrementCalendarMonth 6
-          when '-'.ord then self.decrementCalendarYear 1
-          when '+'.ord then self.incrementCalendarYear 1
 
           when Ncurses::KEY_HOME
             self.set_date(0, 0, 0)
 
           when RNDK::KEY_ESC
-            self.set_exit_type char
+            self.set_exit_type input
             complete = true
           when Ncurses::ERR
-            self.set_exit_type char
+            self.set_exit_type input
             complete = true
           when RNDK::KEY_TAB, RNDK::KEY_RETURN, Ncurses::KEY_ENTER
-            self.set_exit_type char
-            ret = self.getCurrentTime
+            self.set_exit_type input
+            ret = self.get_current_time
             complete = true
           when RNDK::REFRESH
             @screen.erase
@@ -370,9 +379,7 @@ module RNDK
         end
 
         # Should we do a post-process?
-        if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:calendar, self, @post_process_data, char)
-        end
+        self.run_signal_binding(:after_input) if not complete
       end
 
       if !complete
@@ -384,16 +391,16 @@ module RNDK
     end
 
     # @see Widget#move
-    def move(xplace, yplace, relative, refresh_flag)
+    def move(x, y, relative, refresh_flag)
       windows = [@win, @field_win, @label_win, @shadow_win]
 
-      self.move_specific(xplace, yplace, relative, refresh_flag, windows, [])
+      self.move_specific(x, y, relative, refresh_flag, windows, [])
     end
 
     # Draws the Widget on the Screen.
     #
     # If `box` is true, it is drawn with a box.
-    def draw(box=false)
+    def draw
 
       header_len = @day_name.size
       col_len = (6 + header_len) / 7
@@ -402,9 +409,9 @@ module RNDK
       Draw.drawShadow(@shadow_win) unless @shadow_win.nil?
 
       # Box the widget if asked.
-      Draw.drawObjBox(@win, self) if box
+      Draw.drawObjBox(@win, self) if @box
 
-      self.drawTitle @win
+      self.draw_title @win
 
       # Draw in the day-of-the-week header.
       (0...7).each do |col|
@@ -420,77 +427,51 @@ module RNDK
       end
 
       Ncurses.wrefresh @win
-      self.drawField
-    end
-
-    # Draws the month field.
-    def drawField
-      month_name = @month_name[@month]
-      month_length = Calendar.days_in_month(@year, @month)
-      year_index = Calendar.global_year_index(@year)
-      year_len = 0
-      save_y = -1
-      save_x = -1
-
-      day = (1 - @week_day + (@week_base % 7))
-      if day > 0
-        day -= 7
-      end
-
-      (1..6).each do |row|
-        (0...7).each do |col|
-          if day >= 1 && day <= month_length
-            xpos = col * 3
-            ypos = row
-
-            marker = @day_attrib
-            temp = '%02d' % day
-
-            if @day == day
-              marker = @highlight
-              save_y = ypos + Ncurses.getbegy(@field_win) - Ncurses.getbegy(@input_window)
-              save_x = 1
-            else
-              marker |= self.getMarker(day, @month, year_index)
-            end
-            Draw.writeCharAttrib(@field_win, xpos, ypos, temp, marker, RNDK::HORIZONTAL, 0, 2)
-          end
-          day += 1
-        end
-      end
-      Ncurses.wrefresh @field_win
-
-      # Draw the month in.
-      if !(@label_win.nil?)
-        temp = '%s %d,' % [month_name, @day]
-        Draw.writeChar(@label_win, 0, 0, temp, RNDK::HORIZONTAL, 0, temp.size)
-        Ncurses.wclrtoeol @label_win
-
-        # Draw the year in.
-        temp = '%d' % [@year]
-        year_len = temp.size
-        Draw.writeChar(@label_win, @field_width - year_len, 0, temp,
-            RNDK::HORIZONTAL, 0, year_len)
-
-        Ncurses.wmove(@label_win, 0, 0)
-        Ncurses.wrefresh @label_win
-
-      elsif save_y >= 0
-        Ncurses.wmove(@input_window, save_y, save_x)
-        Ncurses.wrefresh @input_window
-      end
+      self.draw_field
     end
 
     # Sets multiple attributes of the Widget.
     #
     # See Calendar#initialize.
-    def set(day, month, year, day_attrib, month_attrib, year_attrib, highlight, box)
-      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)
+    def set(config)
+      # This is UGLY AS HELL
+      # But I don't have time to clean this up right now
+      # (lots of widgets, you know)  :(
+      x            = 0
+      y            = 0
+      title        = "calendar"
+      day          = 0
+      month        = 0
+      year         = 0
+      day_color    = 0
+      month_color  = 0
+      year_color   = 0
+      highlight    = RNDK::Color[:reverse]
+      box          = false
+      shadow       = false
+
+      config.each do |key, val|
+        x            = val if key == :x
+        y            = val if key == :y
+        title        = val if key == :title
+        day          = val if key == :day
+        month        = val if key == :month
+        year         = val if key == :year
+        day_color    = val if key == :day_color
+        month_color  = val if key == :month_color
+        year_color   = val if key == :year_color
+        highlight    = val if key == :highlight
+        box          = val if key == :box
+        shadow       = val if key == :shadow
+      end
+
+      self.set_date(day, month, year)                if not day.zero? and month.zero? and year.zero?
+      self.set_day_color(day_color)                if not day_color.zero?
+      self.set_month_color(month_color)            if not month_color.zero?
+      self.set_year_color(year_color)              if not year_color.zero?
+      self.set_highlight(highlight)                  if highlight != RNDK::Color[:reverse]
+      self.set_box(box)                              if box
+      @box_width = self.set_title(title, @box_width) if title != "calendar"
     end
 
     # Sets the current date.
@@ -523,30 +504,30 @@ module RNDK
     end
 
     # Sets the appearance/color of the days.
-    def set_day_attrib attribute
-      @day_attrib = attribute
+    def set_day_color attribute
+      @day_color = attribute
     end
 
-    def get_day_attrib
-      return @day_attrib
+    def get_day_color
+      return @day_color
     end
 
     # Sets the appearance/color of the month name.
-    def set_month_attrib attribute
-      @month_attrib = attribute
+    def set_month_color attribute
+      @month_color = attribute
     end
 
-    def get_month_attrib
-      return @month_attrib
+    def get_month_color
+      return @month_color
     end
 
     # Sets the appearance/color of the year number.
-    def set_year_attrib attribute
-      @year_attrib = attribute
+    def set_year_color attribute
+      @year_color = attribute
     end
 
-    def get_year_attrib
-      return @year_attrib
+    def get_year_color
+      return @year_color
     end
 
     # Sets the attribute/color of the highlight bar of the scrolling list.
@@ -554,12 +535,12 @@ module RNDK
       @highlight = highlight
     end
 
-    def getHighlight
+    def get_highlight
       return @highlight
     end
 
     # Sets the background attribute/color of the widget.
-    def set_bg_attrib attrib
+    def set_bg_color attrib
       Ncurses.wbkgd(@win, attrib)
       Ncurses.wbkgd(@field_win, attrib)
       Ncurses.wbkgd(@label_win, attrib) unless @label_win.nil?
@@ -567,7 +548,7 @@ module RNDK
 
     # @see Widget#erase
     def erase
-      return unless self.valid_widget?
+      return unless self.valid?
 
       RNDK.window_erase @label_win
       RNDK.window_erase @field_win
@@ -577,26 +558,26 @@ module RNDK
 
     # @see Widget#destroy
     def destroy
-      self.cleanTitle
+      self.clean_title
 
       RNDK.window_delete @label_win
       RNDK.window_delete @field_win
       RNDK.window_delete @shadow_win
       RNDK.window_delete @win
 
-      self.clean_bindings :calendar
+      self.clean_bindings
 
-      RNDK::Screen.unregister(:calendar, self)
+      @screen.unregister self
     end
 
     # Sets a marker on a specific date.
-    def setMarker(day, month, year, marker)
+    def set_marker(day, month, year, marker)
       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 | RNDK::Color[:blink])
       else
         self.setCalendarCell(day, month, year_index, marker)
       end
@@ -609,7 +590,7 @@ module RNDK
       if @marker != 0
         result = self.getCalendarCell(day, month, year)
       end
-      return result
+      result
     end
 
     # Removes a marker from the Calendar.
@@ -625,7 +606,6 @@ module RNDK
       end
     end
 
-
     # Sets the names of the days of the week.
     #
     # `days` is a String listing the 2-character
@@ -646,17 +626,57 @@ module RNDK
     # Makes sure that the internal dates exist, capping
     # the values if too big/small.
     def normalize_date
+      max = 1900 + MAX_YEARS - 1
+      @year  = max if @year > max
+
       @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 = Calendar.days_in_month(@year, @month)
 
       @day = month_length if @day > month_length
     end
 
+    # This returns what day of the week the month starts on.
+    def get_current_time
+      # Determine the current time and determine if we are in DST.
+      return Time.mktime(@year, @month, @day, 0, 0, 0).gmtime
+    end
+
+    def focus
+      # Original: drawRNDKFscale(widget, ObjOf (widget)->box);
+      self.draw
+    end
+
+    def unfocus
+      # Original: drawRNDKFscale(widget, ObjOf (widget)->box);
+      self.draw
+    end
+
+    # @see Widget#position
+    def position
+      super(@win)
+    end
+
+    protected
+
+    # Returns the internal widget `year` index.
+    # Minimum year is 1900.
+    def self.global_year_index year
+      return (year - 1900) if year >= 1900
+
+      year
+    end
+
+    # 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
+
     # This increments the current day by the given value.
     def incrementCalendarDay(adjust)
       month_length = Calendar.days_in_month(@year, @month)
@@ -668,7 +688,7 @@ module RNDK
         self.incrementCalendarMonth(1)
       else
         @day += adjust
-        self.drawField
+        self.draw_field
       end
     end
 
@@ -699,7 +719,7 @@ module RNDK
         self.decrementCalendarMonth(1)
       else
         @day -= adjust
-        self.drawField
+        self.draw_field
       end
     end
 
@@ -724,7 +744,7 @@ module RNDK
 
       # Redraw the calendar.
       self.erase
-      self.draw(@box)
+      self.draw
     end
 
     # This decrements the current month by the given value.
@@ -758,7 +778,7 @@ module RNDK
 
       # Redraw the calendar.
       self.erase
-      self.draw(@box)
+      self.draw
     end
 
     # This increments the current year by the given value.
@@ -779,7 +799,7 @@ module RNDK
 
       # Redraw the calendar.
       self.erase
-      self.draw(@box)
+      self.draw
     end
 
     # This decrements the current year by the given value.
@@ -811,42 +831,65 @@ module RNDK
 
       # Redraw the calendar.
       self.erase
-      self.draw(@box)
+      self.draw
     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.
-      return Time.mktime(@year, @month, @day, 0, 0, 0).gmtime
-    end
+    # Draws the month field.
+    def draw_field
+      month_name = @month_name[@month]
+      month_length = Calendar.days_in_month(@year, @month)
+      year_index = Calendar.global_year_index(@year)
+      year_len = 0
+      save_y = -1
+      save_x = -1
 
-    def focus
-      # Original: drawRNDKFscale(widget, ObjOf (widget)->box);
-      self.draw(@box)
-    end
+      day = (1 - @week_day + (@week_base % 7))
+      if day > 0
+        day -= 7
+      end
 
-    def unfocus
-      # Original: drawRNDKFscale(widget, ObjOf (widget)->box);
-      self.draw(@box)
-    end
+      (1..6).each do |row|
+        (0...7).each do |col|
+          if day >= 1 && day <= month_length
+            xpos = col * 3
+            ypos = row
 
-    # @see Widget#position
-    def position
-      super(@win)
-    end
+            marker = @day_color
+            temp = '%02d' % day
 
-    def object_type
-      :calendar
-    end
+            if @day == day
+              marker = @highlight
+              save_y = ypos + Ncurses.getbegy(@field_win) - Ncurses.getbegy(@input_window)
+              save_x = 1
+            else
+              marker |= self.getMarker(day, @month, year_index)
+            end
+            Draw.writeCharAttrib(@field_win, xpos, ypos, temp, marker, RNDK::HORIZONTAL, 0, 2)
+          end
+          day += 1
+        end
+      end
+      Ncurses.wrefresh @field_win
 
-    private
+      # Draw the month in.
+      if !(@label_win.nil?)
+        temp = '%s %d,' % [month_name, @day]
+        Draw.writeChar(@label_win, 0, 0, temp, RNDK::HORIZONTAL, 0, temp.size)
+        Ncurses.wclrtoeol @label_win
 
-    # Returns the internal widget `year` index.
-    # Minimum year is 1900.
-    def self.global_year_index year
-      return (year - 1900) if year >= 1900
+        # Draw the year in.
+        temp = '%d' % [@year]
+        year_len = temp.size
+        Draw.writeChar(@label_win, @field_width - year_len, 0, temp,
+            RNDK::HORIZONTAL, 0, year_len)
 
-      year
+        Ncurses.wmove(@label_win, 0, 0)
+        Ncurses.wrefresh @label_win
+
+      elsif save_y >= 0
+        Ncurses.wmove(@input_window, save_y, save_x)
+        Ncurses.wrefresh @input_window
+      end
     end
 
   end