Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

15 files changed, 376 insertions, 52 deletions

diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
index afce0c0..98da751 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,21 @@ set(viewer_HEADER_FILES
     llmousehandler.h
     )
 
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+if (LINUX)
+        set(llwindow_LINK_LIBRARIES
+                ${UI_LIBRARIES}     # for GTK
+                ${SDL_LIBRARY}
+                fontconfig                      # For FCInit and other FC* functions.
+                )
+else (LINUX)
+    set(llwindow_LINK_LIBRARIES
+                ${UI_LIBRARIES}     # for GTK
+                ${SDL_LIBRARY}
+                )
+endif (LINUX)
+
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
     llkeyboardmacosx.cpp
@@ -98,6 +112,9 @@ if (WINDOWS)
        lldxhardware.h
        llkeyboardwin32.h
        )
+  list(APPEND llwindow_LINK_LIBRARIES
+       comdlg32     # Common Dialogs for ChooseColor
+       )
 endif (WINDOWS)
 
 if (SOLARIS)
@@ -134,6 +151,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 +163,6 @@ if (VIEWER)
     ${llwindow_SOURCE_FILES}
     ${viewer_SOURCE_FILES}
     )
+  target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
 endif (VIEWER)
+
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index b936b5d..5b149c9 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -17,6 +17,8 @@
 #include <stdio.h>
 
 #ifdef _WIN32
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 # include <windows.h>
 #endif
 
diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index e0cb82d..d8058ba 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -47,6 +47,7 @@
 
 #include "llstring.h"
 #include "llstl.h"
+#include "lltimer.h"
 
 void (*gWriteDebug)(const char* msg) = NULL;
 LLDXHardware gDXHardware;
diff --git a/linden/indra/llwindow/llmousehandler.cpp b/linden/indra/llwindow/llmousehandler.cpp
index ae2f147..e3ea979 100644
--- a/linden/indra/llwindow/llmousehandler.cpp
+++ b/linden/indra/llwindow/llmousehandler.cpp
@@ -57,3 +57,9 @@ BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType cli
         }
         return handled;
 }
+
+BOOL LLMouseHandler::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        BOOL handled = FALSE;
+        return handled;
+}
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index 7bd0f2e..1a4ea65 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -67,6 +67,7 @@ public:
 
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
+        virtual BOOL    handleHScrollWheel(S32 x, S32 y, S32 clicks);
         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 53ca68d..6ac42b2 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -155,6 +155,10 @@ void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
 {
 }
 
+void LLWindowCallbacks::handleHScrollWheel(LLWindow *window, S32 clicks)
+{
+}
+
 void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
 {
 }
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 14759cc..cbcfc5a 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;
 
@@ -68,6 +69,7 @@ public:
         virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
         virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
+        virtual void handleHScrollWheel(LLWindow *window,  S32 clicks);
         virtual void handleResize(LLWindow *window,  S32 width,  S32 height);
         virtual void handleFocus(LLWindow *window);
         virtual void handleFocusLost(LLWindow *window);
@@ -195,7 +197,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 +210,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-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h
index ed5d7b1..9821698 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.h
+++ b/linden/indra/llwindow/llwindowmacosx-objc.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -31,6 +31,14 @@
  * $/LicenseInfo$
  */
 
+#include "llimagej2c.h"
+#include <Carbon/Carbon.h>
+
+#ifdef __OBJC__
+#ifdef BOOL
+#undef BOOL
+#endif
+#endif // __OBJC__
 
 // This will actually hold an NSCursor*, but that type is only available in objective C.
 typedef void *CursorRef;
@@ -40,4 +48,5 @@ void setupCocoa();
 CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY);
 OSErr releaseImageCursor(CursorRef ref);
 OSErr setImageCursor(CursorRef ref);
-
+BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image);
+BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image, std::string ext);
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index da01c2a..34ec445 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,6 +32,8 @@
  */
 
 #include <AppKit/AppKit.h>
