10 files changed, 320 insertions, 17 deletions

diff --git a/linden/indra/llui/llclipboard.cpp b/linden/indra/llui/llclipboard.cpp
index d5255e7..f33f3fa 100644
--- a/linden/indra/llui/llclipboard.cpp
+++ b/linden/indra/llui/llclipboard.cpp
@@ -92,3 +92,44 @@ BOOL LLClipboard::canPasteString() const
 {
         return LLView::getWindow()->isClipboardTextAvailable();
 }
+
+
+void LLClipboard::copyFromPrimarySubstring(const LLWString &src, S32 pos, S32 len, const LLUUID& source_id )
+{
+        mSourceID = source_id;
+        mString = src.substr(pos, len);
+        LLView::getWindow()->copyTextToPrimary( mString );
+}
+
+
+const LLWString& LLClipboard::getPastePrimaryWString( LLUUID* source_id )
+{
+        if( mSourceID.notNull() )
+        {
+                LLWString temp_string;
+                LLView::getWindow()->pasteTextFromPrimary(temp_string);
+
+                if( temp_string != mString )
+                {
+                        mSourceID.setNull();
+                        mString = temp_string;
+                }
+        }
+        else
+        {
+                LLView::getWindow()->pasteTextFromPrimary(mString);
+        }
+
+        if( source_id )
+        {
+                *source_id = mSourceID;
+        }
+
+        return mString;
+}
+
+
+BOOL LLClipboard::canPastePrimaryString() const
+{
+        return LLView::getWindow()->isPrimaryTextAvailable();
+}
diff --git a/linden/indra/llui/llclipboard.h b/linden/indra/llui/llclipboard.h
index 706ed2a..7117f84 100644
--- a/linden/indra/llui/llclipboard.h
+++ b/linden/indra/llui/llclipboard.h
@@ -43,10 +43,19 @@ public:
         LLClipboard();
         ~LLClipboard();
 
+        /* We support two flavors of clipboard.  The default is the explicitly
+           copy-and-pasted clipboard.  The second is the so-called 'primary' clipboard
+           which is implicitly copied upon selection on platforms which expect this
+           (i.e. X11/Linux). */
+
         void            copyFromSubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
         BOOL            canPasteString() const;
         const LLWString&        getPasteWString(LLUUID* source_id = NULL);
-        
+
+        void            copyFromPrimarySubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
+        BOOL            canPastePrimaryString() const;
+        const LLWString&        getPastePrimaryWString(LLUUID* source_id = NULL);       
+
 private:
         LLUUID          mSourceID;
         LLWString       mString;
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 2924c29..efe49eb 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1187,6 +1187,12 @@ BOOL LLFloater::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return was_minimized || LLPanel::handleRightMouseDown( x, y, mask );
 }
 
+BOOL LLFloater::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        bringToFront( x, y );
+        return LLPanel::handleMiddleMouseDown( x, y, mask );
+}
+
 
 // virtual
 BOOL LLFloater::handleDoubleClick(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index a6fe3cc..37081c2 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -178,7 +178,7 @@ public:
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleRightMouseDown(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 void    draw();
 
         virtual void    onOpen() {}
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 498ef26..f905774 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -493,6 +493,9 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
         // delay cursor flashing
         mKeystrokeTimer.reset();
 
+        // take selection to 'primary' clipboard
+        updatePrimary();
+
         return TRUE;
 }
 
@@ -575,6 +578,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)
 {
@@ -669,6 +683,9 @@ BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
         {
                 // delay cursor flashing
                 mKeystrokeTimer.reset();
+
+                // take selection to 'primary' clipboard
+                updatePrimary();
         }
 
         return handled;
@@ -872,7 +889,12 @@ BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
                 }
         }
 
-
+        if(handled)
+        {
+                // take selection to 'primary' clipboard
+                updatePrimary();
+        }
+ 
         return handled;
 }
 
@@ -945,20 +967,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();
                         }
@@ -994,7 +1038,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();
@@ -1015,7 +1059,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;
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 11cbcd9..b11f8b9 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -89,6 +89,7 @@ public:
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*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        handleKeyHere(KEY key, MASK mask );
         /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
         /*virtual*/ void        onMouseCaptureLost();
@@ -96,13 +97,16 @@ public:
         // LLEditMenuHandler overrides
         virtual void    cut();
         virtual BOOL    canCut() const;
-
         virtual void    copy();
         virtual BOOL    canCopy() const;
-
         virtual void    paste();
         virtual BOOL    canPaste() const;
-        
+
+        virtual void    updatePrimary();
+        virtual void    copyPrimary();
+        virtual void    pastePrimary();
+        virtual BOOL    canPastePrimary() const;
+
         virtual void    doDelete();
         virtual BOOL    canDoDelete() const;
 
@@ -219,6 +223,9 @@ public:
         
 private:
         // private helper methods
+
+        void                    pasteHelper(bool is_primary);
+
         void                    removeChar();
         void                    addChar(const llwchar c);
         void                    setCursorAtLocalPos(S32 local_mouse_x);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 3813e76..95cce60 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;
 }
 
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 643b7c3..0777e5f 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -82,6 +82,8 @@ public:
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask );
+        virtual BOOL    handleMiddleMouseDown(S32 x,S32 y,MASK mask);
+
         virtual BOOL    handleKeyHere(KEY key, MASK mask );
         virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
 
@@ -117,6 +119,10 @@ public:
         virtual BOOL    canCopy() const;
         virtual void    paste();
         virtual BOOL    canPaste() const;
+        virtual void    updatePrimary();
+        virtual void    copyPrimary();
+        virtual void    pastePrimary();
+        virtual BOOL    canPastePrimary() const;
         virtual void    doDelete();
         virtual BOOL    canDoDelete() const;
         virtual void    selectAll();
@@ -425,6 +431,8 @@ private:
         //
         // Methods
         //
+        void                    pasteHelper(bool is_primary);
+
         void                    updateSegments();
         void                    pruneSegments();
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 9cdf481..78bf168 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -981,6 +981,30 @@ BOOL LLView::handleRightMouseUp(S32 x, S32 y, MASK mask)
         }
         return handled;
 }
+ 
+BOOL LLView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = childrenHandleMiddleMouseDown( x, y, mask );
+        BOOL handled = (handled_view != NULL);
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+                handled_view = this;
+        }
+
+        return handled;
+}
+
+BOOL LLView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        BOOL handled = childrenHandleMiddleMouseUp( x, y, mask ) != NULL;
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+        }
+        return handled;
+}
+
 
 LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
 {
@@ -1142,6 +1166,34 @@ LLView* LLView::childrenHandleRightMouseDown(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+
+        if (getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseDown( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
+
 LLView* LLView::childrenHandleDoubleClick(S32 x, S32 y, MASK mask)
 {
         LLView* handled_view = NULL;
@@ -1227,6 +1279,32 @@ LLView* LLView::childrenHandleRightMouseUp(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+        if( getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseUp( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
 
 void LLView::draw()
 {
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 80dd348..da7f164 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -463,6 +463,8 @@ public:
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
         /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask);
@@ -596,6 +598,8 @@ protected:
         LLView* childrenHandleHover(S32 x, S32 y, MASK mask);
         LLView* childrenHandleMouseUp(S32 x, S32 y, MASK mask);
         LLView* childrenHandleMouseDown(S32 x, S32 y, MASK mask);
+        LLView* childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask);
+        LLView* childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask);
         LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask);
         LLView* childrenHandleScrollWheel(S32 x, S32 y, S32 clicks);
         LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);