Merge

1 files changed, 14 insertions, 24 deletions

diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 49e9539b16..b62138426b 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -51,26 +51,18 @@
 #include "llviewborder.h"
 
 #include "llpreeditor.h"
-#include <boost/function.hpp>
+#include "lltextvalidate.h"
 
 class LLFontGL;
 class LLLineEditorRollback;
 class LLButton;
-
-typedef boost::function<BOOL (const LLWString &wstr)> LLLinePrevalidateFunc;
+class LLContextMenu;
 
 class LLLineEditor
 : public LLUICtrl, public LLEditMenuHandler, protected LLPreeditor
 {
 public:
 
-	struct PrevalidateNamedFuncs
-	:	public LLInitParam::TypeValuesHelper<LLLinePrevalidateFunc, PrevalidateNamedFuncs>
-
-	{
-		static void declareValues();
-	};
-	
 	typedef boost::function<void (LLLineEditor* caller)> keystroke_callback_t;
 	
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
@@ -80,7 +72,7 @@ public:
 
 		Optional<keystroke_callback_t>	keystroke_callback;
 
-		Optional<LLLinePrevalidateFunc, PrevalidateNamedFuncs>	prevalidate_callback;
+		Optional<LLTextValidate::validate_func_t, LLTextValidate::ValidateTextNamedFuncs>	prevalidate_callback;
 		
 		Optional<LLViewBorder::Params>	border;
 
@@ -113,6 +105,7 @@ protected:
 	LLLineEditor(const Params&);
 	friend class LLUICtrlFactory;
 	friend class LLFloaterEditUI;
+	void showContextMenu(S32 x, S32 y);
 public:
 	virtual ~LLLineEditor();
 
@@ -122,6 +115,7 @@ public:
 	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleDoubleClick(S32 x,S32 y,MASK mask);
 	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x,S32 y,MASK mask);
+	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleKeyHere(KEY key, MASK mask );
 	/*virtual*/ BOOL	handleUnicodeCharHere(llwchar uni_char);
 	/*virtual*/ void	onMouseCaptureLost();
@@ -204,6 +198,8 @@ public:
 	const LLColor4& getReadOnlyFgColor() const	{ return mReadOnlyFgColor.get(); }
 	const LLColor4& getTentativeFgColor() const { return mTentativeFgColor.get(); }
 
+	const LLFontGL* getFont() const { return mGLFont; }
+
 	void			setIgnoreArrowKeys(BOOL b)		{ mIgnoreArrowKeys = b; }
 	void			setIgnoreTab(BOOL b)			{ mIgnoreTab = b; }
 	void			setPassDelete(BOOL b)			{ mPassDelete = b; }
@@ -231,17 +227,7 @@ public:
 	void setTextPadding(S32 left, S32 right);
 
 	// Prevalidation controls which keystrokes can affect the editor
-	void			setPrevalidate( LLLinePrevalidateFunc func );
-	static BOOL		prevalidateFloat(const LLWString &str );
-	static BOOL		prevalidateInt(const LLWString &str );
-	static BOOL		prevalidatePositiveS32(const LLWString &str);
-	static BOOL		prevalidateNonNegativeS32(const LLWString &str);
-	static BOOL		prevalidateAlphaNum(const LLWString &str );
-	static BOOL		prevalidateAlphaNumSpace(const LLWString &str );
-	static BOOL		prevalidateASCIIPrintableNoPipe(const LLWString &str); 
-	static BOOL		prevalidateASCIIPrintableNoSpace(const LLWString &str);
-	static BOOL		prevalidateASCII(const LLWString &str);
-
+	void			setPrevalidate( LLTextValidate::validate_func_t func );
 	static BOOL		postvalidateFloat(const std::string &str);
 
 	// line history support:
@@ -249,7 +235,9 @@ public:
 	void			updateHistory(); // stores current line in history
 
 	void			setReplaceNewlinesWithSpaces(BOOL replace);
-	
+
+	void			setContextMenu(LLContextMenu* new_context_menu);
+
 private:
 	// private helper methods
 
@@ -319,7 +307,7 @@ protected:
 	S32			mLastSelectionStart;
 	S32			mLastSelectionEnd;
 
-	LLLinePrevalidateFunc mPrevalidateFunc;
+	LLTextValidate::validate_func_t mPrevalidateFunc;
 
 	LLFrameTimer mKeystrokeTimer;
 	LLTimer		mTripleClickTimer;
@@ -348,6 +336,8 @@ protected:
 	std::vector<S32> mPreeditPositions;
 	LLPreeditor::standouts_t mPreeditStandouts;
 
+	LLHandle<LLView> mContextMenuHandle;
+
 private:
 	// Instances that by default point to the statics but can be overidden in XML.
 	LLPointer<LLUIImage> mBgImage;