Jeck - Quick crashfix when loading without a profiles directory, slight keypad modifications.

projects/mtg/include/GameOptions.h

@@ -101,7 +101,7 @@ public:
   ~GameSettings();
   int save();
 
-  SimplePad * keypadStart(string input, string * _dest = NULL, int _x = SCREEN_WIDTH/2, int _y = SCREEN_HEIGHT/2);
+  SimplePad * keypadStart(string input, string * _dest = NULL, bool _cancel=true, bool _numpad=false, int _x = SCREEN_WIDTH/2, int _y = SCREEN_HEIGHT/2);
   string keypadFinish();
   void keypadShutdown();
   void keypadTitle(string set);

projects/mtg/include/SimplePad.h

@@ -40,7 +40,7 @@ public:
 
 
 
-  SimplePad(bool numbers=false);
+  SimplePad();
   ~SimplePad();
 
   int mX; int mY; 

projects/mtg/src/GameApp.cpp

@@ -95,7 +95,6 @@ void GameApp::Create()
   manaIcons[Constants::MTG_COLOR_GREEN] = GameApp::CommonRes->GetQuad("c_green");
   for (int i = sizeof(manaIcons)/sizeof(manaIcons[0]) - 1; i >= 0; --i) manaIcons[i]->SetHotSpot(16,16);
 
-
   CommonRes->CreateTexture("sets/back.jpg");
   CommonRes->CreateQuad("back", "sets/back.jpg", 0, 0, 200, 285);
   CommonRes->GetQuad("back")->SetHotSpot(100, 145);

projects/mtg/src/GameOptions.cpp