+#include <Accelerate/Accelerate.h>
+#include <Quartz/Quartz.h>
 
 /*
  * These functions are broken out into a separate file because the
@@ -41,6 +43,68 @@
  */
 
 #include "llwindowmacosx-objc.h"
+#include "lldir.h"
+
+BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image, std::string ext)
+{
+        CFDataRef theData = CFDataCreate(kCFAllocatorDefault, data, len);
+
+        CGImageSourceRef srcRef = CGImageSourceCreateWithData(theData, NULL);
+        CGImageRef image_ref = CGImageSourceCreateImageAtIndex(srcRef, 0, NULL);
+        CFRelease(srcRef);
+
+        size_t width = CGImageGetWidth(image_ref);
+        size_t height = CGImageGetHeight(image_ref);
+        size_t comps = CGImageGetBitsPerPixel(image_ref) / 8;
+        size_t bytes_per_row = CGImageGetBytesPerRow(image_ref);
+        CFDataRef result = CGDataProviderCopyData(CGImageGetDataProvider(image_ref));
+        UInt8* bitmap = (UInt8*)CFDataGetBytePtr(result);
+
+        CGImageAlphaInfo format = CGImageGetAlphaInfo(image_ref);
+        if (comps == 4)
+        {
+                vImage_Buffer vb;
+                vb.data = bitmap;
+                vb.height = height;
+                vb.width = width;
+                vb.rowBytes = bytes_per_row;
+
+                if (format & kCGImageAlphaPremultipliedFirst)
+                {
+                        // Ele: Skip unpremultiplication for PSD, PNG and TGA files
+                        if (ext != std::string("psd") && ext != std::string("tga") && ext != std::string("png"))
+                                vImageUnpremultiplyData_ARGB8888(&vb, &vb, 0);
+                }
+                else if (format & kCGImageAlphaPremultipliedLast)
+                {
+                        // Ele: Photoshop Native Transparency needs unmultiplication
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+        }
+
+        raw_image->resize(width, height, comps);
+        memcpy(raw_image->getData(), bitmap, height * bytes_per_row);
+        raw_image->verticalFlip();
+
+        CFRelease(theData);
+        CGImageRelease(image_ref);
+        CFRelease(result);
+
+        return TRUE;
+}
+
+BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image)
+{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSURL *url = [[NSURL alloc] initFileURLWithPath:[NSString stringWithCString:filename.c_str()]];
+        NSData *data = [NSData dataWithContentsOfURL:url];
+
+        std::string ext = gDirUtilp->getExtension(filename);
+
+        BOOL result = decodeImageQuartz((UInt8*)[data bytes], [data length], raw_image, ext);
+        [pool release];
+        return result;
+}
 
 void setupCocoa()
 {
@@ -116,4 +180,3 @@ OSErr setImageCursor(CursorRef ref)
         
         return noErr;
 }
-
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 613d147..93bff99 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -250,6 +250,7 @@ LLWindowMacOSX::LLWindowMacOSX(const std::string& title, const std::string& name
         mTSMScriptCode = 0;
         mTSMLangCode = 0;
         mPreeditor = NULL;
+        mRawKeyEvent = NULL;
         mFSAASamples = fsaa_samples;
         mForceRebuild = FALSE;
         
@@ -1029,6 +1030,7 @@ void LLWindowMacOSX::hide()
         HideWindow(mWindow);
 }
 
+//virtual
 void LLWindowMacOSX::minimize()
 {
         setMouseClipping(FALSE);
@@ -1036,6 +1038,7 @@ void LLWindowMacOSX::minimize()
         CollapseWindow(mWindow, true);
 }
 
+//virtual
 void LLWindowMacOSX::restore()
 {
         show();
@@ -1153,16 +1156,15 @@ void LLWindowMacOSX::gatherInput()
                         }
                         break;
 
-                case kHighLevelEvent:
-                        AEProcessAppleEvent (&evt);
-                        break;
-
                 case updateEvt:
                         // We shouldn't be getting these regularly (since our window will be buffered), but we need to handle them correctly...
                         BeginUpdate((WindowRef)evt.message);
                         EndUpdate((WindowRef)evt.message);
                         break;
 
