1 files changed, 75 insertions, 8 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index f35fa58..fc33dcf 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -494,6 +494,9 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
         // delay cursor flashing
         mKeystrokeTimer.reset();
 
+        // take selection to 'primary' clipboard
+        updatePrimary();
+
         return TRUE;
 }
 
@@ -576,6 +579,17 @@ BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
+BOOL LLLineEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        // llinfos << "MiddleMouseDown" << llendl;
+        setFocus( TRUE );
+        if( canPastePrimary() )
+        {
+                setCursorAtLocalPos(x);
+                pastePrimary();
+        }
+        return TRUE;
+}
 
 BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
 {
@@ -670,6 +684,9 @@ BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
         {
                 // delay cursor flashing
                 mKeystrokeTimer.reset();
+
+                // take selection to 'primary' clipboard
+                updatePrimary();
         }
 
         return handled;
@@ -873,7 +890,12 @@ BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
                 }
         }
 
-
+        if(handled)
+        {
+                // take selection to 'primary' clipboard
+                updatePrimary();
+        }
+ 
         return handled;
 }
 
@@ -946,20 +968,42 @@ BOOL LLLineEditor::canPaste() const
         return !mReadOnly && gClipboard.canPasteString(); 
 }
 
-
-// paste from clipboard
 void LLLineEditor::paste()
 {
-        if (canPaste())
+        bool is_primary = false;
+        pasteHelper(is_primary);
+}
+
+void LLLineEditor::pastePrimary()
+{
+        bool is_primary = true;
+        pasteHelper(is_primary);
+}
+
+// paste from primary (is_primary==true) or clipboard (is_primary==false)
+void LLLineEditor::pasteHelper(bool is_primary)
+{
+        bool can_paste_it;
+        if (is_primary)
+                can_paste_it = canPastePrimary();
+        else
+                can_paste_it = canPaste();
+
+        if (can_paste_it)
         {
-                LLWString paste = gClipboard.getPasteWString();
+                LLWString paste;
+                if (is_primary)
+                        paste = gClipboard.getPastePrimaryWString();
+                else 
+                        paste = gClipboard.getPasteWString();
+
                 if (!paste.empty())
                 {
                         // Prepare for possible rollback
                         LLLineEditorRollback rollback(this);
                         
                         // Delete any selected characters
-                        if (hasSelection())
+                        if ((!is_primary) && hasSelection())
                         {
                                 deleteSelection();
                         }
@@ -995,7 +1039,7 @@ void LLLineEditor::paste()
                                 clean_string = clean_string.substr(0, wchars_that_fit);
                                 reportBadKeystroke();
                         }
-
+ 
                         mText.insert(getCursor(), clean_string);
                         setCursor( getCursor() + (S32)clean_string.length() );
                         deselect();
@@ -1016,7 +1060,30 @@ void LLLineEditor::paste()
         }
 }
 
-        
+// copy selection to primary
+void LLLineEditor::copyPrimary()
+{
+        if( canCopy() )
+        {
+                S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
+                S32 length = abs( mSelectionStart - mSelectionEnd );
+                gClipboard.copyFromPrimarySubstring( mText.getWString(), left_pos, length );
+        }
+}
+
+BOOL LLLineEditor::canPastePrimary() const
+{
+        return !mReadOnly && gClipboard.canPastePrimaryString(); 
+}
+
+void LLLineEditor::updatePrimary()
+{
+        if(canCopy() )
+        {
+                copyPrimary();
+        }
+}
+
 BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) 
 {
         BOOL handled = FALSE;