Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 38 insertions, 1 deletions

diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 16a583a..fa53c84 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -250,6 +250,10 @@ LLWindowSDL::LLWindowSDL(const std::string& title, S32 x, S32 y, S32 width,
 #if LL_X11
         mFlashing = FALSE;
 #endif // LL_X11
+
+        mKeyScanCode = 0;
+        mKeyVirtualKey = 0;
+        mKeyModifiers = KMOD_NONE;
 }
 
 static SDL_Surface *Load_BMP_Resource(const char *basename)
@@ -2227,7 +2231,40 @@ static void color_changed_callback(GtkWidget *widget,
         gtk_color_selection_get_current_color(colorsel, colorp);
 }
 
-BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+
+/*
+        Make the raw keyboard data available - used to poke through to LLQtWebKit so
+        that Qt/Webkit has access to the virtual keycodes etc. that it needs
+*/
+LLSD LLWindowSDL::getNativeKeyData()
+{
+        LLSD result = LLSD::emptyMap();
+
+        U32 modifiers = 0; // pretend-native modifiers... oh what a tangled web we weave!
+
+        // we go through so many levels of device abstraction that I can't really guess
+        // what a plugin under GDK under Qt under SL under SDL under X11 considers
+        // a 'native' modifier mask.  this has been sort of reverse-engineered... they *appear*
+        // to match GDK consts, but that may be co-incidence.
+        modifiers |= (mKeyModifiers & KMOD_LSHIFT) ? 0x0001 : 0;
+        modifiers |= (mKeyModifiers & KMOD_RSHIFT) ? 0x0001 : 0;// munge these into the same shift
+        modifiers |= (mKeyModifiers & KMOD_CAPS)   ? 0x0002 : 0;
+        modifiers |= (mKeyModifiers & KMOD_LCTRL)  ? 0x0004 : 0;
+        modifiers |= (mKeyModifiers & KMOD_RCTRL)  ? 0x0004 : 0;// munge these into the same ctrl
+        modifiers |= (mKeyModifiers & KMOD_LALT)   ? 0x0008 : 0;// untested
+        modifiers |= (mKeyModifiers & KMOD_RALT)   ? 0x0008 : 0;// untested
+        // *todo: test ALTs - I don't have a case for testing these.  Do you?
+        // *todo: NUM? - I don't care enough right now (and it's not a GDK modifier).
+
+        result["scan_code"] = (S32)mKeyScanCode;
+        result["virtual_key"] = (S32)mKeyVirtualKey;
+        result["modifiers"] = (S32)modifiers;
+
+        return result;
+}
+
+
+BOOL LLWindowSDL::dialog_color_picker( F32 *r, F32 *g, F32 *b)
 {
         BOOL rtn = FALSE;