+                default:
+                        AEProcessAppleEvent (&evt);
+                        break;
                 }
         }
 }
@@ -1384,11 +1386,11 @@ void LLWindowMacOSX::setMouseClipping( BOOL b )
 
         if(b)
         {
-                //              llinfos << "setMouseClipping(TRUE)" << llendl
+                //              llinfos << "setMouseClipping(TRUE)" << llendl;
         }
         else
         {
-                //              llinfos << "setMouseClipping(FALSE)" << llendl
+                //              llinfos << "setMouseClipping(FALSE)" << llendl;
         }
 
         adjustCursorDecouple();
@@ -1406,7 +1408,7 @@ BOOL LLWindowMacOSX::setCursorPosition(const LLCoordWindow position)
 
         CGPoint newPosition;
 
-        //      llinfos << "setCursorPosition(" << screen_pos.mX << ", " << screen_pos.mY << ")" << llendl
+        //      llinfos << "setCursorPosition(" << screen_pos.mX << ", " << screen_pos.mY << ")" << llendl;
 
         newPosition.x = screen_pos.mX;
         newPosition.y = screen_pos.mY;
@@ -1437,7 +1439,7 @@ static void fixOrigin(void)
         ::GetPortBounds(port, &portrect);
         if((portrect.left != 0) || (portrect.top != 0))
         {
-                // Mozilla sometimes changes our port origin.  Fuckers.
+                // Mozilla sometimes changes our port origin.
                 ::SetOrigin(0,0);
         }
 }
@@ -2129,10 +2131,11 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 {
                                         UInt32 modifiers = 0;
 
+
                                         // First, process the raw event.
                                         {
-                                                EventRef rawEvent;
-
+                                                EventRef rawEvent = NULL;
+                                                
                                                 // Get the original event and extract the modifier keys, so we can ignore command-key events.
                                                 if (GetEventParameter(event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent) == noErr)
                                                 {
@@ -2141,6 +2144,9 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
                                                         // and call this function recursively to handle the raw key event.
                                                         eventHandler (myHandler, rawEvent);
+                                                        
+                                                        // save the raw event until we're done processing the unicode input as well.
+                                                        mRawKeyEvent = rawEvent;
                                                 }
                                         }
 
@@ -2168,11 +2174,8 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                 }
                                                 else
                                                 {
-                                                        MASK mask = 0;
-                                                        if(modifiers & shiftKey) { mask |= MASK_SHIFT; }
-                                                        if(modifiers & (cmdKey | controlKey)) { mask |= MASK_CONTROL; }
-                                                        if(modifiers & optionKey) { mask |= MASK_ALT; }
-
+                                                        MASK mask = LLWindowMacOSX::modifiersToMask(modifiers);
+                                                        
                                                         llassert( actualType == typeUnicodeText );
 
                                                         // The result is a UTF16 buffer.  Pass the characters in turn to handleUnicodeChar.
@@ -2194,6 +2197,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                 delete[] buffer;
                                         }
 
+                                        mRawKeyEvent = NULL;
                                         result = err;
                                 }
                                 break;
@@ -2268,6 +2272,9 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                         GetEventParameter (event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode);
                         GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
 
+                        // save the raw event so getNativeKeyData can use it.
+                        mRawKeyEvent = event;
+
                         //                      printf("key event, key code = 0x%08x, char code = 0x%02x (%c), modifiers = 0x%08x\n", keyCode, charCode, (char)charCode, modifiers);
                         //                      fflush(stdout);
 
@@ -2363,6 +2370,8 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 result = eventNotHandledErr;
                                 break;
                         }
+                        
+                        mRawKeyEvent = NULL;
                 }
                 break;
 
@@ -2375,6 +2384,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 HIPoint                         location = {0.0f, 0.0f};
                                 UInt32                          modifiers = 0;
                                 UInt32                          clickCount = 1;
