Applied Aimee's patch for doing simple math in the build editor

3 files changed, 47 insertions, 7 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 12d1929..9c8ee94 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -41,6 +41,7 @@
 #include "llgl.h"
 #include "lltimer.h"
 
+#include "llcalc.h"
 //#include "llclipboard.h"
 #include "llcontrol.h"
 #include "llbutton.h"
@@ -129,6 +130,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 mDrawAsterixes( FALSE ),
                 mHandleEditKeysDirectly( FALSE ),
                 mSelectAllonFocusReceived( FALSE ),
+                mSelectAllonCommit( TRUE ),
                 mPassDelete(FALSE),
                 mReadOnly(FALSE),
                 mImage( sImage ),
@@ -226,7 +228,10 @@ void LLLineEditor::onCommit()
         updateHistory();
 
         LLUICtrl::onCommit();
-        selectAll();
+
+        // Selection on commit needs to be turned off when evaluating maths
+        // expressions, to allow indication of the error position
+        if (mSelectAllonCommit) selectAll();
 }
 
 
@@ -2082,6 +2087,32 @@ BOOL LLLineEditor::prevalidateASCII(const LLWString &str)
         return rv;
 }
 
+BOOL LLLineEditor::evaluateFloat()
+{
+        bool success;
+        F32 result = 0.f;
+        std::string expr = getText();
+
+        success = LLCalc::getInstance()->evalString(expr, result);
+
+        if (!success)
+        {
+                // Move the cursor to near the error on failure
+                setCursor(LLCalc::getInstance()->getLastErrorPos());
+                // *TODO: Translated error message indicating the type of error? Select error text?
+        }
+        else
+        {
+                // Replace the expression with the result
+                std::ostringstream result_str;
+                result_str << result;
+                setText(result_str.str());
+                selectAll();
+        }
+
+        return success;
+}
+
 void LLLineEditor::onMouseCaptureLost()
 {
         endSelection();
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 09a240b..6738151 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -188,6 +188,7 @@ public:
 
         void                    setHandleEditKeysDirectly( BOOL b ) { mHandleEditKeysDirectly = b; }
         void                    setSelectAllonFocusReceived(BOOL b);
+        void                    setSelectAllonCommit(BOOL b) { mSelectAllonCommit = b; }
 
         void                    setKeystrokeCallback(void (*keystroke_callback)(LLLineEditor* caller, void* user_data));
 
@@ -208,6 +209,8 @@ public:
         static BOOL             prevalidateASCII(const LLWString &str);
 
         static BOOL             postvalidateFloat(const std::string &str);
+        
+        BOOL                    evaluateFloat();
 
         // line history support:
         void                    setEnableLineHistory( BOOL enabled ) { mHaveHistory = enabled; } // switches line history on or off 
@@ -297,6 +300,7 @@ protected:
 
         BOOL            mHandleEditKeysDirectly;  // If true, the standard edit keys (Ctrl-X, Delete, etc,) are handled here instead of routed by the menu system
         BOOL            mSelectAllonFocusReceived;
+        BOOL            mSelectAllonCommit;
         BOOL            mPassDelete;
 
         BOOL            mReadOnly;
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index a106af4..b12d095 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -49,7 +49,7 @@
 #include "llfocusmgr.h"
 #include "llresmgr.h"
 
-const U32 MAX_STRING_LENGTH = 32;
+const U32 MAX_STRING_LENGTH = 255;
 
 static LLRegisterWidget<LLSpinCtrl> r2("spinner");
  
@@ -123,7 +123,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
         mEditor = new LLLineEditor( std::string("SpinCtrl Editor"), editor_rect, LLStringUtil::null, font,
                                                                 MAX_STRING_LENGTH,
                                                                 &LLSpinCtrl::onEditorCommit, NULL, NULL, this,
-                                                                &LLLineEditor::prevalidateFloat );
+                                                                &LLLineEditor::prevalidateASCII );
         mEditor->setFollowsLeft();
         mEditor->setFollowsBottom();
         mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
@@ -132,6 +132,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
         // it's easier to understand
         //mEditor->setSelectAllonFocusReceived(TRUE);
         mEditor->setIgnoreTab(TRUE);
+        mEditor->setSelectAllonCommit(FALSE);
         addChild(mEditor);
 
         updateEditor();
@@ -292,9 +293,10 @@ void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
         LLSpinCtrl* self = (LLSpinCtrl*) userdata;
         llassert( caller == self->mEditor );
 
-        std::string text = self->mEditor->getText();
-        if( LLLineEditor::postvalidateFloat( text ) )
+        if( self->mEditor->evaluateFloat() )
         {
+                std::string text = self->mEditor->getText();
+                
                 LLLocale locale(LLLocale::USER_LOCALE);
                 F32 val = (F32) atof(text.c_str());
 
@@ -322,9 +324,12 @@ void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
                         success = TRUE;
                 }
         }
-        self->updateEditor();
 
-        if( !success )
+        if( success )
+        {
+                self->updateEditor();
+        }
+        else
         {
                 self->reportInvalidData();              
         }