1 files changed, 95 insertions, 12 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 3813e76..8fa253a 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -1203,6 +1203,18 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 
+BOOL LLTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        setFocus( TRUE );
+        if( canPastePrimary() )
+        {
+                setCursorAtLocalPos( x, y, TRUE );
+                pastePrimary();
+        }
+        return TRUE;
+}
+
+
 BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 {
         BOOL handled = FALSE;
@@ -1323,6 +1335,9 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         
                         setCursorAtLocalPos( x, y, TRUE );
                         endSelection();
+
+                        // take selection to primary clipboard
+                        updatePrimary();
                 }
                 
                 if( !hasSelection() )
@@ -1330,6 +1345,9 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         handleMouseUpOverSegment( x, y, mask );
                 }
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
 
@@ -1392,8 +1410,12 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                 // delay cursor flashing
                 resetKeystrokeTimer();
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
+
         return handled;
 }
 
@@ -1689,6 +1711,12 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
                 }
         }
 
+        if( handled )
+        {
+                // take selection to 'primary' clipboard
+                updatePrimary();
+        }
+ 
         return handled;
 }
 
@@ -1868,22 +1896,46 @@ BOOL LLTextEditor::canPaste() const
         return !mReadOnly && gClipboard.canPasteString();
 }
 
-
 // paste from clipboard
 void LLTextEditor::paste()
 {
-        if (!canPaste())
+        bool is_primary = false;
+        pasteHelper(is_primary);
+}
+
+// paste from primary
+void LLTextEditor::pastePrimary()
+{
+        bool is_primary = true;
+        pasteHelper(is_primary);
+}
+
+// paste from primary (itsprimary==true) or clipboard (itsprimary==false)
+void LLTextEditor::pasteHelper(bool is_primary)
+{
+        bool can_paste_it;
+        if (is_primary)
+                can_paste_it = canPastePrimary();
+        else
+                can_paste_it = canPaste();
+
+        if (!can_paste_it)
         {
                 return;
         }
         LLUUID source_id;
-        LLWString paste = gClipboard.getPasteWString(&source_id);
+        LLWString paste;
+        if (is_primary)
+                paste = gClipboard.getPastePrimaryWString(&source_id);
+        else 
+                paste = gClipboard.getPasteWString(&source_id);
+
         if (paste.empty())
         {
                 return;
         }
         // Delete any selected characters (the paste replaces them)
-        if( hasSelection() )
+        if( (!is_primary) && hasSelection() )
         {
                 deleteSelection(TRUE);
         }
@@ -1917,6 +1969,32 @@ void LLTextEditor::paste()
 }
 
 
+
+// copy selection to primary
+void LLTextEditor::copyPrimary()
+{
+        if( !canCopy() )
+        {
+                return;
+        }
+        S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
+        S32 length = abs( mSelectionStart - mSelectionEnd );
+        gClipboard.copyFromPrimarySubstring(mWText, left_pos, length, mSourceID);
+}
+
+BOOL LLTextEditor::canPastePrimary() const
+{
+        return !mReadOnly && gClipboard.canPastePrimaryString();
+}
+
+void LLTextEditor::updatePrimary()
+{
+        if (canCopy())
+        {
+                copyPrimary();
+        }
+}
+
 BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)     
 {
         BOOL handled = FALSE;
@@ -1992,6 +2070,11 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
                 }
         }
 
+        if (handled)
+        {
+                updatePrimary();
+        }
+
         return handled;
 }
 
@@ -3522,13 +3605,13 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
         style->setVisible(true);
         style->setColor(color);
         style->setFontName(font_name);
-        appendStyledText(new_text, allow_undo, prepend_newline, &style);
+        appendStyledText(new_text, allow_undo, prepend_newline, style);
 }
 
 void LLTextEditor::appendStyledText(const std::string &new_text, 
-                                                                         bool allow_undo, 
+                                                                         bool allow_undo,
                                                                          bool prepend_newline,
-                                                                         const LLStyleSP *stylep)
+                                                                         const LLStyleSP stylep)
 {
         if(mParseHTML)
         {
@@ -3543,14 +3626,14 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
                         html->setColor(mLinkColor);
                         if (stylep)
                         {
-                                html->setFontName((*stylep)->getFontString());
+                                html->setFontName(stylep->getFontString());
                         }
                         html->mUnderline = TRUE;
 
                         if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, stylep);
                         html->setLinkHREF(text.substr(start,end-start));
-                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, &html);
-                        if (end < (S32)text.length()) 
+                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, html);
+                        if (end < (S32)text.length())
                         {
                                 text = text.substr(end,text.length() - end);
                                 end=0;
@@ -3570,7 +3653,7 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
 
 // Appends new text to end of document
 void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool prepend_newline,
-                                                          const LLStyleSP *stylep)
+                                                          const LLStyleSP stylep)
 {
         // Save old state
         BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
@@ -3602,7 +3685,7 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
         {
                 S32 segment_start = old_length;
                 S32 segment_end = getLength();
-                LLTextSegment* segment = new LLTextSegment(*stylep, segment_start, segment_end );
+                LLTextSegment* segment = new LLTextSegment(stylep, segment_start, segment_end );
                 mSegments.push_back(segment);
         }