update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not loading.

Issue: llqtwebkit needs update for Linux 64bit

5 files changed, 275 insertions, 10 deletions

diff --git a/linden/indra/llplugin/slplugin/CMakeLists.txt b/linden/indra/llplugin/slplugin/CMakeLists.txt
index 4a7d670..81d9299 100755
--- a/linden/indra/llplugin/slplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/slplugin/CMakeLists.txt
@@ -16,6 +16,7 @@ include_directories(
 if (DARWIN)
     include(CMakeFindFrameworks)
     find_library(CARBON_LIBRARY Carbon)
+    find_library(COCOA_LIBRARY Cocoa)
 endif (DARWIN)
 
 
@@ -25,11 +26,33 @@ set(SLPlugin_SOURCE_FILES
     slplugin.cpp
     )
 
+if (DARWIN)
+  list(APPEND SLPlugin_SOURCE_FILES
+    slplugin-objc.mm
+  )
+  list(APPEND SLPlugin_HEADER_FILES
+    slplugin-objc.h
+  )
+endif (DARWIN)
+
+set_source_files_properties(${SLPlugin_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+if (SLPlugin_HEADER_FILES)
+  list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES})
+endif (SLPlugin_HEADER_FILES)
+
 add_executable(SLPlugin
     WIN32
+    MACOSX_BUNDLE
     ${SLPlugin_SOURCE_FILES}
 )
 
+set_target_properties(SLPlugin
+  PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
+  )
+
 target_link_libraries(SLPlugin
   ${LLPLUGIN_LIBRARIES}
   ${LLMESSAGE_LIBRARIES}
@@ -44,12 +67,16 @@ add_dependencies(SLPlugin
 )
 
 if (DARWIN)
-  # Mac version needs to link against carbon, and also needs an embedded plist (to set LSBackgroundOnly)
-  target_link_libraries(SLPlugin ${CARBON_LIBRARY})
-  set_target_properties(
-    SLPlugin
-    PROPERTIES
-    LINK_FLAGS "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist"
+  # Mac version needs to link against Carbon
+  target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})
+  # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
+  add_custom_command(
+    TARGET SLPlugin POST_BUILD
+    COMMAND mkdir
+    ARGS
+      -p
+      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
   )
 endif (DARWIN)
 
+#ll_deploy_sharedlibs_command(SLPlugin)
diff --git a/linden/indra/llplugin/slplugin/slplugin-objc.h b/linden/indra/llplugin/slplugin/slplugin-objc.h
new file mode 100644
index 0000000..42029e4
--- /dev/null
+++ b/linden/indra/llplugin/slplugin/slplugin-objc.h
@@ -0,0 +1,42 @@
+/**
+ * @file slplugin-objc.h
+ * @brief Header file for slplugin-objc.mm.
+ *
+ * @cond
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ * 
+ * Copyright (c) 2010, 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$
+ * 
+ *
+ * @endcond
+ */
+
+
+/* Defined in slplugin-objc.mm: */
+void setupCocoa();
+void createAutoReleasePool();
+void deleteAutoReleasePool();
diff --git a/linden/indra/llplugin/slplugin/slplugin-objc.mm b/linden/indra/llplugin/slplugin/slplugin-objc.mm
new file mode 100644
index 0000000..125b264
--- /dev/null
+++ b/linden/indra/llplugin/slplugin/slplugin-objc.mm
@@ -0,0 +1,89 @@
+/**
+ * @file slplugin-objc.mm
+ * @brief Objective-C++ file for use with the loader shell, so we can use a couple of Cocoa APIs.
+ *
+ * @cond
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ * 
+ * Copyright (c) 2010, 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$
+ * 
+ *
+ * @endcond
+ */
+
+
+#include <AppKit/AppKit.h>
+
+#include "slplugin-objc.h"
+
+
+void setupCocoa()
+{
+        static bool inited = false;
+        
+        if(!inited)
+        {
+                createAutoReleasePool();
+                
+                // The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents.
+                // ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr' 
+                // when init'ing the Cocoa App window.          
+                [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
+                
+                // This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor":
+                //   http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html
+                
+                //      Needed for Carbon based applications which call into Cocoa
+                NSApplicationLoad();
+
+                //      Must first call [[[NSWindow alloc] init] release] to get the NSWindow machinery set up so that NSCursor can use a window to cache the cursor image
+                [[[NSWindow alloc] init] release];
+                
+                deleteAutoReleasePool();
+                
+                inited = true;
+        }
+}
+
+static NSAutoreleasePool *sPool = NULL;
+
+void createAutoReleasePool()
+{
+        if(!sPool)
+        {
+                sPool = [[NSAutoreleasePool alloc] init];
+        }
+}
+
+void deleteAutoReleasePool()
+{
+        if(sPool)
+        {
+                [sPool release];
+                sPool = NULL;
+        }
+}
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index 649d568..64c087b 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -46,6 +46,7 @@
 
 #if LL_DARWIN
         #include <Carbon/Carbon.h>
+        #include "slplugin-objc.h"
 #endif
 
 #if LL_DARWIN || LL_LINUX
@@ -53,7 +54,7 @@
 #endif
 
 /*
-        On Mac OS, since we call WaitNextEvent, this process will show up in the dock unless we set the LSBackgroundOnly flag in the Info.plist.
+        On Mac OS, since we call WaitNextEvent, this process will show up in the dock unless we set the LSBackgroundOnly or LSUIElement flag in the Info.plist.
 
         Normally non-bundled binaries don't have an info.plist file, but it's possible to embed one in the binary by adding this to the linker flags:
 
@@ -62,7 +63,8 @@
         which means adding this to the gcc flags:
 
         -Wl,-sectcreate,__TEXT,__info_plist,/path/to/slplugin_info.plist
-
+        
+        Now that SLPlugin is a bundled app on the Mac, this is no longer necessary (it can just use a regular Info.plist file), but I'm leaving this comment in for posterity.
 */
 
 #if LL_DARWIN || LL_LINUX
@@ -230,10 +232,19 @@ int main(int argc, char **argv)
         signal(SIGSYS, &crash_handler);         // non-existent system call invoked
 #endif
 
+#if LL_DARWIN
+        setupCocoa();
+        createAutoReleasePool();
+#endif
+
         LLPluginProcessChild *plugin = new LLPluginProcessChild();
 
         plugin->init(port);
 
+#if LL_DARWIN
+                deleteAutoReleasePool();
+#endif
+
         LLTimer timer;
         timer.start();
 
@@ -242,10 +253,28 @@ int main(int argc, char **argv)
 #endif
 
 #if LL_DARWIN
+        // If the plugin opens a new window (such as the Flash plugin's fullscreen player), we may need to bring this plugin process to the foreground.
+        // Use this to track the current frontmost window and bring this process to the front if it changes.
+        WindowRef front_window = NULL;
+        WindowGroupRef layer_group = NULL;
+        int window_hack_state = 0;
+        CreateWindowGroup(kWindowGroupAttrFixedLevel, &layer_group);
+        if(layer_group)
+        {
+                // Start out with a window layer that's way out in front (fixes the problem with the menubar not getting hidden on first switch to fullscreen youtube)
+                SetWindowGroupName(layer_group, CFSTR("SLPlugin Layer"));
+                SetWindowGroupLevel(layer_group, kCGOverlayWindowLevel);                
+        }
+#endif
+
+#if LL_DARWIN
         EventTargetRef event_target = GetEventDispatcherTarget();
 #endif
         while(!plugin->isDone())
         {
+#if LL_DARWIN
+                createAutoReleasePool();
+#endif
                 timer.reset();
                 plugin->idle();
 #if LL_DARWIN
@@ -257,6 +286,80 @@ int main(int argc, char **argv)
                                 SendEventToEventTarget (event, event_target);
                                 ReleaseEvent(event);
                         }
+                        
+                        // Check for a change in this process's frontmost window.
+                        if(FrontWindow() != front_window)
+                        {
+                                ProcessSerialNumber self = { 0, kCurrentProcess };
+                                ProcessSerialNumber parent = { 0, kNoProcess };
+                                ProcessSerialNumber front = { 0, kNoProcess };
+                                Boolean this_is_front_process = false;
+                                Boolean parent_is_front_process = false;
+                                {
+                                        // Get this process's parent
+                                        ProcessInfoRec info;
+                                        info.processInfoLength = sizeof(ProcessInfoRec);
+                                        info.processName = NULL;
+                                        info.processAppSpec = NULL;
+                                        if(GetProcessInformation( &self, &info ) == noErr)
+                                        {
+                                                parent = info.processLauncher;
+                                        }
+                                        
+                                        // and figure out whether this process or its parent are currently frontmost
+                                        if(GetFrontProcess(&front) == noErr)
+                                        {
+                                                (void) SameProcess(&self, &front, &this_is_front_process);
+                                                (void) SameProcess(&parent, &front, &parent_is_front_process);
+                                        }
+                                }
+                                                                
+                                if((FrontWindow() != NULL) && (front_window == NULL))
+                                {
+                                        // Opening the first window
+                                        
+                                        if(window_hack_state == 0)
+                                        {
+                                                // Next time through the event loop, lower the window group layer
+                                                window_hack_state = 1;
+                                        }
+
+                                        if(layer_group)
+                                        {
+                                                SetWindowGroup(FrontWindow(), layer_group);
+                                        }
+                                        
+                                        if(parent_is_front_process)
+                                        {
+                                                // Bring this process's windows to the front.
+                                                (void) SetFrontProcess( &self );
+                                        }
+
+                                        ActivateWindow(FrontWindow(), true);                                    
+                                }
+                                else if((FrontWindow() == NULL) && (front_window != NULL))
+                                {
+                                        // Closing the last window
+                                        
+                                        if(this_is_front_process)
+                                        {
+                                                // Try to bring this process's parent to the front
+                                                (void) SetFrontProcess(&parent);
+                                        }
+                                }
+                                else if(window_hack_state == 1)
+                                {
+                                        if(layer_group)
+                                        {
+                                                // Set the window group level back to something less extreme
+                                                SetWindowGroupLevel(layer_group, kCGNormalWindowLevel);
+                                        }
+                                        window_hack_state = 2;
+                                }
+
+                                front_window = FrontWindow();
+
+                        }
                 }
 #endif
                 F64 elapsed = timer.getElapsedTimeF64();
@@ -289,6 +392,10 @@ int main(int argc, char **argv)
         // exception handler such as QuickTime.
         //checkExceptionHandler();
 #endif
+
+#if LL_DARWIN
+                deleteAutoReleasePool();
+#endif
         }
 
         delete plugin;
diff --git a/linden/indra/llplugin/slplugin/slplugin_info.plist b/linden/indra/llplugin/slplugin/slplugin_info.plist
index b1daf87..c459738 100755
--- a/linden/indra/llplugin/slplugin/slplugin_info.plist
+++ b/linden/indra/llplugin/slplugin/slplugin_info.plist
@@ -6,7 +6,7 @@
         <string>English</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
-        <key>LSBackgroundOnly</key>
-        <true/>
+        <key>LSUIElement</key>
+        <string>1</string>
 </dict>
 </plist>