Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support

8 files changed, 91 insertions, 7 deletions

diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
index afce0c0..5224163 100644
--- a/linden/indra/llwindow/CMakeLists.txt
+++ b/linden/indra/llwindow/CMakeLists.txt
@@ -19,7 +19,6 @@ include(LLRender)
 include(LLVFS)
 include(LLWindow)
 include(LLXML)
-include(Mozlib)
 include(UI)
 
 include_directories(
@@ -55,6 +54,13 @@ set(viewer_HEADER_FILES
     llmousehandler.h
     )
 
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+set(llwindow_LINK_LIBRARIES
+    ${UI_LIBRARIES}     # for GTK
+    ${SDL_LIBRARY}
+    )
+
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
     llkeyboardmacosx.cpp
@@ -98,6 +104,9 @@ if (WINDOWS)
        lldxhardware.h
        llkeyboardwin32.h
        )
+  list(APPEND llwindow_LINK_LIBRARIES
+       comdlg32     # Common Dialogs for ChooseColor
+       )
 endif (WINDOWS)
 
 if (SOLARIS)
@@ -134,6 +143,7 @@ if (SERVER AND NOT WINDOWS AND NOT DARWIN)
     ${server_SOURCE_FILES}
     )
 endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
+  # *TODO: This should probably have target_link_libraries
 
 if (llwindow_HEADER_FILES)
   list(APPEND llwindow_SOURCE_FILES ${llwindow_HEADER_FILES})
@@ -145,4 +155,6 @@ if (VIEWER)
     ${llwindow_SOURCE_FILES}
     ${viewer_SOURCE_FILES}
     )
+  target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
 endif (VIEWER)
+
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 14759cc..5e93ab3 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -37,6 +37,7 @@
 #include "llcoord.h"
 #include "llstring.h"
 #include "llcursortypes.h"
+#include "llsd.h"
 
 class LLSplashScreen;
 
@@ -195,7 +196,7 @@ public:
 // return a platform-specific window reference (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
         virtual void *getPlatformWindow() = 0;
 
-// return the platform-specific window reference we use to initialize llmozlib (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
+// return the platform-specific window reference we use to initialize llqtwebkitlib (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
         virtual void *getMediaWindow();
         
         // control platform's Language Text Input mechanisms.
@@ -208,6 +209,9 @@ public:
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
+        // Provide native key event data
+        virtual LLSD getNativeKeyData() { return LLSD::emptyMap(); }
+
 protected:
         LLWindow(BOOL fullscreen, U32 flags);
         virtual ~LLWindow() {}
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 4dedc03..d68d4df 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -3217,7 +3217,7 @@ void LLWindowMacOSX::ShellEx(const std::string& command)
         }
 }
 
-BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+BOOL LLWindowMacOSX::dialog_color_picker( F32 *r, F32 *g, F32 *b)
 {
         BOOL    retval = FALSE;
         OSErr   error = noErr;
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 9e87e9f..92c73e8 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -117,6 +117,10 @@ public:
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
+        // Provide native key event data
+        /*virtual*/ LLSD getNativeKeyData();
+
+
 protected:
         LLWindowMacOSX(
                 const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 16a583a..16106af 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)
@@ -1602,6 +1606,7 @@ void LLWindowSDL::processMiscNativeEvents()
             // the locale to protect it, as exotic/non-C locales
             // causes our code lots of general critical weirdness
             // and crashness. (SL-35450)
+            // Note: It is unknown if this is still needed now that we use webkit.
             static std::string saved_locale;
             saved_locale = ll_safe_string(setlocale(LC_ALL, NULL));
 
@@ -2227,7 +2232,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;
 
@@ -2396,7 +2434,7 @@ void *LLWindowSDL::getPlatformWindow()
                 return rtnw;
         }
 #endif // LL_GTK && LL_LLMOZLIB_ENABLED
-        // Unixoid mozilla really needs GTK.
+        llassert(false);        // Do we even GET here at all? Note that LL_LLMOZLIB_ENABLED is never defined!
         return NULL;
 }
 
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 39a6007..37b0835 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -154,6 +154,8 @@ protected:
                 BOOL ignore_pixel_depth, U32 fsaa_samples);
         ~LLWindowSDL();
 
+        /*virtual*/ LLSD    getNativeKeyData();
+
         void    initCursors();
         void    quitCursors();
         BOOL    isValid();
@@ -206,12 +208,17 @@ protected:
 
         friend class LLWindowManager;
 
-#if LL_X11
+
 private:
+#if LL_X11
         void x11_set_urgent(BOOL urgent);
         BOOL mFlashing;
         LLTimer mFlashTimer;
 #endif //LL_X11
+        U32 mKeyScanCode;
+        U32 mKeyVirtualKey;
+        SDLMod mKeyModifiers;
+
 };
 
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index e47cab4..12a488a 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -3052,6 +3052,19 @@ void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
         */
 }
 
+/*
+        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 LLWindowWin32::getNativeKeyData()
+{
+        LLSD result = LLSD::emptyMap();
+
+        result["scan_code"] = (S32)mKeyScanCode;
+        result["virtual_key"] = (S32)mKeyVirtualKey;
+
+        return result;
+}
 
 BOOL LLWindowWin32::dialog_color_picker ( F32 *r, F32 *g, F32 *b )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index cc95993..0e40115 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -128,7 +128,7 @@ protected:
         HCURSOR loadColorCursor(LPCTSTR name);
         BOOL    isValid();
         void    moveWindow(const LLCoordScreen& position,const LLCoordScreen& size);
-
+        LLSD    getNativeKeyData();
 
         // Changes display resolution. Returns true if successful
         BOOL    setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh);
@@ -208,6 +208,12 @@ protected:
 
         LLPreeditor             *mPreeditor;
 
+        
+
+        U32                             mKeyCharCode;
+        U32                             mKeyScanCode;
+        U32                             mKeyVirtualKey;
+
         friend class LLWindowManager;
 };