From b364affd0e83494aae311afdef3f6d1d21515ad2 Mon Sep 17 00:00:00 2001
From: Jason von Nieda <jason@vonnieda.org>
Date: Sat, 21 Jan 2012 12:02:35 -0800
Subject: [PATCH] Moved indexOf from RangeCharSet to CharSet. Added more
 documentation. Started work on IntegerInput.

---
 ScreenUi.cpp | 43 +++++++++++++++++++++++++++++++++----------
 ScreenUi.h   | 23 +++++++++++++++++++----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/ScreenUi.cpp b/ScreenUi.cpp
index 1fd1480..7ed03d5 100644
--- a/ScreenUi.cpp
+++ b/ScreenUi.cpp
@@ -452,6 +452,26 @@ bool Input::handleInputEvent(int x, int y, bool selected, bool cancelled) {
   return captured_;
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+// IntegerInput
+////////////////////////////////////////////////////////////////////////////////
+IntegerInput::IntegerInput(long value, unsigned char width, unsigned char base) : Input(NULL) {
+  signed_ = true;
+  base_ = base;
+  if (!width) {
+    // count the digits
+  }
+}
+
+IntegerInput::IntegerInput(unsigned long value, unsigned char width, unsigned char base) : Input(NULL) {
+  signed_ = false;
+  base_ = base;
+  if (!width) {
+    // count the digits
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ScrollContainer
 ////////////////////////////////////////////////////////////////////////////////
@@ -539,6 +559,19 @@ void ScrollContainer::paint(Screen *screen) {
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// CharSet
+////////////////////////////////////////////////////////////////////////////////
+
+int CharSet::indexOf(unsigned char ch) {
+  for (int i = 0; i < size(); i++) {
+    if (charAt(i) == ch) {
+      return i;
+    }
+  }
+  return -1;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // RangeCharSet
 ////////////////////////////////////////////////////////////////////////////////
@@ -559,16 +592,6 @@ RangeCharSet::~RangeCharSet() {
   free(ranges_);
 }
 
-// TODO: move to CharSet
-int RangeCharSet::indexOf(unsigned char ch) {
-  for (int i = 0; i < size(); i++) {
-    if (charAt(i) == ch) {
-      return i;
-    }
-  }
-  return -1;
-}
- 
 int RangeCharSet::charAt(int index) {
   // determine which range the index falls within by iterating the ranges
   // and then use that plus the index to determine the character
diff --git a/ScreenUi.h b/ScreenUi.h
index a476a0b..06a43e9 100644
--- a/ScreenUi.h
+++ b/ScreenUi.h
@@ -39,7 +39,7 @@ class CharSet {
     virtual bool contains(unsigned char ch) { return indexOf(ch) != -1; }
     // Returns the index in the character set for the given character.
     // Return -1 if the character is not part of the character set.
-    virtual int indexOf(unsigned char ch) = 0;
+    virtual int indexOf(unsigned char ch);
     // Returns the character at the given index for the character set.
     // Return -1 if the index is not within the range of the character set.
     virtual int charAt(int index) = 0;
@@ -54,7 +54,6 @@ class RangeCharSet : public CharSet {
   public:
     RangeCharSet(int rangeCount, ...);
     ~RangeCharSet();
-    virtual int indexOf(unsigned char ch);
     virtual int charAt(int index);
     virtual unsigned char size();
   private:
@@ -206,6 +205,7 @@ class Screen : public Container {
 class Label : public Component {
   public:
     Label(const char *text);
+    virtual const char *text() { return (const char *) text_; }
     virtual void setText(const char *text);
     virtual void paint(Screen *screen);
     #ifdef SCREENUI_DEBUG
@@ -292,12 +292,27 @@ class Input : public Label {
     CharSet *charSet_;
 };
 		
-// allows input of a floating point number.
+// A Component that accepts input of a floating or fixed point decimal
+// number. 
 class DecimalInput : public Input {
 };
 
-// allows input of an integer number with a certain base.
+// A Component that accepts input of an integer value with a given base.
 class IntegerInput : public Input {
+  public:
+    // Create a signed IntegerInput with the given value, width and base.
+    // If width is 0 the width will be determined by the number of digits in
+    // the incoming value, with one additional space for the negative. 
+    // If base is not specified, the default is base 10.
+    IntegerInput(long value, unsigned char width = 0, unsigned char base = 10);
+    // Create a signed IntegerInput with the given value, width and base.
+    // If width is 0 the width will be determined by the number of digits in
+    // the incoming value.
+    // If base is not specified, the default is base 10.
+    IntegerInput(unsigned long value, unsigned char width = 0, unsigned char base = 10);
+  private:
+    bool signed_;
+    unsigned char base_;
 };
 
 // Component that allows the user to enter a time with up to three fields