Merge remote branch 'elektra/weekly' into weekly

6 files changed, 181 insertions, 41 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2b61a19..7a22e7e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,39 @@
   
   <!-- Imprudence-specific settings -->
 
+  <key>nick01</key>
+  <map>
+    <key>Comment</key>
+    <string>First Nickname for Chat Highlight</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>nick02</key>
+  <map>
+    <key>Comment</key>
+    <string>Second Nickname for Chat Highlight</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>nick03</key>
+  <map>
+    <key>Comment</key>
+    <string>Third Nickname for Chat Highlight</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
   <key>HighlightOwnNameInIM</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 92340ec..2981958 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -68,6 +68,7 @@
 #include "llmultigesture.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
+#include "llvoavatar.h"
 
 #include "chatbar_as_cmdline.h"
 
@@ -114,7 +115,11 @@ LLChatBar::LLChatBar()
         mObserver(NULL)
 {
         setIsChrome(TRUE);
-        
+
+        mCompletionHolder.current_index = 0;
+        mCompletionHolder.last_match = "";
+        mCompletionHolder.last_txt = "";
+
         #if !LL_RELEASE_FOR_DOWNLOAD
         childDisplayNotFound();
 #endif
@@ -206,7 +211,7 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
                 stopChat();
                 handled = TRUE;
         }
