# HG changeset patch

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/Makefile.in b/modules/libpref/Makefile.in

--- a/modules/libpref/Makefile.in

+++ b/modules/libpref/Makefile.in

@@ -21,13 +21,15 @@ endif

 ifdef MOZ_SERVICES_HEALTHREPORT

 ifneq (android,$(MOZ_WIDGET_TOOLKIT))

 grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js

 else

 grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.js

 endif

 endif

+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre

+

 greprefs.js: $(grepref_files)

 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@)

 libs:: greprefs.js

 	$(INSTALL) $^ $(DIST)/bin/

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

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

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

@@ -27,16 +27,17 @@

 #include "nsIZipReader.h"

 #include "nsPrefBranch.h"

 #include "nsXPIDLString.h"

 #include "nsCRT.h"

 #include "nsCOMArray.h"

 #include "nsXPCOMCID.h"

 #include "nsAutoPtr.h"

 #include "nsPrintfCString.h"

+#include "nsKDEUtils.h"

 #include "nsQuickSort.h"

 #include "pldhash.h"

 #include "prefapi.h"

 #include "prefread.h"

 #include "prefapi_private_data.h"

 static nsresult pref_LoadPrefsInDirList(const char *listId)

 {

   nsresult rv;

   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));

   if (NS_FAILED(rv))

     return rv;

+  // make sure we load these special files after all the others

+  static const char* specialFiles[] = {

+#if defined(XP_UNIX)

+    ""

+#endif

+  };

+

+  if (nsKDEUtils::kdeSession()) {

+    for(int i = 0;

+        i < MOZ_ARRAY_LENGTH(specialFiles);

+        ++i ) {

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

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

+        break;

+      }

+    }

+  }

+

   nsCOMPtr<nsISimpleEnumerator> list;

   dirSvc->Get(listId,

               NS_GET_IID(nsISimpleEnumerator),

               getter_AddRefs(list));

   if (!list)

     return NS_OK;

   bool hasMore;

     nsAutoCString leaf;

     path->GetNativeLeafName(leaf);

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

     if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi"))

       ReadExtensionPrefs(path);

     else

-      pref_LoadPrefsInDir(path, nullptr, 0);

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

   }

   return NS_OK;

 }

 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)

 {

   nsZipItemPtr<char> manifest(jarReader, name, true);

   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);

   /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */

   static const char* specialFiles[] = {

 #if defined(XP_MACOSX)

     "macprefs.js"

 #elif defined(XP_WIN)

     "winpref.js"

 #elif defined(XP_UNIX)

     "unix.js"

+    , "" // placeholder for KDE  (empty is otherwise harmless)

 #if defined(VMS)

     , "openvms.js"

 #elif defined(_AIX)

     , "aix.js"

 #endif

 #elif defined(XP_BEOS)

     "beos.js"

 #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.

   nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);

   // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which

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

         'contentaccessible': Flag,

         'os': StringFlag,

         'osversion': VersionFlag,

         'abi': StringFlag,

         'platform': Flag,

         'xpcnativewrappers': Flag,

         'tablet': Flag,

         'process': 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

         'application',

         'platformversion',

         'os',

         'osversion',

         'abi',

         'xpcnativewrappers',

         'tablet',

         'process',

+        '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

     ]

 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'xul'

 LOCAL_INCLUDES += [

     '../protobuf',

-    '/ipc/chromium/src'

+    '/ipc/chromium/src',

+    '/toolkit/xre'

 ]

 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True

 CXXFLAGS += CONFIG['TK_CFLAGS']

diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp

--- a/toolkit/components/downloads/nsDownloadManager.cpp

+++ b/toolkit/components/downloads/nsDownloadManager.cpp

@@ -46,16 +46,20 @@

 #ifdef XP_WIN

 #include <shlobj.h>

 #include "nsWindowsHelpers.h"

 #ifdef DOWNLOAD_SCANNER

 #include "nsDownloadScanner.h"

 #endif

 #endif

+#if defined(XP_UNIX) && !defined(XP_MACOSX)

+#include "nsKDEUtils.h"

+#endif

+

 #ifdef XP_MACOSX

 #include <CoreFoundation/CoreFoundation.h>

 #endif

 #ifdef MOZ_WIDGET_ANDROID

 #include "AndroidBridge.h"

 #endif

