Merged working branch of 1.2 into LL 1.23 merge

9 files changed, 179 insertions, 10 deletions

diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
index 95e315f..afce0c0 100644
--- a/linden/indra/llwindow/CMakeLists.txt
+++ b/linden/indra/llwindow/CMakeLists.txt
@@ -46,6 +46,7 @@ set(llwindows_HEADER_FILES
 
 set(viewer_SOURCE_FILES
     llwindow.cpp
+    llmousehandler.cpp
     )
 
 set(viewer_HEADER_FILES
diff --git a/linden/indra/llwindow/llmousehandler.cpp b/linden/indra/llwindow/llmousehandler.cpp
new file mode 100644
index 0000000..ae2f147
--- /dev/null
+++ b/linden/indra/llwindow/llmousehandler.cpp
@@ -0,0 +1,59 @@
+/** 
+ * @file llmousehandler.cpp
+ * @brief LLMouseHandler class implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llmousehandler.h"
+
+//virtual
+BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down)
+{
+        BOOL handled = FALSE;
+        if (down)
+        {
+                switch (clicktype)
+                {
+                        case CLICK_LEFT: handled = handleMouseDown(x, y, mask); break;
+                        case CLICK_RIGHT: handled = handleRightMouseDown(x, y, mask); break;
+                        case CLICK_MIDDLE: handled = handleMiddleMouseDown(x, y, mask); break;
+                        case CLICK_DOUBLELEFT: handled = handleDoubleClick(x, y, mask); break;
+                }
+        }
+        else
+        {
+                switch (clicktype)
+                {
+                        case CLICK_LEFT: handled = handleMouseUp(x, y, mask); break;
+                        case CLICK_RIGHT: handled = handleRightMouseUp(x, y, mask); break;
+                        case CLICK_MIDDLE: handled = handleMiddleMouseUp(x, y, mask); break;
+                        case CLICK_DOUBLELEFT: handled = handleDoubleClick(x, y, mask); break;
+                }
+        }
+        return handled;
+}
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index f3a2edd..7bd0f2e 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -33,9 +33,10 @@
 #ifndef LL_MOUSEHANDLER_H
 #define LL_MOUSEHANDLER_H
 
-#include "llstring.h"
+#include "linden_common.h"
+#include "llrect.h"
 
-// Abstract interface.
+// Mostly-abstract interface.
 // Intended for use via multiple inheritance. 
 // A class may have as many interfaces as it likes, but never needs to inherit one more than once.
 
@@ -49,13 +50,23 @@ public:
                 SHOW_IF_NOT_BLOCKED,
                 SHOW_ALWAYS,
         } EShowToolTip;
+        typedef enum {
+                CLICK_LEFT,
+                CLICK_MIDDLE,
+                CLICK_RIGHT,
+                CLICK_DOUBLELEFT
+        } EClickType;
+        virtual BOOL    handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
-        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+
+        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
         virtual BOOL    handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) = 0;
         virtual EShowToolTip getShowToolTip() { return SHOW_IF_NOT_BLOCKED; };
         virtual const std::string& getName() const = 0;
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index fb4770e..53ca68d 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -308,6 +308,22 @@ void *LLWindow::getMediaWindow()
         return getPlatformWindow();
 }
 
+//virtual
+BOOL LLWindow::isPrimaryTextAvailable()
+{
+        return FALSE; // no
+}
+//virtual
+BOOL LLWindow::pasteTextFromPrimary(LLWString &dst)
+{
+        return FALSE; // fail
+}
+// virtual
+BOOL LLWindow::copyTextToPrimary(const LLWString &src)
+{
+        return FALSE; // fail
+}
+
 // static
 std::vector<std::string> LLWindow::getDynamicFallbackFontList()
 {
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 9e01596..a649766 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -144,9 +144,15 @@ public:
         virtual void captureMouse() = 0;
         virtual void releaseMouse() = 0;
         virtual void setMouseClipping( BOOL b ) = 0;
+
         virtual BOOL isClipboardTextAvailable() = 0;
         virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0;
         virtual BOOL copyTextToClipboard(const LLWString &src) = 0;
+
+        virtual BOOL isPrimaryTextAvailable();
+        virtual BOOL pasteTextFromPrimary(LLWString &dst);
+        virtual BOOL copyTextToPrimary(const LLWString &src);
+ 
         virtual void flashIcon(F32 seconds) = 0;
         virtual F32 getGamma() = 0;
         virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma
@@ -197,6 +203,7 @@ public:
         virtual void updateLanguageTextInputArea() {}
         virtual void interruptLanguageTextInput() {}
         virtual void spawnWebBrowser(const std::string& escaped_url) {};
+        virtual void ShellEx(const std::string& command) {};
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index f9c170e..4dd0550 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -1230,7 +1230,6 @@ void LLWindowSDL::flashIcon(F32 seconds)
 #endif // LL_X11
 }
 
-
 #if LL_GTK
 BOOL LLWindowSDL::isClipboardTextAvailable()
 {
@@ -1274,22 +1273,80 @@ BOOL LLWindowSDL::copyTextToClipboard(const LLWString &text)
         return FALSE; // failure
 }
 
-#else
+BOOL LLWindowSDL::isPrimaryTextAvailable()
+{
+        if (ll_try_gtk_init())
+        {
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                return gtk_clipboard_wait_is_text_available(clipboard) ?
+                        TRUE : FALSE;
+        }
+        return FALSE; // failure
+}
+
+BOOL LLWindowSDL::pasteTextFromPrimary(LLWString &text)
+{
+        if (ll_try_gtk_init())
+        {
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                gchar * const data = gtk_clipboard_wait_for_text(clipboard);
+                if (data)
+                {
+                        text = LLWString(utf8str_to_wstring(data));
+                        g_free(data);
+                        return TRUE;
+                }
+        }
+        return FALSE; // failure
+}
 
+BOOL LLWindowSDL::copyTextToPrimary(const LLWString &text)
+{
+        if (ll_try_gtk_init())
+        {
+                const std::string utf8 = wstring_to_utf8str(text);
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                gtk_clipboard_set_text(clipboard, utf8.c_str(), utf8.length());
+                return TRUE;
+        }
+        return FALSE; // failure
+}
+
+#else
+ 
 BOOL LLWindowSDL::isClipboardTextAvailable()
 {
         return FALSE; // unsupported
 }
-
+ 
 BOOL LLWindowSDL::pasteTextFromClipboard(LLWString &dst)
 {
         return FALSE; // unsupported
 }
+ 
 
 BOOL LLWindowSDL::copyTextToClipboard(const LLWString &s)
 {
         return FALSE;  // unsupported
 }
+
+BOOL LLWindowSDL::isPrimaryTextAvailable()
+{
+        return FALSE; // unsupported
+}
+
+BOOL LLWindowSDL::pasteTextFromPrimary(LLWString &dst)
+{
+        return FALSE; // unsupported
+}
+
+BOOL LLWindowSDL::copyTextToPrimary(const LLWString &s)
+{
+        return FALSE;  // unsupported
+}
 #endif // LL_GTK
 
 LLWindow::LLWindowResolution* LLWindowSDL::getSupportedResolutions(S32 &num_resolutions)
@@ -2092,8 +2149,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
                         buttons = GTK_BUTTONS_YES_NO;
                         break;
                 }
-                win = gtk_message_dialog_new(NULL, flags, messagetype, buttons, "%s",
-                                                                         text.c_str());
+                win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
 
 # if LL_X11
                 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index cebb151..632d8fc 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -80,9 +80,15 @@ public:
         /*virtual*/ void captureMouse();
         /*virtual*/ void releaseMouse();
         /*virtual*/ void setMouseClipping( BOOL b );
+
         /*virtual*/ BOOL isClipboardTextAvailable();
         /*virtual*/ BOOL pasteTextFromClipboard(LLWString &dst);
         /*virtual*/ BOOL copyTextToClipboard(const LLWString & src);
+
+        /*virtual*/ BOOL isPrimaryTextAvailable();
+        /*virtual*/ BOOL pasteTextFromPrimary(LLWString &dst);
+        /*virtual*/ BOOL copyTextToPrimary(const LLWString & src);
+ 
         /*virtual*/ void flashIcon(F32 seconds);
         /*virtual*/ F32 getGamma();
         /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 6280868..b2826c8 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2918,6 +2918,18 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t
         return retval;
 }
 
+void LLWindowWin32::ShellEx(const std::string& command )
+{
+        LLWString url_wstring = utf8str_to_wstring( command );
+        llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
+
+        SHELLEXECUTEINFO sei = { sizeof( sei ) };
+        sei.fMask = SEE_MASK_FLAG_DDEWAIT;
+        sei.nShow = SW_SHOWNORMAL;
+        sei.lpVerb = L"open";
+        sei.lpFile = url_utf16.c_str();
+        ShellExecuteEx( &sei );
+}
 
 void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 237f834..d3ae325 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -111,6 +111,7 @@ public:
         /*virtual*/ void updateLanguageTextInputArea();
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         static std::vector<std::string> getDynamicFallbackFontList();