# HG changeset patch

# User msirringhaus@suse.de

# Date 1559294891 -7200

#      Fri May 31 11:28:11 2019 +0200

# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112

# Parent  0dd1b6436342922d434e7c818875b2a02a73b5ed

Description: Add KDE integration to Firefox (toolkit parts)

Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>

Author: Lubos Lunak <lunak@suse.com>

Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751

     https://bugzilla.novell.com/show_bug.cgi?id=170055

diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp

--- a/modules/libpref/Preferences.cpp

+++ b/modules/libpref/Preferences.cpp

@@ -84,16 +84,17 @@

 #include "plbase64.h"

 #include "PLDHashTable.h"

 #include "plstr.h"

 #include "prlink.h"

 #include "xpcpublic.h"

 #ifdef MOZ_BACKGROUNDTASKS

 #  include "mozilla/BackgroundTasks.h"

 #endif

+#include "nsKDEUtils.h"

 #ifdef DEBUG

 #  include <map>

 #endif

 #ifdef MOZ_MEMORY

 #  include "mozmemory.h"

 #endif

@@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects

     "unix.js"

 #  if defined(_AIX)

     ,

     "aix.js"

 #  endif

 #endif

   };

+  if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?

+    for(int i = 0;

+        i < MOZ_ARRAY_LENGTH(specialFiles);

+        ++i ) {

+      if( *specialFiles[ i ] == '\0' ) {

+        specialFiles[ i ] = "kde.js";

+        break;

+      }

+    }

+  }

+

   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,

                            ArrayLength(specialFiles));

   if (NS_FAILED(rv)) {

     NS_WARNING("Error parsing application default preferences.");

   }

   // Load jar:$app/omni.jar!/defaults/preferences/*.js

   // or jar:$gre/omni.jar!/defaults/preferences/*.js.

@@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects

       }

       nsCOMPtr<nsIFile> path = do_QueryInterface(elem);

       if (!path) {

         continue;

       }

       // Do we care if a file provided by this process fails to load?

-      pref_LoadPrefsInDir(path, nullptr, 0);

+      pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles));

     }

   }

   if (XRE_IsParentProcess()) {

     SetupTelemetryPref();

   }

   if (aIsStartup) {

diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build

--- a/modules/libpref/moz.build

+++ b/modules/libpref/moz.build

@@ -118,16 +118,20 @@ EXPORTS.mozilla += [

 ]

 EXPORTS.mozilla += sorted(["!" + g for g in gen_h])

 UNIFIED_SOURCES += [

     "Preferences.cpp",

     "SharedPrefMap.cpp",

 ]

+LOCAL_INCLUDES += [

+    '/toolkit/xre'

+]

+

 gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs)

 GeneratedFile(

     *gen_all_tuple,

     script="init/generate_static_pref_list.py",

     entry_point="emit_code",

     inputs=["init/StaticPrefList.yaml"]

 )

diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py

--- a/python/mozbuild/mozpack/chrome/flags.py

+++ b/python/mozbuild/mozpack/chrome/flags.py

@@ -229,16 +229,17 @@ class Flags(OrderedDict):

         "os": StringFlag,

         "osversion": VersionFlag,

         "abi": StringFlag,

         "platform": Flag,

         "xpcnativewrappers": Flag,

         "tablet": Flag,

         "process": StringFlag,

         "backgroundtask": StringFlag,

+        "desktop": StringFlag,

     }

     RE = re.compile(r"([!<>=]+)")

     def __init__(self, *flags):

         """

         Initialize a set of flags given in string form.

            flags = Flags('contentaccessible=yes', 'appversion>=3.5')

         """

diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py

--- a/python/mozbuild/mozpack/chrome/manifest.py

+++ b/python/mozbuild/mozpack/chrome/manifest.py

@@ -39,16 +39,17 @@ class ManifestEntry(object):

         "os",

         "osversion",

         "abi",

         "xpcnativewrappers",

         "tablet",

         "process",

         "contentaccessible",

         "backgroundtask",

+        "desktop",

     ]

     def __init__(self, base, *flags):

         """

         Initialize a manifest entry with the given base path and flags.

         """

         self.base = base

         self.flags = Flags(*flags)

diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build

--- a/toolkit/components/downloads/moz.build

+++ b/toolkit/components/downloads/moz.build

