4 files changed, 93 insertions, 17 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h
index a96246e..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
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index 80ad087..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
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index d68d4df..99daa4d 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();
@@ -1436,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);
         }
 }
@@ -2128,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)
                                                 {
@@ -2140,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;
                                                 }
                                         }
 
@@ -2167,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.
@@ -2193,6 +2197,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                 delete[] buffer;
                                         }
 
+                                        mRawKeyEvent = NULL;
                                         result = err;
                                 }
                                 break;
@@ -2267,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);
 
@@ -2362,6 +2370,8 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 result = eventNotHandledErr;
                                 break;
                         }
+                        
+                        mRawKeyEvent = NULL;
                 }
                 break;
 
@@ -3162,6 +3172,8 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
         OSStatus result = noErr;
         CFURLRef urlRef = NULL;
 
+        llinfos << "Opening URL " << escaped_url << llendl;
+
         CFStringRef     stringRef = CFStringCreateWithCString(NULL, escaped_url.c_str(), kCFStringEncodingUTF8);
         if (stringRef)
         {
@@ -3191,6 +3203,60 @@ 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;
@@ -3392,3 +3458,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 d4c1b44..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
@@ -56,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);
@@ -144,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; }
 
 
@@ -165,8 +164,8 @@ protected:
         void adjustCursorDecouple(bool warpingMouse = false);
         void fixWindowSize(void);
         void stopDockTileBounce();
-
-
+        static MASK modifiersToMask(SInt16 modifiers);
+        
         //
         // Platform specific variables
         //
@@ -214,6 +213,7 @@ protected:
 
         friend class LLWindowManager;
         static WindowRef sMediaWindow;
+        EventRef        mRawKeyEvent;
 
 };