@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat

       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));

       // Master pref to control this function.

       bool showTaskbarAlert = true;

       if (pref)

         pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);

       if (showTaskbarAlert) {

+        if( nsKDEUtils::kdeSupport()) {

+          nsTArray<nsCString> command;

+          command.AppendElement( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" ));

+          nsAutoString displayName;

+          GetDisplayName( displayName );

+          command.AppendElement( nsAutoCString( ToNewUTF8String( displayName )));

+          nsKDEUtils::command( command );

+        } else {

+        // begin non-KDE block

         int32_t alertInterval = 2000;

         if (pref)

           pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);

         int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;

         int64_t goat = PR_Now() - mStartTime;

         showTaskbarAlert = goat > alertIntervalUSec;

@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat

                   NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,

                   message, !removeWhenDone,

                   mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),

                   mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),

                   EmptyString(), EmptyString(), nullptr, mPrivate);

             }

         }

       }

+      }

 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)

       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);

       nsCOMPtr<nsIFile> file;

       nsAutoString path;

       if (fileURL &&

           NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

--- a/toolkit/content/jar.mn

+++ b/toolkit/content/jar.mn

@@ -60,29 +60,33 @@ toolkit.jar:

    content/global/viewZoomOverlay.js          (viewZoomOverlay.js)

 *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)

    content/global/bindings/browser.xml         (widgets/browser.xml)

    content/global/bindings/button.xml          (widgets/button.xml)

    content/global/bindings/checkbox.xml        (widgets/checkbox.xml)

    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)

    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)

 *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)

+*+ content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)

+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde

    content/global/bindings/editor.xml          (widgets/editor.xml)

    content/global/bindings/expander.xml        (widgets/expander.xml)

 *  content/global/bindings/filefield.xml       (widgets/filefield.xml)

 *+ content/global/bindings/findbar.xml         (widgets/findbar.xml)

    content/global/bindings/general.xml         (widgets/general.xml)

    content/global/bindings/groupbox.xml        (widgets/groupbox.xml)

 *+ content/global/bindings/listbox.xml         (widgets/listbox.xml)

    content/global/bindings/menu.xml            (widgets/menu.xml)

    content/global/bindings/menulist.xml        (widgets/menulist.xml)

    content/global/bindings/notification.xml    (widgets/notification.xml)

    content/global/bindings/numberbox.xml       (widgets/numberbox.xml)

    content/global/bindings/popup.xml           (widgets/popup.xml)

 *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)

+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)

+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde

    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)

    content/global/bindings/radio.xml           (widgets/radio.xml)

    content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)

    content/global/bindings/resizer.xml         (widgets/resizer.xml)

    content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)

    content/global/bindings/scale.xml           (widgets/scale.xml)

    content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)

    content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)

diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml

new file mode 100644

--- /dev/null

+++ b/toolkit/content/widgets/dialog-kde.xml

@@ -0,0 +1,460 @@

+<?xml version="1.0"?>

+<!-- 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/. -->

+

+

+<bindings id="dialogBindings"

+          xmlns="http://www.mozilla.org/xbl"

+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

+          xmlns:xbl="http://www.mozilla.org/xbl">

+  

+  <binding id="dialog" extends="chrome://global/content/bindings/general.xml#root-element">

+    <resources>

+      <stylesheet src="chrome://global/skin/dialog.css"/>

+    </resources>

+    <content>

+      <xul:vbox class="box-inherit dialog-content-box" flex="1">

+        <children/>

+      </xul:vbox>

+          

+      <xul:hbox class="dialog-button-box" anonid="buttons"

+                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"

+#ifdef XP_UNIX_GNOME

+                >

+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>

+        <xul:spacer anonid="spacer" flex="1"/>

+        <xul:button dlgtype="cancel" class="dialog-button"/>

+        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>

+#elif XP_UNIX

+                >

+	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>

+	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>

+	<xul:spacer anonid="spacer" flex="1"/>

+	<xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>

+	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>

+	<xul:button dlgtype="cancel" class="dialog-button"/>

+	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>

+#else

+                pack="end">

+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>

+        <xul:spacer anonid="spacer" flex="1" hidden="true"/>

+        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>

+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="cancel" class="dialog-button"/>

+        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>

+#endif

+      </xul:hbox>

+    </content>

+

+    <implementation>

+      <field name="_mStrBundle">null</field>

