1 files changed, 56 insertions, 12 deletions

diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 49c0c91d..99a95a2e 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -1,32 +1,30 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
 #include <guichan/font.hpp>
 
-#include "textfield.h"
-
 #include "sdlinput.h"
+#include "textfield.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 
 #include "../resources/image.h"
@@ -37,10 +35,13 @@
 #undef DELETE //Win32 compatibility hack
 
 int TextField::instances = 0;
+float TextField::mAlpha = config.getValue("guialpha", 0.8);
 ImageRect TextField::skin;
 
 TextField::TextField(const std::string& text):
-    gcn::TextField(text)
+    gcn::TextField(text),
+    mNumeric(false),
+    mListener(0)
 {
     setFrameSize(2);
 
@@ -51,9 +52,6 @@ TextField::TextField(const std::string& text):
         Image *textbox = resman->getImage("graphics/gui/deepbox.png");
         int gridx[4] = {0, 3, 28, 31};
         int gridy[4] = {0, 3, 28, 31};
-        //Image *textbox = resman->getImage("graphics/gui/textbox.png");
-        //int gridx[4] = {0, 5, 26, 31};
-        //int gridy[4] = {0, 5, 26, 31};
         int a = 0, x, y;
 
         for (y = 0; y < 3; y++) {
@@ -62,6 +60,7 @@ TextField::TextField(const std::string& text):
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
                         gridy[y + 1] - gridy[y] + 1);
+                skin.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
@@ -93,6 +92,15 @@ void TextField::draw(gcn::Graphics *graphics)
     graphics->setColor(getForegroundColor());
     graphics->setFont(getFont());
     graphics->drawText(mText, 1 - mXScroll, 1);
+
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+        for (int a = 0; a < 9; a++)
+        {
+            skin.grid[a]->setAlpha(mAlpha);
+        }
+    }
 }
 
 void TextField::drawFrame(gcn::Graphics *graphics)
@@ -105,6 +113,42 @@ void TextField::drawFrame(gcn::Graphics *graphics)
     static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
 
+void TextField::setNumeric(bool numeric)
+{
+    mNumeric = numeric;
+    if (!numeric)
+    {
+        return;
+    }
+    const char *text = mText.c_str();
+    for (const char *textPtr = text; *textPtr; ++textPtr)
+    {
+        if (*textPtr < '0' || *textPtr > '9')
+        {
+            setText(mText.substr(0, textPtr - text));
+            return;
+        }
+    }
+}
+
+int TextField::getValue() const
+{
+    if (!mNumeric)
+    {
+        return 0;
+    }
+    int value = atoi(mText.c_str());
+    if (value < mMinimum)
+    {
+        return mMinimum;
+    }
+    if (value > mMaximum)
+    {
+        return mMaximum;
+    }
+    return value;
+}
+
 void TextField::keyPressed(gcn::KeyEvent &keyEvent)
 {
     int val = keyEvent.getKey().getValue();