+                                EventMouseWheelAxis     wheelAxis = kEventMouseWheelAxisX;
                                 long                            wheelDelta = 0;
                                 LLCoordScreen           inCoords;
                                 LLCoordGL                       outCoords;
@@ -2384,6 +2394,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(location), NULL, &location);
                                 GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifiers), NULL, &modifiers);
                                 GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger, NULL, sizeof(wheelDelta), NULL, &wheelDelta);
+                                GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(wheelAxis), NULL, &wheelAxis);
                                 GetEventParameter(event, kEventParamClickCount, typeUInt32, NULL, sizeof(clickCount), NULL, &clickCount);
 
                                 inCoords.mX = llround(location.x);
@@ -2492,14 +2503,31 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
                                 case kEventMouseWheelMoved:
                                         {
-                                                static S32  z_delta = 0;
+                                                switch (wheelAxis){
+                                                case kEventMouseWheelAxisX:
 
-                                                z_delta += wheelDelta;
+                                                        static S32  wheel_x_delta = 0;
 
-                                                if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
-                                                {
-                                                        mCallbacks->handleScrollWheel(this, -z_delta / WHEEL_DELTA);
-                                                        z_delta = 0;
+                                                        wheel_x_delta += wheelDelta;
+
+                                                        if (wheel_x_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_x_delta)
+                                                        {
+                                                                mCallbacks->handleHScrollWheel(this, wheel_x_delta / WHEEL_DELTA);
+                                                                wheel_x_delta = 0;
+                                                        }
+                                                        break;
+                                                case kEventMouseWheelAxisY:
+
+                                                        static S32  wheel_y_delta = 0;
+
+                                                        wheel_y_delta += wheelDelta;
+
+                                                        if (wheel_y_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_y_delta)
+                                                        {
+                                                                mCallbacks->handleScrollWheel(this, -wheel_y_delta / WHEEL_DELTA);
+                                                                wheel_y_delta = 0;
+                                                        }
+                                                        break;
                                                 }
                                         }
                                         result = noErr;
@@ -3194,8 +3222,87 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
         }
 }
 
+LLSD LLWindowMacOSX::getNativeKeyData()
+{
+        LLSD result = LLSD::emptyMap();
+        
+        if(mRawKeyEvent)
+        {
+                char char_code = 0;
+                UInt32 key_code = 0;
+                UInt32 modifiers = 0;
+                UInt32 keyboard_type = 0;
+                
+                GetEventParameter (mRawKeyEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &char_code);
+                GetEventParameter (mRawKeyEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &key_code);
+                GetEventParameter (mRawKeyEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+                GetEventParameter (mRawKeyEvent, kEventParamKeyboardType, typeUInt32, NULL, sizeof(UInt32), NULL, &keyboard_type);
+
+                result["char_code"] = (S32)char_code;
+                result["key_code"] = (S32)key_code;
+                result["modifiers"] = (S32)modifiers;
+                result["keyboard_type"] = (S32)keyboard_type;
+                
+#if 0
+                // This causes trouble for control characters -- apparently character codes less than 32 (escape, control-A, etc)
+                // cause llsd serialization to create XML that the llsd deserializer won't parse!
+                std::string unicode;
+                OSStatus err = noErr;
+                EventParamType actualType = typeUTF8Text;
+                UInt32 actualSize = 0;
+                char *buffer = NULL;
+                
+                err = GetEventParameter (mRawKeyEvent, kEventParamKeyUnicodes, typeUTF8Text, &actualType, 0, &actualSize, NULL);
+                if(err == noErr)
+                {
+                        // allocate a buffer and get the actual data.
+                        buffer = new char[actualSize];
+                        err = GetEventParameter (mRawKeyEvent, kEventParamKeyUnicodes, typeUTF8Text, &actualType, actualSize, &actualSize, buffer);
+                        if(err == noErr)
+                        {
+                                unicode.assign(buffer, actualSize);
+                        }
+                        delete[] buffer;
+                }
+                
+                result["unicode"] = unicode;
+#endif
+
+        }
+
+
+        lldebugs << "native key data is: " << result << llendl;
+        
+        return result;
+}
+
+void LLWindowMacOSX::ShellEx(const std::string& command)
+{
+        OSStatus result = noErr;
+        CFURLRef urlRef = NULL;
+
+        CFStringRef     stringRef = CFStringCreateWithCString(NULL, command.c_str(), kCFStringEncodingUTF8);
+        if (stringRef)
+        {
+                urlRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, stringRef, kCFURLPOSIXPathStyle, false);
+                CFRelease(stringRef);
+        }
+
+        if (urlRef)
+        {
+                result = LSOpenCFURLRef(urlRef, NULL);          
+                if (result != noErr)
+                        llinfos << "Error " << result << " on open." << llendl;
 
-BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+                CFRelease(urlRef);
+        }
+        else
+        {
+                llinfos << "Error: couldn't create URL." << llendl;
+        }
+}
+
+BOOL LLWindowMacOSX::dialog_color_picker( F32 *r, F32 *g, F32 *b)
 {
         BOOL    retval = FALSE;
         OSErr   error = noErr;
@@ -3370,3 +3477,13 @@ std::vector<std::string> LLWindowMacOSX::getDynamicFallbackFontList()
         return std::vector<std::string>();
 }
 