@@ -45,10 +45,14 @@ XPCOM_MANIFESTS += [

 if CONFIG["MOZ_PLACES"]:

     EXTRA_JS_MODULES += [

         "DownloadHistory.jsm",

     ]

 FINAL_LIBRARY = "xul"

+LOCAL_INCLUDES += [

+    '/toolkit/xre'

+]

+

 with Files("**"):

     BUG_COMPONENT = ("Toolkit", "Downloads API")

diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm

--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm

+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm

@@ -1231,36 +1231,66 @@ nsUnknownContentTypeDialog.prototype = {

         params.handlerApp &&

         params.handlerApp.executable &&

         params.handlerApp.executable.isFile()

       ) {

         // Remember the file they chose to run.

         this.chosenApp = params.handlerApp;

       }

     } else if ("@mozilla.org/applicationchooser;1" in Cc) {

-      var nsIApplicationChooser = Ci.nsIApplicationChooser;

-      var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(

-        nsIApplicationChooser

-      );

-      appChooser.init(

-        this.mDialog,

-        this.dialogElement("strings").getString("chooseAppFilePickerTitle")

-      );

-      var contentTypeDialogObj = this;

-      let appChooserCallback = function appChooserCallback_done(aResult) {

-        if (aResult) {

-          contentTypeDialogObj.chosenApp = aResult.QueryInterface(

-            Ci.nsILocalHandlerApp

-          );

-        }

-        contentTypeDialogObj.finishChooseApp();

-      };

-      appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback);

-      // The finishChooseApp is called from appChooserCallback

-      return;

+      // handle the KDE case which is implemented in the filepicker

+      // therefore falling back to Gtk2 like behaviour if KDE is running

+      // FIXME this should be better handled in the nsIApplicationChooser

+      // interface

+      var env = Components.classes["@mozilla.org/process/environment;1"]

+                          .getService(Components.interfaces.nsIEnvironment);

+      if (env.get('KDE_FULL_SESSION') == "true")

+      {

+        var nsIFilePicker = Ci.nsIFilePicker;

+        var fp = Cc["@mozilla.org/filepicker;1"]

+                    .createInstance(nsIFilePicker);

+        fp.init(this.mDialog,

+                this.dialogElement("strings").getString("chooseAppFilePickerTitle"),

+                nsIFilePicker.modeOpen);

+

+        fp.appendFilters(nsIFilePicker.filterApps);

+

+        fp.open(aResult => {

+          if (aResult == nsIFilePicker.returnOK && fp.file) {

+            // Remember the file they chose to run.

+            var localHandlerApp =

+              Cc["@mozilla.org/uriloader/local-handler-app;1"].

+                         createInstance(Ci.nsILocalHandlerApp);

+            localHandlerApp.executable = fp.file;

+            this.chosenApp = localHandlerApp;

+          }

+          this.finishChooseApp();

+        });

+      } else {

+        var nsIApplicationChooser = Ci.nsIApplicationChooser;

+        var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(

+          nsIApplicationChooser

+        );

+        appChooser.init(

+          this.mDialog,

+          this.dialogElement("strings").getString("chooseAppFilePickerTitle")

+        );

+        var contentTypeDialogObj = this;

+        let appChooserCallback = function appChooserCallback_done(aResult) {

+          if (aResult) {

+            contentTypeDialogObj.chosenApp = aResult.QueryInterface(

+              Ci.nsILocalHandlerApp

+            );

+          }

+          contentTypeDialogObj.finishChooseApp();

+        };

+        appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback);

+        // The finishChooseApp is called from appChooserCallback

+        return;

+      }

     } else {

       var nsIFilePicker = Ci.nsIFilePicker;

       var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);

       fp.init(

         this.mDialog,

         this.dialogElement("strings").getString("chooseAppFilePickerTitle"),

         nsIFilePicker.modeOpen

       );

diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

@@ -13,16 +13,17 @@

 #include "nsPrintfCString.h"

 #include "nsNetCID.h"

 #include "nsNetUtil.h"

 #include "nsISupportsPrimitives.h"

 #include "nsIGSettingsService.h"

 #include "nsInterfaceHashtable.h"

 #include "mozilla/Attributes.h"

 #include "nsIURI.h"

+#include "nsKDEUtils.h"

 using namespace mozilla;

 class nsUnixSystemProxySettings final : public nsISystemProxySettings {

  public:

   NS_DECL_ISUPPORTS

   NS_DECL_NSISYSTEMPROXYSETTINGS

@@ -36,16 +37,18 @@ class nsUnixSystemProxySettings final : 

   nsCOMPtr<nsIGSettingsCollection> mProxySettings;

   nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection>

       mSchemeProxySettings;

   nsresult GetProxyFromGSettings(const nsACString& aScheme,

                                  const nsACString& aHost, int32_t aPort,

                                  nsACString& aResult);

   nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType,

                                        nsACString& aResult);

+  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost,

+                           PRInt32 aPort, nsACString& aResult);

 };

 NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)

 NS_IMETHODIMP

 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {

   // dbus prevents us from being threadsafe, but this routine should not block

   // anyhow

@@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP

   return NS_OK;

 }

 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,

                                                    const nsACString& aScheme,

                                                    const nsACString& aHost,

                                                    const int32_t aPort,

                                                    nsACString& aResult) {

+  if (nsKDEUtils::kdeSupport())

+    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);

+

   if (mProxySettings) {

     nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);

     if (NS_SUCCEEDED(rv)) return rv;

   }

   return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);

 }

+nsresult

+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,

+                                           const nsACString& aHost,

+                                           PRInt32 aPort,

