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, 10 insertions, 1 deletions

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;