+// static
+MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers)
+{
+        MASK mask = 0;
+        if(modifiers & shiftKey) { mask |= MASK_SHIFT; }
+        if(modifiers & (cmdKey | controlKey)) { mask |= MASK_CONTROL; }
+        if(modifiers & optionKey) { mask |= MASK_ALT; }
+        return mask;
+}       
+
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index bf5bfc0..8213b69 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,6 +34,7 @@
 #define LL_LLWINDOWMACOSX_H
 
 #include "llwindow.h"
+#include "lltimer.h"
 
 #include <Carbon/Carbon.h>
 #include <AGL/agl.h>
@@ -55,6 +56,8 @@ public:
         /*virtual*/ BOOL getMinimized();
         /*virtual*/ BOOL getMaximized();
         /*virtual*/ BOOL maximize();
+        /*virtual*/ void minimize();
+        /*virtual*/ void restore();
         /*virtual*/ BOOL getFullscreen();
         /*virtual*/ BOOL getPosition(LLCoordScreen *position);
         /*virtual*/ BOOL getSize(LLCoordScreen *size);
@@ -113,9 +116,14 @@ public:
         /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b);
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         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,
@@ -138,9 +146,6 @@ protected:
         // Restore the display resolution to its value before we ran the app.
         BOOL    resetDisplayResolution();
 
-        void    minimize();
-        void    restore();
-
         BOOL    shouldPostQuit() { return mPostQuit; }
 
 
@@ -159,8 +164,8 @@ protected:
         void adjustCursorDecouple(bool warpingMouse = false);
         void fixWindowSize(void);
         void stopDockTileBounce();
-
-
+        static MASK modifiersToMask(SInt16 modifiers);
+        
         //
         // Platform specific variables
         //
@@ -208,6 +213,7 @@ protected:
 
         friend class LLWindowManager;
         static WindowRef sMediaWindow;
+        EventRef        mRawKeyEvent;
 
 };
 
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index bf339f2..2f9de6b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -42,6 +42,7 @@
 #include "llstring.h"
 #include "lldir.h"
 #include "llfindlocale.h"
+#include "lltimer.h"
 
 #include "indra_constants.h"
 
@@ -250,6 +251,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)
@@ -627,6 +632,15 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
                         mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
                 }
 