-        else if (key == KEY_ESCAPE && mask == MASK_CONTROL && gChatBar == this)
+        else if (key == KEY_TAB)
         {
                 if (mInputEditor)
                 {
@@ -216,48 +221,65 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 
                         if (!avatar_ids.empty())
                         {
-                                std::string txt(mInputEditor->getText());
+                                mInputEditor->deleteSelection(); // Clean up prev completion before attempting a new one
 
-                                std::string to_match(txt);
-                                std::string left_part = "";
-                                std::string right_part = "";
                                 S32 cursorPos = mInputEditor->getCursor();
+                                std::string txt(mInputEditor->getText());
 
-                                if (cursorPos < (S32)txt.length())
+                                if (mCompletionHolder.last_txt != mInputEditor->getText())
                                 {
-                                        right_part = txt.substr(cursorPos);
-                                        left_part = txt.substr(0, cursorPos);
-                                        to_match = std::string(left_part);
-                                }
-                                else
-                                {
-                                        to_match = std::string(txt);
-                                        left_part = txt;
-                                }
+                                        mCompletionHolder.last_txt = std::string(mInputEditor->getText());
 
-                                std::string pattern_s = "(^|.*[\\.\\?!:;,\\*\\(\\s]+)([a-z0-9]+)$";
-                                boost::match_results<std::string::const_iterator> what;
-                                boost::regex expression(pattern_s, boost::regex::icase);
-                                if (boost::regex_search(to_match, what, expression, boost::match_extra))
-                                {
-                                        to_match = what[2];
-                                        if (to_match.length() < 3)
+                                        if (cursorPos < (S32)txt.length())
+                                        {
+                                                mCompletionHolder.right = txt.substr(cursorPos);
+                                                mCompletionHolder.left = txt.substr(0, cursorPos);
+                                                mCompletionHolder.match = std::string(mCompletionHolder.left);
+                                        }
+                                        else
+                                        {
+                                                mCompletionHolder.right = "";
+                                                mCompletionHolder.match = std::string(txt);
+                                                mCompletionHolder.left = txt;
+                                        }
+
+                                        std::string pattern_s = "(^|.*[_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+)([a-z0-9]+)$";
+                                        boost::match_results<std::string::const_iterator> what;
+                                        boost::regex expression(pattern_s, boost::regex::icase);
+                                        if (boost::regex_search(mCompletionHolder.match, what, expression, boost::match_extra))
+                                        {
+                                                mCompletionHolder.match = what[2];
+                                                if (mCompletionHolder.match.length() < 1)
+                                                        return handled;
+                                        }
+                                        else
                                                 return handled;
                                 }
-                                else
-                                        return handled;
+
+                                mCompletionHolder.names.clear();
 
                                 for (U32 i=0; i<avatar_ids.size(); i++)
                                 {
                                         if (avatar_ids[i] == gAgent.getID() || avatar_ids[i].isNull())
                                                 continue;
 /*
-                                        // Commented out for now... doesn't work above 1024 meters as usual
+                                        // Grab the pos again from the objects-in-view cache... LLWorld doesn't work above 1024 meters as usual :(
+                                        LLVector3d real_pos = positions[i];
+                                        if (real_pos[2] == 0.0f)
+                                        {
+                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+                                                if (av_obj != NULL && av_obj->isAvatar())
+                                                {
+                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+                                                        if (avatarp != NULL)
+                                                                real_pos = avatarp->getPositionGlobal();
+                                                }
+                                        }
+
                                         F32 dist = F32(dist_vec(positions[i], gAgent.getPositionGlobal()));
-                                        if (dist > CHAT_NORMAL_RADIUS)
+                                        if (dist > CHAT_SHOUT_RADIUS)
                                                 continue;
 */
-
                                         std::string agent_name = " ";
                                         std::string agent_surname = " ";
 
@@ -266,14 +288,28 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 
                                         std::string test_name(agent_name);
                                         std::transform(test_name.begin(), test_name.end(), test_name.begin(), tolower);
-                                        std::transform(to_match.begin(), to_match.end(), to_match.begin(), tolower);
+                                        std::transform(mCompletionHolder.match.begin(), mCompletionHolder.match.end(), mCompletionHolder.match.begin(), tolower);
 
-                                        if (test_name.find(to_match) == 0)
-                                        {
-                                                mInputEditor->setText(left_part.substr(0, left_part.length() - to_match.length()) + agent_name + right_part);
-                                                mInputEditor->setSelection(cursorPos, cursorPos + (agent_name.length() - to_match.length()));
-                                                return TRUE;
-                                        }
+                                        if (test_name.find(mCompletionHolder.match) == 0)
+                                                mCompletionHolder.names.push_back(agent_name);
+                                }
+
+                                if (mCompletionHolder.current_index >= mCompletionHolder.names.size() || mCompletionHolder.match != mCompletionHolder.last_match)
+                                {
+                                        mCompletionHolder.current_index = 0;
+                                        mCompletionHolder.last_match = mCompletionHolder.match;
+                                }
+
+                                if (mCompletionHolder.names.size() > 0)
+                                {
+                                        std::string current_name = mCompletionHolder.names[mCompletionHolder.current_index];
+
+                                        mInputEditor->setText(mCompletionHolder.left.substr(0, mCompletionHolder.left.length() - mCompletionHolder.match.length()) + current_name + mCompletionHolder.right);
+                                        mInputEditor->setSelection(cursorPos, cursorPos + (current_name.length() - mCompletionHolder.match.length()));
+
+                                        mCompletionHolder.current_index++;
+
+                                        return TRUE;
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 13332c7..5542d8a 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -46,6 +46,16 @@ class LLChatBarGestureObserver;
 class LLComboBox;
 class LLSpinCtrl;
 
+struct CompletionHolder {
+        std::string left;
+        std::string right;
+        std::string match;
+        std::vector<std::string> names;
+        std::string last_txt;
+        std::string last_match;
+        int current_index;
+};
+
 class LLChatBar
 :       public LLPanel
 {
@@ -117,6 +127,8 @@ protected:
 private:
         BOOL                            mChanCtrlEnabled;
         LLSpinCtrl*                     mChannelControl;
+
+        CompletionHolder mCompletionHolder;
 };
 
 extern LLChatBar *gChatBar;
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index b1c1356..59f4d70 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -453,14 +453,32 @@ void LLFloaterChat::updateSettings()
         LLFloaterChat::getInstance(LLSD())->getChild<LLCheckBoxCtrl>("translate chat")->set(translate_chat);
 }
 
-BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
+BOOL checkStringInText(const std::string &text_line, std::string textToMatch)
 {
-        std::string my_name = gSavedSettings.getString("FirstName");
-        std::string pattern_s = "(^|.*[',\\.\\?!:;\\*\\(\\s]+)(" + my_name + ")([',\\.\\?!:;\\*\\)\\s]+.*|$)";
         boost::smatch what;
-        boost::regex e1(pattern_s, boost::regex::icase);
+        std::string pattern_s = "(^|.*[_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+)(" + textToMatch + ")([_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+.*|$)";
+        boost::regex expression(pattern_s, boost::regex::icase);
+        return boost::regex_search(text_line, what, expression);
+}
+
+BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
+{
+        if (checkStringInText(text_line, gSavedSettings.getString("FirstName")))
+                return TRUE;
+
+        for (int i=1; i<=3; i++)
+        {
+                std::stringstream key;
+                key << "nick0" << i;
+                std::string nick = gSavedSettings.getString(key.str());
+                if (! nick.empty())
+                {
+                        if (checkStringInText(text_line, nick))
+                                return TRUE;
+                }
+        }
 
-        return boost::regex_search(text_line, what, e1);
+        return FALSE;
 }
 
 LLColor4 get_extended_text_color(const LLChat& chat, LLColor4 defaultColor)
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 73a5827..cb0416e 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -45,6 +45,8 @@
 
 #include "lluictrlfactory.h"
 
+#include "boost/algorithm/string.hpp"
+
 LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
 
 LLPrefsAdvanced::LLPrefsAdvanced()
@@ -117,11 +119,14 @@ BOOL LLPrefsAdvanced::postBuild()
         getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
         childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
         getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
+        childSetValue("nick01", gSavedSettings.getString("nick01"));
+        childSetValue("nick02", gSavedSettings.getString("nick02"));
+        childSetValue("nick03", gSavedSettings.getString("nick03"));
 
         refresh();
 
         return TRUE;
-}
+}               
 
 void LLPrefsAdvanced::apply()
 {
@@ -146,6 +151,18 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
         gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
 
+        std::string nick01 = childGetValue("nick01");
+        boost::trim(nick01);
+        gSavedSettings.setString("nick01", nick01);
+
+        std::string nick02 = childGetValue("nick02");
+        boost::trim(nick02);
+        gSavedSettings.setString("nick02", nick02);
+
+        std::string nick03 = childGetValue("nick03");
+        boost::trim(nick03);
+        gSavedSettings.setString("nick03", nick03);
+
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
         {
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index d877c2d..a0c9e28 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -206,6 +206,30 @@ To use spellcheck, right-click a misspelled word
             enabled="true" follows="left|top" height="67" label="Own Name" left_delta="68"
             mouse_opaque="true" name="OwnNameChatColor" width="65" />
 
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-50"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="0"
+                        max_length="50" mouse_opaque="true" name="nick01"
+                        select_all_on_focus_received="true" width="400" word_wrap="false" />
+
+                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick01_text" width="70">Nick 1</text>
+
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="60"
+                        max_length="50" mouse_opaque="true" name="nick02"
+                        select_all_on_focus_received="true" width="400" word_wrap="false" />
+
+                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick02_text" width="70">Nick 2</text>
+
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="60"
+                        max_length="50" mouse_opaque="true" name="nick03"
+                        select_all_on_focus_received="true" width="400" word_wrap="false" />
+
+                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick03_text" width="70">Nick 3</text>
+
     </panel>
   </tab_container>
 </panel>