@@ -282,6 +282,7 @@ string GameSettings::themeGraphic(string filename)
 {
   char buf[4096];
   string theme = (*this)[Options::ACTIVE_THEME].str;
+
   if(theme == "" || theme == "default"){
     sprintf(buf,"graphics/%s",filename.c_str());
     return buf;
@@ -304,6 +305,8 @@ void GameSettings::checkProfile(){
     if(profileOptions != NULL)
       SAFE_DELETE(profileOptions);
 
+    //Force our directories to exist.
+    MAKEDIR(RESPATH"/profiles");
     string temp = profileFile("","",false,false);
     MAKEDIR(temp.c_str()); 
     temp+="/stats";
@@ -394,9 +397,11 @@ void GameSettings::keypadTitle(string set){
   if(keypad != NULL)
     keypad->title = set;
 }
-SimplePad * GameSettings::keypadStart(string input, string * _dest,int _x,int _y){
+SimplePad * GameSettings::keypadStart(string input, string * _dest,bool _cancel, bool _numpad, int _x,int _y ){
   if(keypad == NULL)
     keypad = new SimplePad();
+  keypad->bShowCancel = _cancel;
+  keypad->bShowNumpad = _numpad;
   keypad->mX = _x;
   keypad->mY = _y;
   keypad->Start(input,_dest);

projects/mtg/src/OptionItem.cpp

@@ -331,6 +331,9 @@ void OptionDirectory::Reload(){
   char buf[4096];
   mDip = opendir(root.c_str());
 
+  if(!mDip)
+    return;
+
   while ((mDit = readdir(mDip))){
     if(mDit->d_name[0] != '.'){    
       sprintf(buf,"%s/%s",root.c_str(),mDit->d_name);
@@ -356,6 +359,9 @@ OptionDirectory::OptionDirectory(string _root, string _id, string _displayValue)
   root = _root;
   mDip = opendir(root.c_str());
 
+  if(!mDip)
+    return;
+
   while ((mDit = readdir(mDip))){
     if(mDit->d_name[0] != '.'){    
       sprintf(buf,"%s/%s",root.c_str(),mDit->d_name);

projects/mtg/src/SimplePad.cpp

@@ -1,349 +1,349 @@
-#include "../include/config.h"
-#include "../include/SimplePad.h"
-#include "JTypes.h"
-#include "../include/GameApp.h"
-#include "../include/Translate.h"
-
-
-#define ALPHA_COLUMNS 8
-#define ALPHA_ROWS 8
-
-#define KPD_UP 0
-#define KPD_DOWN 1
-#define KPD_LEFT 2
-#define KPD_RIGHT 3
-
-SimpleKey::SimpleKey( string _ds, int _id){
-  displayValue = _ds; id = _id; 
-  for(int x=0;x<4;x++) 
-    adjacency[4] = KPD_NOWHERE;
-}
-
-void SimplePad::linkKeys(int from, int to, int dir){
-
-  if(keys[from] && keys[to]){
-  keys[from]->adjacency[dir] = to;
-  switch(dir){
-    case KPD_UP:
-    case KPD_LEFT:
-      dir++;
-      break;
-    default:
-      dir--;
-  }
-  keys[to]->adjacency[dir] = from;
-  }
-}
-
-SimplePad::SimplePad(bool numbers){
-  nbitems = 0;
-  bActive = false;
-  selected = 0;
-  priorKey = 0;
-  cursor = 0;
-  bShowCancel = false;
-  bShowNumpad = false;
-  bCapslock = true;
-  char buf[2];
-  buf[1] = '\0';
-  SimpleKey * k;
-
-  for(int x=0;x<KPD_MAX;x++)
-    keys[x] = NULL;
-
-  //Add the alphabet. We cheat a bit here.
-  for(int x='a';x<='z';x++)
-  {
-    buf[0] = x;
-    k=Add(buf,x);
-    int idx = x-'a';
-
-    if(idx > KPD_A)
-      k->adjacency[KPD_LEFT] = idx-1;
-    if(idx < KPD_Z)
-      k->adjacency[KPD_RIGHT] = idx+1;
-    if(idx > ALPHA_COLUMNS)
-      k->adjacency[KPD_UP] = idx-1-ALPHA_COLUMNS;
-    else 
-      k->adjacency[KPD_UP] = KPD_INPUT;
-    if(idx < 25-ALPHA_COLUMNS)
-      k->adjacency[KPD_DOWN] = idx+1+ALPHA_COLUMNS;
+#include "../include/config.h"
+#include "../include/SimplePad.h"
+#include "JTypes.h"
+#include "../include/GameApp.h"
+#include "../include/Translate.h"
+
+
+#define ALPHA_COLUMNS 8
+#define ALPHA_ROWS 8
+
+#define KPD_UP 0
+#define KPD_DOWN 1
+#define KPD_LEFT 2
+#define KPD_RIGHT 3
+
+SimpleKey::SimpleKey( string _ds, int _id){
+  displayValue = _ds; id = _id; 
+  for(int x=0;x<4;x++) 
+    adjacency[4] = KPD_NOWHERE;
+}
+
+void SimplePad::linkKeys(int from, int to, int dir){
+
+  if(keys[from] && keys[to]){
+  keys[from]->adjacency[dir] = to;
+  switch(dir){
+    case KPD_UP:
+    case KPD_LEFT:
+      dir++;
+      break;
+    default:
+      dir--;
   }
-
-  Add("Spacebar",KPD_SPACE);
-  
-  for(int x=25-ALPHA_COLUMNS;x<26;x++)
-    keys[x]->adjacency[KPD_DOWN] = KPD_SPACE;
-
-  k=Add("Confirm",KPD_OK);
-  keys[KPD_Z]->adjacency[KPD_RIGHT] = KPD_OK;
-  k->adjacency[KPD_UP] = KPD_CAPS;
-  k->adjacency[KPD_LEFT] = KPD_Z;
-  k->adjacency[KPD_DOWN] = KPD_CANCEL;
-
-  k=Add("Cancel",KPD_CANCEL);
-  k->adjacency[KPD_UP] = KPD_OK;
-  k->adjacency[KPD_LEFT] = KPD_SPACE;
-
-  k=Add("Del",KPD_DEL);
-  keys[KPD_I]->adjacency[KPD_RIGHT] = KPD_DEL;   
-  k->adjacency[KPD_UP] = KPD_9;
-  k->adjacency[KPD_DOWN] = KPD_CAPS;
-  k->adjacency[KPD_LEFT] = KPD_I;
-  
-  k=Add("Caps",KPD_CAPS);
-  keys[KPD_R]->adjacency[KPD_RIGHT] = KPD_CAPS;
-  keys[KPD_R]->adjacency[KPD_DOWN] = KPD_Z; 
-  k->adjacency[KPD_UP] = KPD_DEL;
-  k->adjacency[KPD_DOWN] = KPD_OK;
-  k->adjacency[KPD_LEFT] = KPD_R;
-
-
-  for(int x=0;x<10;x++){
-    buf[0] = '0'+x;
-    Add(buf,KPD_0+x);
-    if(x < 8)
-      linkKeys(KPD_0+x,KPD_A+x,KPD_DOWN);
-    if(x > 0)
-      linkKeys(KPD_0+x,KPD_0+x-1,KPD_LEFT);
-  }
-
-  keys[KPD_8]->adjacency[KPD_DOWN] = KPD_DEL;
-  keys[KPD_9]->adjacency[KPD_DOWN] = KPD_DEL;
-
-  keys[KPD_0]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
-  keys[KPD_A]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
-  keys[KPD_J]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
-  keys[KPD_S]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
-
-}
-
-SimplePad::~SimplePad()
-{
-  for(int x=0;x<KPD_MAX;x++)
-    SAFE_DELETE(keys[x]);
-}
-
-
-SimpleKey * SimplePad::Add(string display, unsigned char id){
-  if(nbitems >= KPD_MAX)
-    return NULL;
-
-  keys[nbitems++] = NEW SimpleKey(display,id);
-  return keys[nbitems-1];
-}
-void SimplePad::pressKey(unsigned char key){
-  string input = "";
-  int tCursor = cursor;
-
-  if(isalpha(key))  {
-    if(bCapslock)
-      input += toupper(key);
-    else
-      input += key;
-    
-    if(cursor < 0 || cursor > buffer.size())
-      tCursor = buffer.size();
-    else
-      cursor++;
-    buffer.insert(tCursor,input);
-  }
-  else if(key == KPD_CAPS)
-    bCapslock = !bCapslock;
-  else if(key == KPD_DEL) {
-     if(cursor < 0 || cursor > buffer.size())
-      cursor = buffer.size();
-     if(cursor == buffer.size())
-      buffer = buffer.substr(0,cursor-1);
-     else if(cursor > 0)
-      buffer = buffer.substr(0,cursor) + buffer.substr(cursor+1);
-     else 
-       return;
-
-     cursor--;
-  }
-  else if(key == KPD_OK) 
-    Finish();
-  else if(key == KPD_CANCEL) {
-    bCanceled = true;
-    Finish();
-  }
-
-}
-void SimplePad::MoveSelection(unsigned char moveto)
-{
-  if(!bShowNumpad && moveto >= KPD_0 && moveto <= KPD_9 )
-    moveto = KPD_INPUT;
-  else if(!bShowCancel && moveto == KPD_CANCEL )
-    moveto = KPD_SPACE;
-  
-  if(selected < KPD_MAX && selected >= 0) 
-    priorKey = selected;
-
-  if(moveto < KPD_MAX && moveto >= 0) {
-    selected = moveto;
-  }
-  else if(moveto == KPD_INPUT)
-    selected = KPD_INPUT;
-}
-
+  keys[to]->adjacency[dir] = from;
+  }
+}
+
+SimplePad::SimplePad(){
+  nbitems = 0;
+  bActive = false;
+  selected = 0;
+  priorKey = 0;
+  cursor = 0;
+  bShowCancel = false;
+  bShowNumpad = false;
+  bCapslock = true;
+  char buf[2];
+  buf[1] = '\0';
+  SimpleKey * k;
+
+  for(int x=0;x<KPD_MAX;x++)
+    keys[x] = NULL;
+
+  //Add the alphabet. We cheat a bit here.
+  for(int x='a';x<='z';x++)
+  {
+    buf[0] = x;
+    k=Add(buf,x);
+    int idx = x-'a';
+
+    if(idx > KPD_A)
+      k->adjacency[KPD_LEFT] = idx-1;
+    if(idx < KPD_Z)
+      k->adjacency[KPD_RIGHT] = idx+1;
+    if(idx > ALPHA_COLUMNS)
+      k->adjacency[KPD_UP] = idx-1-ALPHA_COLUMNS;
+    else 
+      k->adjacency[KPD_UP] = KPD_INPUT;
+    if(idx < 25-ALPHA_COLUMNS)
+      k->adjacency[KPD_DOWN] = idx+1+ALPHA_COLUMNS;
+  }
+
+  Add("Spacebar",KPD_SPACE);
+  
+  for(int x=25-ALPHA_COLUMNS;x<26;x++)
+    keys[x]->adjacency[KPD_DOWN] = KPD_SPACE;
+
+  k=Add("Confirm",KPD_OK);
+  keys[KPD_Z]->adjacency[KPD_RIGHT] = KPD_OK;
+  k->adjacency[KPD_UP] = KPD_CAPS;
+  k->adjacency[KPD_LEFT] = KPD_Z;
+  k->adjacency[KPD_DOWN] = KPD_CANCEL;
+
+  k=Add("Cancel",KPD_CANCEL);
+  k->adjacency[KPD_UP] = KPD_OK;
+  k->adjacency[KPD_LEFT] = KPD_SPACE;
+
+  k=Add("Del",KPD_DEL);
+  keys[KPD_I]->adjacency[KPD_RIGHT] = KPD_DEL;   
+  k->adjacency[KPD_UP] = KPD_9;
+  k->adjacency[KPD_DOWN] = KPD_CAPS;
+  k->adjacency[KPD_LEFT] = KPD_I;
+  
+  k=Add("Caps",KPD_CAPS);
+  keys[KPD_R]->adjacency[KPD_RIGHT] = KPD_CAPS;
+  keys[KPD_R]->adjacency[KPD_DOWN] = KPD_Z; 
+  k->adjacency[KPD_UP] = KPD_DEL;
+  k->adjacency[KPD_DOWN] = KPD_OK;
+  k->adjacency[KPD_LEFT] = KPD_R;
+
+
+  for(int x=0;x<10;x++){
+    buf[0] = '0'+x;
+    Add(buf,KPD_0+x);
+    if(x < 8)
+      linkKeys(KPD_0+x,KPD_A+x,KPD_DOWN);
+    if(x > 0)
+      linkKeys(KPD_0+x,KPD_0+x-1,KPD_LEFT);
+  }
+
+  keys[KPD_8]->adjacency[KPD_DOWN] = KPD_DEL;
+  keys[KPD_9]->adjacency[KPD_DOWN] = KPD_DEL;
+
+  keys[KPD_0]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
+  keys[KPD_A]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
+  keys[KPD_J]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
+  keys[KPD_S]->adjacency[KPD_LEFT] = KPD_NOWHERE;   
+
+}
+
+SimplePad::~SimplePad()
+{
+  for(int x=0;x<KPD_MAX;x++)
+    SAFE_DELETE(keys[x]);
+}
+
+
+SimpleKey * SimplePad::Add(string display, unsigned char id){
+  if(nbitems >= KPD_MAX)
+    return NULL;
+
+  keys[nbitems++] = NEW SimpleKey(display,id);
+  return keys[nbitems-1];
+}
+void SimplePad::pressKey(unsigned char key){
+  string input = "";
+  int tCursor = cursor;
+
+  if(isalpha(key))  {
+    if(bCapslock)
+      input += toupper(key);
+    else
+      input += key;
+    
+    if(cursor < 0 || cursor > buffer.size())
+      tCursor = buffer.size();
+    else
+      cursor++;
+    buffer.insert(tCursor,input);
+  }
+  else if(key == KPD_CAPS)
+    bCapslock = !bCapslock;
+  else if(key == KPD_DEL) {
+     if(cursor < 0 || cursor > buffer.size())
+      cursor = buffer.size();
+     if(cursor == buffer.size())
+      buffer = buffer.substr(0,cursor-1);
+     else if(cursor > 0)
+      buffer = buffer.substr(0,cursor) + buffer.substr(cursor+1);
+     else 
+       return;
+
+     cursor--;
+  }
+  else if(key == KPD_OK) 
+    Finish();
+  else if(key == KPD_CANCEL) {
+    bCanceled = true;
+    Finish();
+  }
+
+}
+void SimplePad::MoveSelection(unsigned char moveto)
+{
+  if(!bShowNumpad && moveto >= KPD_0 && moveto <= KPD_9 )
+    moveto = KPD_INPUT;
+  else if(!bShowCancel && moveto == KPD_CANCEL )
+    moveto = KPD_SPACE;
+  
+  if(selected < KPD_MAX && selected >= 0) 
+    priorKey = selected;
+
+  if(moveto < KPD_MAX && moveto >= 0) {
+    selected = moveto;
+  }
+  else if(moveto == KPD_INPUT)
+    selected = KPD_INPUT;
+}
+
 void SimplePad::Update(float dt){
   JGE * mEngine = JGE::GetInstance();
-  
-  //We can always confirm!
-  if(mEngine->GetButtonClick(PSP_CTRL_START))
-  {
-    if(selected != KPD_OK)
-      selected = KPD_OK;
-    else
-      Finish();
-    return;
-  }
-
-  if(selected == KPD_SPACE){
-    if(bShowCancel && mEngine->GetButtonClick(PSP_CTRL_RIGHT))
-      selected = KPD_CANCEL;
-    else if (mEngine->GetButtonClick(PSP_CTRL_LEFT)||mEngine->GetButtonClick(PSP_CTRL_RIGHT)
-      ||mEngine->GetButtonClick(PSP_CTRL_UP)||mEngine->GetButtonClick(PSP_CTRL_DOWN))
-      selected = priorKey;
-  } //Moving in/from the text field.
-  else if(selected == KPD_INPUT){
-    if (mEngine->GetButtonClick(PSP_CTRL_DOWN) )
-      selected = priorKey;
-    if (mEngine->GetButtonClick(PSP_CTRL_LEFT) && cursor > -1){
-      if(cursor > buffer.size())
-        cursor = buffer.size() - 1;
-      else
-        cursor--;
-    }
-    else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT))
-      if(cursor < buffer.size())
-        cursor++;
-      else
-        cursor = buffer.size() + 1;
-  }
-  else if(selected >= 0 && keys[selected]){
-    if (mEngine->GetButtonClick(PSP_CTRL_LEFT))
-      MoveSelection(keys[selected]->adjacency[KPD_LEFT]);
-    else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT))
-      MoveSelection(keys[selected]->adjacency[KPD_RIGHT]);
-    if (mEngine->GetButtonClick(PSP_CTRL_DOWN))
-      MoveSelection(keys[selected]->adjacency[KPD_DOWN]);
-    else if (mEngine->GetButtonClick(PSP_CTRL_UP))
-      MoveSelection(keys[selected]->adjacency[KPD_UP]);
-  }
- 
-
-  //These bits require a valid key...
-  if(selected >= 0 && selected < nbitems && keys[selected]){
-  if (mEngine->GetButtonClick(PSP_CTRL_CIRCLE))
-    pressKey(keys[selected]->id);
-  }
-  if (mEngine->GetButtonClick(PSP_CTRL_CROSS) && buffer.size() > 0)
-    buffer = buffer.substr(0,buffer.size() - 1);
-  if (mEngine->GetButtonClick(PSP_CTRL_LTRIGGER)){
-    if(buffer.size() != 0 && cursor != 0)
-      if(cursor < 0 || cursor >= buffer.size())
-        cursor = buffer.size() - 1;
-      else
-        cursor--;
-  }
-  else if (mEngine->GetButtonClick(PSP_CTRL_RTRIGGER)){
-    if(cursor > -1 && cursor < buffer.size())
-        cursor++;
-    else{
-      buffer += ' ';
-      cursor = buffer.size();
-    }
-  }
-
-  mX = 50;
-  mY = 50;
-
-}
+  
+  //We can always confirm!
+  if(mEngine->GetButtonClick(PSP_CTRL_START))
+  {
+    if(selected != KPD_OK)
+      selected = KPD_OK;
+    else
+      Finish();
+    return;
+  }
+
+  if(selected == KPD_SPACE){
+    if(bShowCancel && mEngine->GetButtonClick(PSP_CTRL_RIGHT))
+      selected = KPD_CANCEL;
+    else if (mEngine->GetButtonClick(PSP_CTRL_LEFT)||mEngine->GetButtonClick(PSP_CTRL_RIGHT)
+      ||mEngine->GetButtonClick(PSP_CTRL_UP)||mEngine->GetButtonClick(PSP_CTRL_DOWN))
+      selected = priorKey;
+  } //Moving in/from the text field.
+  else if(selected == KPD_INPUT){
+    if (mEngine->GetButtonClick(PSP_CTRL_DOWN) )
+      selected = priorKey;
+    if (mEngine->GetButtonClick(PSP_CTRL_LEFT) && cursor > -1){
+      if(cursor > buffer.size())
+        cursor = buffer.size() - 1;
+      else
+        cursor--;
+    }
+    else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT))
+      if(cursor < buffer.size())
+        cursor++;
+      else
+        cursor = buffer.size() + 1;
+  }
+  else if(selected >= 0 && keys[selected]){
+    if (mEngine->GetButtonClick(PSP_CTRL_LEFT))
+      MoveSelection(keys[selected]->adjacency[KPD_LEFT]);
+    else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT))
+      MoveSelection(keys[selected]->adjacency[KPD_RIGHT]);
+    if (mEngine->GetButtonClick(PSP_CTRL_DOWN))
+      MoveSelection(keys[selected]->adjacency[KPD_DOWN]);
+    else if (mEngine->GetButtonClick(PSP_CTRL_UP))
+      MoveSelection(keys[selected]->adjacency[KPD_UP]);
+  }
+ 
+
+  //These bits require a valid key...
+  if(selected >= 0 && selected < nbitems && keys[selected]){
+  if (mEngine->GetButtonClick(PSP_CTRL_CIRCLE))
+    pressKey(keys[selected]->id);
+  }
+  if (mEngine->GetButtonClick(PSP_CTRL_CROSS) && buffer.size() > 0)
+    buffer = buffer.substr(0,buffer.size() - 1);
+  if (mEngine->GetButtonClick(PSP_CTRL_LTRIGGER)){
+    if(buffer.size() != 0 && cursor != 0)
+      if(cursor < 0 || cursor >= buffer.size())
+        cursor = buffer.size() - 1;
+      else
+        cursor--;
+  }
+  else if (mEngine->GetButtonClick(PSP_CTRL_RTRIGGER)){
+    if(cursor > -1 && cursor < buffer.size())
+        cursor++;
+    else{
+      buffer += ' ';
+      cursor = buffer.size();
+    }
+  }
+
+  mX = 50;
+  mY = 50;
+
+}
 void SimplePad::Start(string value, string * _dest) {
   bActive = true;
   bCanceled=false;
   buffer = value;
   original = buffer;
-  dest = _dest;
+  dest = _dest;
   cursor = buffer.size();
 }
 
-string SimplePad::Finish() {
-  bActive = false;
-  if(bCanceled){
-    dest = NULL;
-    return original;
-  }
-  if(dest != NULL){
-    dest->clear(); dest->insert(0,buffer);
-    dest = NULL;
-  }
-  return buffer;
-}
-
-void SimplePad::Render(){
-  //This could use some cleaning up to make margins more explicit
-  JLBFont * mFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
-
+string SimplePad::Finish() {
+  bActive = false;
+  if(bCanceled){
+    dest = NULL;
+    return original;
+  }
+  if(dest != NULL){
+    dest->clear(); dest->insert(0,buffer);
+    dest = NULL;
+  }
+  return buffer;
+}
+
+void SimplePad::Render(){
+  //This could use some cleaning up to make margins more explicit
+  JLBFont * mFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
+
   int offX = 0, offY = 0;   
   int kH = mFont->GetHeight();
   int hSpacing = mFont->GetStringWidth("W");
   int vSpacing = 0;
   int kW = hSpacing;
   
-  JRenderer * renderer = JRenderer::GetInstance();
-
-  
-  if(title != "")
-    vSpacing = kH+8;
-  else
-    vSpacing = 0;
-
-  offY = vSpacing;
-  if(bShowNumpad)
-  offY += kH+14;
-  //Draw Keypad Background.
-  renderer->FillRoundRect(mX-kW,mY-kH,(kW+12)*11,(kH+14)*5+offY,2,options[Metrics::POPUP_MENU_FC].asColor(ARGB(180,0,0,0)));
-  offY = vSpacing;
-  //Draw text entry bubble
-  renderer->FillRoundRect(mX-kW/2,mY+offY,(kW+12)*9+kW/2,kH,2,options[Metrics::KEYPAD_FCH].asColor(ARGB(255,255,255,255)));
-
-  //Draw text-entry title, if we've got one.
-  if(title != ""){
-    mFont->DrawString(title.c_str(),mX,mY);
-    mY+=kH+12;
-  }
-
-  //Draw cursor.
-  int cPos = cursor;
-  if(cPos > -1 && cPos < buffer.size())
-  {
-    kW = mFont->GetStringWidth(buffer.substr(cPos,1).c_str());
-    renderer->FillRoundRect(mX+mFont->GetStringWidth(buffer.substr(0,cPos).c_str()),mY+kH-4,
-      kW,4,2,options[Metrics::KEY_FCH].asColor(ARGB(150,150,150,0)));    
-  }
-  else
-  {
-    cPos = buffer.size();
-    renderer->FillRoundRect(mX+mFont->GetStringWidth(buffer.substr(0,cPos).c_str()),mY+kH-4,
-      kW,4,2,options[Metrics::KEY_FCH].asColor(ARGB(150,150,150,0)));    
-  }
-  
-  mFont->SetColor(options[Metrics::KEYPAD_TC].asColor(ARGB(255,0,0,0)));
-  mFont->DrawString(buffer.c_str(),mX,mY);
-  offY += kH + 12;
-
-  int rowLen[4];
-  if(!bShowNumpad)
-    vSpacing -= kH + 12;
-    
-  for(int x=0;x<nbitems;x++)
-    if(keys[x]){   
-
-      if((x == KPD_CANCEL && !bShowCancel) || (x >= KPD_0 && x <= KPD_9 && !bShowNumpad))
-        continue;
+  JRenderer * renderer = JRenderer::GetInstance();
+
+  
+  if(title != "")
+    vSpacing = kH+8;
+  else
+    vSpacing = 0;
+
+  offY = vSpacing;
+  if(bShowNumpad)
+  offY += kH+14;
+  //Draw Keypad Background.
+  renderer->FillRoundRect(mX-kW,mY-kH,(kW+12)*11,(kH+14)*5+offY,2,options[Metrics::POPUP_MENU_FC].asColor(ARGB(180,0,0,0)));
+  offY = vSpacing;
+  //Draw text entry bubble
+  renderer->FillRoundRect(mX-kW/2,mY+offY,(kW+12)*9+kW/2,kH,2,options[Metrics::KEYPAD_FCH].asColor(ARGB(255,255,255,255)));
+
+  //Draw text-entry title, if we've got one.
+  if(title != ""){
+    mFont->DrawString(title.c_str(),mX,mY);
+    mY+=kH+12;
+  }
+
+  //Draw cursor.
+  int cPos = cursor;
+  if(cPos > -1 && cPos < buffer.size())
+  {
+    kW = mFont->GetStringWidth(buffer.substr(cPos,1).c_str());
+    renderer->FillRoundRect(mX+mFont->GetStringWidth(buffer.substr(0,cPos).c_str()),mY+kH-4,
+      kW,4,2,options[Metrics::KEY_FCH].asColor(ARGB(150,150,150,0)));    
+  }
+  else
+  {
+    cPos = buffer.size();
+    renderer->FillRoundRect(mX+mFont->GetStringWidth(buffer.substr(0,cPos).c_str()),mY+kH-4,
+      kW,4,2,options[Metrics::KEY_FCH].asColor(ARGB(150,150,150,0)));    
+  }
+  
+  mFont->SetColor(options[Metrics::KEYPAD_TC].asColor(ARGB(255,0,0,0)));
+  mFont->DrawString(buffer.c_str(),mX,mY);
+  offY += kH + 12;
+
+  int rowLen[4];
+  if(!bShowNumpad)
+    vSpacing -= kH + 12;
+    
+  for(int x=0;x<nbitems;x++)
+    if(keys[x]){   
+
+      if((x == KPD_CANCEL && !bShowCancel) || (x >= KPD_0 && x <= KPD_9 && !bShowNumpad))
+        continue;
       
       switch(x){
         case KPD_0:  
@@ -392,35 +392,35 @@ void SimplePad::Render(){
           break;
       }
 
-      kW = mFont->GetStringWidth(keys[x]->displayValue.c_str());
-      //Render a key.
-      if(x != selected){
+      kW = mFont->GetStringWidth(keys[x]->displayValue.c_str());
+      //Render a key.
+      if(x != selected){
         renderer->FillRoundRect(mX+offX-4,mY+offY-4,kW+8,kH+4,2,options[Metrics::POPUP_MENU_FC].asColor(ARGB(180,50,50,50)));
-        mFont->SetColor(options[Metrics::POPUP_MENU_TCH].asColor(ARGB(255,255,255,0)));
-      }
-      else{
+        mFont->SetColor(options[Metrics::POPUP_MENU_TCH].asColor(ARGB(255,255,255,0)));
+      }
+      else{
         renderer->FillRoundRect(mX+offX-4,mY+offY-4,kW+8,kH+4,2,options[Metrics::POPUP_MENU_FC].asColor(ARGB(255,100,100,100)));
-        mFont->SetColor(options[Metrics::POPUP_MENU_TC].asColor(ARGB(255,255,255,255)));
-      }
-
-      char vkey[2];
-      vkey[1] = '\0';
-      vkey[0] = keys[x]->id;
-
-      
-      if(isalpha(vkey[0])) {
-        if(bCapslock) vkey[0] = toupper(vkey[0]);
-        mFont->DrawString(vkey,mX+offX,mY+offY);
-      }
-      else
-        mFont->DrawString(keys[x]->displayValue.c_str(),mX+offX,mY+offY);
-      offX += kW + 14;
-    }
-}
-
-int SimplePad::cursorPos(){
-  if(cursor < 0 || cursor > buffer.size())
-    return buffer.size();
-
-  return cursor;
+        mFont->SetColor(options[Metrics::POPUP_MENU_TC].asColor(ARGB(255,255,255,255)));
+      }
+
+      char vkey[2];
+      vkey[1] = '\0';
+      vkey[0] = keys[x]->id;
+
+      
+      if(isalpha(vkey[0])) {
+        if(bCapslock) vkey[0] = toupper(vkey[0]);
+        mFont->DrawString(vkey,mX+offX,mY+offY);
+      }
+      else
+        mFont->DrawString(keys[x]->displayValue.c_str(),mX+offX,mY+offY);
+      offX += kW + 14;
+    }
+}
+
+int SimplePad::cursorPos(){
+  if(cursor < 0 || cursor > buffer.size())
+    return buffer.size();
+
+  return cursor;
 }