+      <field name="_closeHandler">(function(event) {

+        if (!document.documentElement.cancelDialog())

+          event.preventDefault();

+      })</field>

+

+      <property name="buttons"

+                onget="return this.getAttribute('buttons');"

+                onset="this._configureButtons(val); return val;"/>

+

+      <property name="defaultButton">

+        <getter>

+        <![CDATA[

+          if (this.hasAttribute("defaultButton"))

+            return this.getAttribute("defaultButton");

+          else // default to the accept button

+            return "accept";

+        ]]>

+        </getter>

+        <setter>

+        <![CDATA[

+          this._setDefaultButton(val);

+          return val;

+        ]]>

+        </setter>

+      </property>

+

+      <method name="acceptDialog">

+        <body>

+        <![CDATA[

+          return this._doButtonCommand("accept");

+        ]]>

+        </body>

+      </method>

+      

+      <method name="cancelDialog">

+        <body>

+        <![CDATA[

+          return this._doButtonCommand("cancel");

+        ]]>

+        </body>

+      </method>

+      

+      <method name="getButton">

+        <parameter name="aDlgType"/>

+        <body>

+        <![CDATA[

+          return this._buttons[aDlgType];

+        ]]>

+        </body>

+      </method>

+

+      <method name="moveToAlertPosition">

+        <body>

+        <![CDATA[

+          // hack. we need this so the window has something like its final size

+          if (window.outerWidth == 1) {

+            dump("Trying to position a sizeless window; caller should have called sizeToContent() or sizeTo(). See bug 75649.\n");

+            sizeToContent();

+          }

+

+          if (opener) {

+            var xOffset = (opener.outerWidth - window.outerWidth) / 2;

+            var yOffset = opener.outerHeight / 5;

+

+            var newX = opener.screenX + xOffset;

+            var newY = opener.screenY + yOffset;

+          } else {

+            newX = (screen.availWidth - window.outerWidth) / 2;

+            newY = (screen.availHeight - window.outerHeight) / 2;

+          }

+

+          // ensure the window is fully onscreen (if smaller than the screen)

+          if (newX < screen.availLeft)

+            newX = screen.availLeft + 20;

+          if ((newX + window.outerWidth) > (screen.availLeft + screen.availWidth))

+            newX = (screen.availLeft + screen.availWidth) - window.outerWidth - 20;

+

+          if (newY < screen.availTop)

+            newY = screen.availTop + 20;

+          if ((newY + window.outerHeight) > (screen.availTop + screen.availHeight))

+            newY = (screen.availTop + screen.availHeight) - window.outerHeight - 60;

+

+          window.moveTo( newX, newY );

+        ]]>

+        </body>

+      </method>

+

+      <method name="centerWindowOnScreen">

+        <body>

+        <![CDATA[

+          var xOffset = screen.availWidth/2 - window.outerWidth/2;

+          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;

+  

+          xOffset = xOffset > 0 ? xOffset : 0;

+          yOffset = yOffset > 0 ? yOffset : 0;

+          window.moveTo(xOffset, yOffset);

+        ]]>

+        </body>

+      </method>

+

+      <constructor>

+      <![CDATA[

+        this._configureButtons(this.buttons);

+

+        // listen for when window is closed via native close buttons

+        window.addEventListener("close", this._closeHandler, false);

+

+        // for things that we need to initialize after onload fires

+        window.addEventListener("load", this.postLoadInit, false);

+

+        window.moveToAlertPosition = this.moveToAlertPosition;

+        window.centerWindowOnScreen = this.centerWindowOnScreen;

+      ]]>

+      </constructor>

+

+      <method name="postLoadInit">

+        <parameter name="aEvent"/>

+        <body>

+        <![CDATA[

+          function focusInit() {

+            const dialog = document.documentElement;

+            const defaultButton = dialog.getButton(dialog.defaultButton);

+            // give focus to the first focusable element in the dialog

+            if (!document.commandDispatcher.focusedElement) {

+              document.commandDispatcher.advanceFocusIntoSubtree(dialog);

+

+              var focusedElt = document.commandDispatcher.focusedElement;

+              if (focusedElt) {

+                var initialFocusedElt = focusedElt;

+                while (focusedElt.localName == "tab" ||

+                       focusedElt.getAttribute("noinitialfocus") == "true") {