+                                           nsACString& aResult)

+{

+  nsAutoCString url;

+  url = aScheme;

+  url += "://";

+  url += aHost;

+  if( aPort >= 0 )

+  {

+    url += ":";

+    url += nsPrintfCString("%d", aPort);

+  }

+  nsTArray<nsCString> command;

+  command.AppendElement( "GETPROXY"_ns );

+  command.AppendElement( url );

+  nsTArray<nsCString> result;

+  if( !nsKDEUtils::command( command, &result ) || result.Length() != 1 )

+    return NS_ERROR_FAILURE;

+  aResult = result[0];

+  return NS_OK;

+}

+

+

 NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {

   auto result = MakeRefPtr<nsUnixSystemProxySettings>();

   result->Init();

   return result.forget().downcast<nsISupports>();

 }

diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build

--- a/toolkit/xre/moz.build

+++ b/toolkit/xre/moz.build

@@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co

         "../components/printingui",

     ]

 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":

     UNIFIED_SOURCES += [

         "nsNativeAppSupportDefault.cpp",

         "UIKitDirProvider.mm",

     ]

 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

+    EXPORTS += ['nsKDEUtils.h']

     UNIFIED_SOURCES += [

+        "nsKDEUtils.cpp",

         "nsNativeAppSupportUnix.cpp",

     ]

 else:

     UNIFIED_SOURCES += [

         "nsNativeAppSupportDefault.cpp",

     ]

 if CONFIG["MOZ_HAS_REMOTE"]:

diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp

new file mode 100644

--- /dev/null

+++ b/toolkit/xre/nsKDEUtils.cpp

@@ -0,0 +1,344 @@

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

+/* This Source Code Form is subject to the terms of the Mozilla Public

+ * License, v. 2.0. If a copy of the MPL was not distributed with this

+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

+

+#include "nsKDEUtils.h"

+#include "nsIWidget.h"

+#include "nsISupportsPrimitives.h"

+#include "nsIMutableArray.h"

+#include "nsComponentManagerUtils.h"

+#include "nsArrayUtils.h"

+

+#include <gtk/gtk.h>

+

+#include <limits.h>

+#include <stdio.h>

+#include <sys/wait.h>

+#include <sys/resource.h>

+#include <unistd.h>

+#include <X11/Xlib.h>

+// copied from X11/X.h as a hack since for an unknown

+// reason it's not picked up from X11/X.h

+#ifndef None

+#define None                 0L /* universal null resource or null atom */

+#endif

+

+//#define DEBUG_KDE

+#ifdef DEBUG_KDE

+#define KMOZILLAHELPER "kmozillahelper"

+#else

+// not need for lib64, it's a binary

+#define KMOZILLAHELPER "/usr/lib/mozilla/kmozillahelper"

+#endif

+

+#define KMOZILLAHELPER_VERSION 6

+#define MAKE_STR2( n ) #n

+#define MAKE_STR( n ) MAKE_STR2( n )

+

+static bool getKdeSession()

+    {

+    Display* dpy = XOpenDisplay( NULL );

+    if( dpy == NULL )

+        return false;

+    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", true );

+    bool kde = false;

+    if( kde_full_session != None )

+        {

+        int cnt;

+        if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt ))

+            {

+            for( int i = 0;

+                 i < cnt;

+                 ++i )

+                {

+                if( props[ i ] == kde_full_session )

+                    {

+                    kde = true;

+#ifdef DEBUG_KDE

+                    fprintf( stderr, "KDE SESSION %d\n", kde );

+#endif

+                    break;

+                    }

+                }

+            XFree( props );

+            }

+        }

+    XCloseDisplay( dpy );

+    return kde;

+    }

+

+static bool getKdeSupport()

+    {

+    nsTArray<nsCString> command;

+    command.AppendElement( "CHECK"_ns );

+    command.AppendElement( "KMOZILLAHELPER_VERSION"_ns );

+    bool kde = nsKDEUtils::command( command );

+#ifdef DEBUG_KDE

+    fprintf( stderr, "KDE RUNNING %d\n", kde );

+#endif

+    return kde;

+    }

+

+nsKDEUtils::nsKDEUtils()

+    : commandFile( NULL )

+    , replyFile( NULL )

+    {

+    }

+

+nsKDEUtils::~nsKDEUtils()

+    {

+//    closeHelper(); not actually useful, exiting will close the fd too

+    }

+

+nsKDEUtils* nsKDEUtils::self()

+    {

+    static nsKDEUtils s;

+    return &s;

+    }

+

+static bool helperRunning = false;

+static bool helperFailed = false;

+

+bool nsKDEUtils::kdeSession()

+    {

+    static bool session = getKdeSession();

+    return session;

+    }

+

+bool nsKDEUtils::kdeSupport()

+    {

+    static bool support = kdeSession() && getKdeSupport();

+    return support && helperRunning;

+    }

+

+struct nsKDECommandData

+    {

+    FILE* file;

+    nsTArray<nsCString>* output;