+                while (!mWindow && mFSAASamples > 0)
+                {
+                        llwarns << "Window creating failed with " << mFSAASamples << "x FSAA."<<llendl;
+                        mFSAASamples = mFSAASamples>>1;
+                        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, mFSAASamples ? 1 : 0);
+                        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, mFSAASamples);
+                        mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
+                }
+
                 if (!mWindow)
                 {
                         llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl;
@@ -671,12 +685,12 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
         glGetIntegerv(GL_DEPTH_BITS, &depthBits);
         glGetIntegerv(GL_STENCIL_BITS, &stencilBits);
         
-        llinfos << "GL buffer:" << llendl
-        llinfos << "  Red Bits " << S32(redBits) << llendl
-        llinfos << "  Green Bits " << S32(greenBits) << llendl
-        llinfos << "  Blue Bits " << S32(blueBits) << llendl
-        llinfos << "  Alpha Bits " << S32(alphaBits) << llendl
-        llinfos << "  Depth Bits " << S32(depthBits) << llendl
+        llinfos << "GL buffer:" << llendl;
+        llinfos << "  Red Bits " << S32(redBits) << llendl;
+        llinfos << "  Green Bits " << S32(greenBits) << llendl;
+        llinfos << "  Blue Bits " << S32(blueBits) << llendl;
+        llinfos << "  Alpha Bits " << S32(alphaBits) << llendl;
+        llinfos << "  Depth Bits " << S32(depthBits) << llendl;
         llinfos << "  Stencil Bits " << S32(stencilBits) << llendl;
 
         GLint colorBits = redBits + greenBits + blueBits + alphaBits;
@@ -1602,6 +1616,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));
 
@@ -1725,7 +1740,10 @@ void LLWindowSDL::gatherInput()
                                         mCallbacks->handleScrollWheel(this, -1);
                 else if (event.button.button == 5)  // mousewheel down...thanks to X11 for making SDL consider these "buttons".
                                         mCallbacks->handleScrollWheel(this, 1);
-
+                else if (event.button.button == 6)
+                                        mCallbacks->handleHScrollWheel(this, -1);
+                else if (event.button.button == 7)
+                                        mCallbacks->handleHScrollWheel(this, 1);
                 break;
             }
 
@@ -1935,11 +1953,6 @@ void LLWindowSDL::setCursor(ECursorType cursor)
         }
 }
 
-ECursorType LLWindowSDL::getCursor()
-{
-        return mCurrentCursor;
-}
-
 void LLWindowSDL::initCursors()
 {
         int i;
@@ -2227,7 +2240,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 +2442,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..e632dfe 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -36,6 +36,7 @@
 // Simple Directmedia Layer (http://libsdl.org/) implementation of LLWindow class
 
 #include "llwindow.h"
+#include "lltimer.h"
 
 #include "SDL/SDL.h"
 #include "SDL/SDL_endian.h"
@@ -77,7 +78,6 @@ public:
         /*virtual*/ void hideCursorUntilMouseMove();
         /*virtual*/ BOOL isCursorHidden();
         /*virtual*/ void setCursor(ECursorType cursor);
-        /*virtual*/ ECursorType getCursor();
         /*virtual*/ void captureMouse();
         /*virtual*/ void releaseMouse();
         /*virtual*/ void setMouseClipping( BOOL b );
@@ -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..dacee34 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -59,6 +59,8 @@
 
 #include "llpreeditor.h"
 
+#include "llfasttimer.h"
+
 // culled from winuser.h
 #ifndef WM_MOUSEWHEEL /* Added to be compatible with later SDK's */
 const S32       WM_MOUSEWHEEL = 0x020A;
@@ -2257,6 +2259,22 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                 }
                                 return 0;
                         }
+#ifdef WM_MOUSEHWHEEL
+                case WM_MOUSEHWHEEL:
+                        {
+                                window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_MOUSEHWHEEL");
+                                static short z_delta = 0;
+
+                                z_delta += HIWORD(w_param);
+
+                                if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
+                                {
+                                        window_imp->mCallbacks->handleHScrollWheel(window_imp, z_delta / WHEEL_DELTA);
+                                        z_delta = 0;
+                                }
+                                return 0;
+                        }
+#endif //WM_MOUSEHWHEEL
                         /*
                         // TODO: add this after resolving _WIN32_WINNT issue
                         case WM_MOUSELEAVE:
@@ -3052,6 +3070,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;
 };