From 3f0082a9dda60432b8b759e09f19b495d9d5275c Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 8 Jun 2009 11:10:27 +0200
Subject: 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)
---
 linden/indra/llui/llclipboard.cpp | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'linden/indra/llui/llclipboard.cpp')

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();
+}
-- 
cgit v1.1