Linux middle mouse button paste/primary selection support and gtk clipboard handler (fixes crashbug using synergy mouse-keyboard-clipboard-sharing over lan)

	modified:   linden/doc/contributions.txt
	modified:   linden/indra/llui/llclipboard.cpp
	modified:   linden/indra/llui/llclipboard.h
	modified:   linden/indra/llui/llfloater.cpp
	modified:   linden/indra/llui/llfloater.h
	modified:   linden/indra/llui/lllineeditor.cpp
	modified:   linden/indra/llui/lllineeditor.h
	modified:   linden/indra/llui/lltexteditor.cpp
	modified:   linden/indra/llui/lltexteditor.h
	modified:   linden/indra/llui/llview.cpp
	modified:   linden/indra/llui/llview.h
	modified:   linden/indra/llwindow/CMakeLists.txt
	new file:   linden/indra/llwindow/llmousehandler.cpp
	modified:   linden/indra/llwindow/llmousehandler.h
	modified:   linden/indra/llwindow/llwindow.cpp
	modified:   linden/indra/llwindow/llwindow.h
	modified:   linden/indra/llwindow/llwindowsdl.cpp
	modified:   linden/indra/llwindow/llwindowsdl.h
	modified:   linden/indra/newview/lltool.cpp
	modified:   linden/indra/newview/lltool.h
	modified:   linden/indra/newview/llviewertexteditor.cpp
	modified:   linden/indra/newview/llviewertexteditor.h
	modified:   linden/indra/newview/llviewerwindow.cpp
	modified:   linden/indra/newview/llviewerwindow.h
(cherry picked from commit 594f4830922f4294dda432fa748935adffaeed8f)

1 files changed, 87 insertions, 4 deletions

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;
 }