Attachment #173982 for bug #281375

Attachment #173982: Removes BeOS code from nsAppRunner and puts it in nsAppSupportBeOS (toolkit and xpfe) for bug #281375

View | Details | Raw Unified | Return to bug 281375
Collapse All | Expand All

-      Line
+  Link Here
-       Lines 21-26
+  Link Here
+ *
  * Contributor(s):
  *   Takashi Toyoshima <toyoshim@be-in.org>
+ *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
-       Lines 42-47
+  Link Here
 #include "nsIObserver.h"
 #include <Application.h>
+#include <AppFileInfo.h>
 #include <Window.h>
 #include <View.h>
 #include <StringView.h>
-       Lines 54-100
+  Link Here
 #define DEBUG_SPLASH 1
 #endif
+class nsNativeAppSupportBeOS : public nsNativeAppSupportBase,  public nsIObserver
+{
 public:
+    nsNativeAppSupportBeOS();
+    ~nsNativeAppSupportBeOS();
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSINATIVEAPPSUPPORT
+    NS_DECL_NSIOBSERVER
+private:
+   nsresult LoadBitmap();
+   BWindow *window;
+   BBitmap *bitmap;
+   BStringView *textView;
+}; // nsNativeAppSupportBeOS
+	NS_DECL_ISUPPORTS
+class nsBeOSApp : public BApplication
+{
+public:
+  nsBeOSApp(sem_id sem) : BApplication( GetAppSig() ), init(sem)
+  {}
+  void ReadyToRun()
+  {
+    release_sem(init);
+  }
+  static int32 Main( void *args )
+  {
+    nsBeOSApp *app = new nsBeOSApp( (sem_id)args );
+    if( app == NULL )
+      return B_ERROR;
+    return app->Run();
+  }
 private:
+	nsresult LoadBitmap();
+  char *GetAppSig(void)
+  {
+    image_info info;
+    int32 cookie = 0;
+    BFile file;
+    BAppFileInfo appFileInfo;
+    static char sig[B_MIME_TYPE_LENGTH];
+    sig[0] = 0;
+    if (get_next_image_info(0, &cookie, &info) == B_OK &&
+        file.SetTo(info.name, B_READ_ONLY) == B_OK &&
+        appFileInfo.SetTo(&file) == B_OK &&
+        appFileInfo.GetSignature(sig) == B_OK) {
+      return sig;
+    }
+    return "application/x-vnd.Mozilla";
+  }
+  sem_id init;
+}; //class nsBeOSApp
+// Create and return an instance of class nsNativeAppSupportBeOS.
+nsresult
+NS_CreateNativeAppSupport( nsINativeAppSupport **aResult )
+{
+    if ( !aResult ) {
+        return NS_ERROR_NULL_POINTER;
+    }
+    nsNativeAppSupportBeOS *pNative = new nsNativeAppSupportBeOS();
+    if ( !pNative ) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+    *aResult = pNative;
+    NS_ADDREF( *aResult );
+    return NS_OK;
+}
+nsNativeAppSupportBeOS::nsNativeAppSupportBeOS()
+	: window( NULL ) , bitmap( NULL ), textView(NULL)
+{}
+nsNativeAppSupportBeOS::~nsNativeAppSupportBeOS()
+{
+    if(window != NULL) HideSplashScreen();
+}
+NS_IMPL_ISUPPORTS2(nsNativeAppSupportBeOS, nsINativeAppSupport, nsIObserver)
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::Start( PRBool *aResult )
+{
+    NS_ENSURE_ARG( aResult );
+    NS_ENSURE_TRUE( be_app == NULL, NS_ERROR_NOT_INITIALIZED );
+    sem_id initsem = create_sem(0, "Mozilla BApplication init");
+    if (initsem < B_OK)
+      return NS_ERROR_FAILURE;
+    thread_id tid = spawn_thread(nsBeOSApp::Main, "Mozilla BApplication", B_NORMAL_PRIORITY, (void *)initsem);
+    * aResult = PR_TRUE;
+    if (tid < B_OK || B_OK != resume_thread(tid))
+      * aResult = PR_FALSE;
+    if (B_OK != acquire_sem(initsem))
+      * aResult = PR_FALSE;
+    if (B_OK != delete_sem(initsem))
+      * aResult = PR_FALSE;
+    return * aResult == PR_TRUE ? NS_OK : NS_ERROR_FAILURE;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::Stop( PRBool *aResult )
+{
+    NS_ENSURE_ARG( aResult );
+    NS_ENSURE_TRUE( be_app, NS_ERROR_NOT_INITIALIZED );
+   *aResult = PR_TRUE;
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::Quit()
+{
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::EnsureProfile(nsICmdLineService* args)
+{
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::ReOpen()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
 NS_IMETHODIMP
+nsNativeAppSupportBeOS::OnLastWindowClosing()
+{
+  return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::GetIsServerMode(PRBool *aIsServerMode) {
+    *aIsServerMode = PR_FALSE;
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::SetIsServerMode(PRBool aIsServerMode) {
+    mServerMode = aIsServerMode;
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::StartServerMode() {
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::SetShouldShowUI(PRBool aShouldShowUI) {
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::GetShouldShowUI(PRBool *aShouldShowUI) {
+    *aShouldShowUI = PR_TRUE;
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsNativeAppSupportBeOS::ShowSplashScreen() {
 #ifdef DEBUG_SPLASH
+	puts("nsNativeAppSupportBeOS::ShowSplashScreen()");
 #endif
 	if (NULL == bitmap && NS_OK != LoadBitmap())
 		return NS_ERROR_FAILURE;
-       Lines 129-137
+  Link Here
+}
 NS_IMETHODIMP
+nsNativeAppSupportBeOS::HideSplashScreen() {
 #ifdef DEBUG_SPLASH
+	puts("nsNativeAppSupportBeOS::HideSplashScreen()");
 #endif
 	if (NULL != window) {
 		if (window->Lock())
-       Lines 146-187
+  Link Here
+}
 NS_IMETHODIMP
+nsNativeAppSupportBeOS::Observe(nsISupports *aSubject,
                             const char *aTopic,
                             const PRUnichar *someData)
+{
   if (!bitmap) return NS_OK;
   nsCAutoString statusString;
   statusString.AssignWithConversion(someData);
+  if (textView != NULL) {
+    textView = new BStringView(textRect,
+                               "splash text",
+                               statusString.get(),
+                               B_FOLLOW_LEFT | B_FOLLOW_V_CENTER);
+    if (textView) {
+      // Reduce the view size, and take into account the image frame
+      textRect.bottom -= 10;
+      textRect.left += 10;
+      textRect.right -= 10;
+      textRect.top = textRect.bottom - 20;
+      textView->SetViewColor(B_TRANSPARENT_COLOR);
+      textView->SetHighColor(255,255,255,0);
+      textView->SetLowColor(0,0,0,0);
+      window->AddChild(textView);
+    }
+  } else {
     if (textView->LockLooper()) {
       textView->SetText(statusString.get());
       textView->UnlockLooper();
+    }
+    return NS_OK;
+  }
+  BRect textRect = bitmap->Bounds();
+  textView = new BStringView(textRect,
+                             "splash text",
+                             statusString.get(),
+                             B_FOLLOW_LEFT | B_FOLLOW_V_CENTER);
+  if (!textView) return NS_OK;
+  // Reduce the view size, and take into account the image frame
+  textRect.bottom -= 10;
+  textRect.left += 10;
+  textRect.right -= 10;
+  textRect.top = textRect.bottom - 20;
+  textView->SetViewColor(B_TRANSPARENT_COLOR);
+  textView->SetHighColor(255,255,255,0);
+  textView->SetLowColor(0,0,0,0);
+  window->AddChild(textView);
   return NS_OK;
+}
 nsresult
+nsNativeAppSupportBeOS::LoadBitmap() {
 	BResources *rsrc = be_app->AppResources();
 	if (NULL == rsrc)
 		return NS_ERROR_FAILURE;
-       Lines 203-228
+  Link Here
 	return NS_OK;
+}
+// Create instance of BeOS splash screen object.
+nsresult
+NS_CreateSplashScreen( nsISplashScreen **aResult ) {
+	if ( aResult ) {
+		*aResult = new nsSplashScreenBeOS;
+		if ( *aResult ) {
+			NS_ADDREF( *aResult );
+			return NS_OK;
+		} else {
+			return NS_ERROR_OUT_OF_MEMORY;
+		}
+	} else {
+		return NS_ERROR_NULL_POINTER;
+	}
+}
+PRBool NS_CanRun()
+{
+	return PR_TRUE;
+}





 *
 * Contributor(s):
 *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
 *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either of the GNU General Public License Version 2 or later (the "GPL"),

int   __argc;
#endif /* XP_OS2 */

#if defined(XP_BEOS)

#include <AppKit.h>
#include <AppFileInfo.h>

class nsBeOSApp : public BApplication
{
public:
  nsBeOSApp(sem_id sem)
  : BApplication(GetAppSig()), init(sem)
  {
  }

  void ReadyToRun(void)
  {
    release_sem(init);
  }

  static int32 Main(void *args)
  {
    nsBeOSApp *app = new nsBeOSApp((sem_id)args);
    if (nsnull == app)
      return B_ERROR;
    return app->Run();
  }

private:
  char *GetAppSig(void)
  {
    app_info appInfo;
    BFile file;
    BAppFileInfo appFileInfo;
    image_info info;
    int32 cookie = 0;
    static char sig[B_MIME_TYPE_LENGTH];

    sig[0] = 0;
    if (get_next_image_info(0, &cookie, &info) != B_OK ||
        file.SetTo(info.name, B_READ_ONLY) != B_OK ||
        appFileInfo.SetTo(&file) != B_OK ||
        appFileInfo.GetSignature(sig) != B_OK)
    {
      return "application/x-vnd.Mozilla";
    }
    return sig;
  }

  sem_id init;
};

static nsresult InitializeBeOSApp(void)
{
  nsresult rv = NS_OK;

  sem_id initsem = create_sem(0, "beapp init");
  if (initsem < B_OK)
    return NS_ERROR_FAILURE;

  thread_id tid = spawn_thread(nsBeOSApp::Main, "BApplication", B_NORMAL_PRIORITY, (void *)initsem);
  if (tid < B_OK || B_OK != resume_thread(tid))
    rv = NS_ERROR_FAILURE;

  if (B_OK != acquire_sem(initsem))
    rv = NS_ERROR_FAILURE;
  if (B_OK != delete_sem(initsem))
    rv = NS_ERROR_FAILURE;

  return rv;
}

#endif // XP_BEOS

#if defined(XP_MAC)

#include "macstdlibextras.h"

/*********************************************/
// Default implemenations for nativeAppSupport
// If your platform implements these functions if def out this code.
#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_WIN) && !defined(XP_OS2) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2)

nsresult NS_CreateSplashScreen(nsISplashScreen **aResult)
{

//       nsISplashScreen will be removed.
//

#if !defined(XP_WIN) && !defined(XP_OS2)&& !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) && (!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA))

nsresult NS_CreateNativeAppSupport(nsINativeAppSupport **aResult)
{

  PR_OS2_SetFloatExcpHandler(&excpreg);
#endif /* XP_OS2 */

#if defined(XP_BEOS)
  if (NS_OK != InitializeBeOSApp())
    return 1;
#endif

#if defined(XP_MACOSX)
  InitializeMacOSXApp(argc, argv);
#endif

-      Line
+  Link Here
-       Lines 23-28
+  Link Here
  *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
  *   Benjamin Smedberg <bsmedberg@covad.net>
  *   Ben Goodger <ben@mozilla.org>
+ *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
-       Lines 109-114
+  Link Here
 #include <unistd.h>
 #endif
+#ifdef XP_BEOS
+//BeOS has execve in unistd, but it doesn't work well enough.
+//It leaves zombies around until the app that launched Firefox is closed.
+//#include <unistd.h>
+#include <AppKit.h>
+#include <AppFileInfo.h>
+#endif //XP_BEOS
 #ifdef XP_WIN
 #include <windows.h>
 #include <process.h>
-       Lines 227-304
+  Link Here
 static int    gRestartArgc;
 static char **gRestartArgv;
+#if defined(XP_BEOS)
+#include <AppKit.h>
+#include <AppFileInfo.h>
+class nsBeOSApp : public BApplication
+{
+public:
+  nsBeOSApp(sem_id sem)
+  : BApplication(GetAppSig()), init(sem)
+  {
+  }
+  void ReadyToRun(void)
+  {
+    release_sem(init);
+  }
+  static int32 Main(void *args)
+  {
+    nsBeOSApp *app = new nsBeOSApp((sem_id)args);
+    if (nsnull == app)
+      return B_ERROR;
+    return app->Run();
+  }
+private:
+  char *GetAppSig(void)
+  {
+    app_info appInfo;
+    BFile file;
+    BAppFileInfo appFileInfo;
+    image_info info;
+    int32 cookie = 0;
+    static char sig[B_MIME_TYPE_LENGTH];
+    sig[0] = 0;
+    if (get_next_image_info(0, &cookie, &info) != B_OK ||
+        file.SetTo(info.name, B_READ_ONLY) != B_OK ||
+        appFileInfo.SetTo(&file) != B_OK ||
+        appFileInfo.GetSignature(sig) != B_OK)
+    {
+      return "application/x-vnd.Mozilla";
+    }
+    return sig;
+  }
+  sem_id init;
+};
+static nsresult InitializeBeOSApp(void)
+{
+  nsresult rv = NS_OK;
+  sem_id initsem = create_sem(0, "beapp init");
+  if (initsem < B_OK)
+    return NS_ERROR_FAILURE;
+  thread_id tid = spawn_thread(nsBeOSApp::Main, "BApplication", B_NORMAL_PRIORITY, (void *)initsem);
+  if (tid < B_OK || B_OK != resume_thread(tid))
+    rv = NS_ERROR_FAILURE;
+  if (B_OK != acquire_sem(initsem))
+    rv = NS_ERROR_FAILURE;
+  if (B_OK != delete_sem(initsem))
+    rv = NS_ERROR_FAILURE;
+  return rv;
+}
+#endif // XP_BEOS
 #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
 #include <gtk/gtk.h>
 #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2
-       Lines 1512-1522
+  Link Here
   ScopedFPHandler handler();
 #endif /* XP_OS2 */
+#if defined(XP_BEOS)
+  if (NS_OK != InitializeBeOSApp())
+    return 1;
+#endif
 #ifdef _BUILD_STATIC_BIN
   // Initialize XPCOM's module info table
   NSGetStaticModuleInfo = app_getModuleInfo;

(-)toolkit/xre/Makefile.in (+4 lines)

Line	Link Here

Lines 113-122	Link Here

113

ifeq ($(MOZ_WIDGET_TOOLKIT),os2)

113

ifeq ($(MOZ_WIDGET_TOOLKIT),os2)

114

CPPSRCS += nsNativeAppSupportOS2.cpp

114

CPPSRCS += nsNativeAppSupportOS2.cpp

115

else

115

else

116

ifeq ($(MOZ_WIDGET_TOOLKIT),beos)

117

CPPSRCS += nsNativeAppSupportBeOS.cpp

118

else

116

CPPSRCS += nsNativeAppSupportDefault.cpp

119

CPPSRCS += nsNativeAppSupportDefault.cpp

117

endif

120

endif

118

endif

121

endif

119

endif

122

endif

123

endif

120

124

121

ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

125

ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

122

CMSRCS = MacLaunchHelper.m

126

CMSRCS = MacLaunchHelper.m

Return to bug 281375