# HG changeset patch

# Parent  9cc0c990890e64f69ed068cf1a4534535bcc50a7

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

@@ -76,16 +76,17 @@

 #include "nsXPCOMCID.h"

 #include "nsXPCOM.h"

 #include "nsXULAppAPI.h"

 #include "nsZipArchive.h"

 #include "plbase64.h"

 #include "PLDHashTable.h"

 #include "plstr.h"

 #include "prlink.h"

+#include "nsKDEUtils.h"

 #ifdef XP_WIN

 #include "windows.h"

 #endif

 using namespace mozilla;

 #ifdef DEBUG

@@ -3868,25 +3869,37 @@ Preferences::InitInitialObjects()

   // 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(_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.

@@ -3935,17 +3948,17 @@ 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));

     }

   }

 #ifdef MOZ_WIDGET_ANDROID

   // Set up the correct default for toolkit.telemetry.enabled. If this build

   // has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta channel, telemetry

   // is on by default, otherwise not. This is necessary so that beta users who

   // are testing final release builds don't flipflop defaults.

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

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

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

@@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref'

 EXPORTS.mozilla += [

     'Preferences.h',

 ]

 UNIFIED_SOURCES += [

     'Preferences.cpp',

 ]

+LOCAL_INCLUDES += [

+     '/toolkit/xre'

+]

+

 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'

 DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']

 DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']

 if CONFIG['MOZ_ENABLE_WEBRENDER']:

     DEFINES['MOZ_ENABLE_WEBRENDER'] = True

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

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

         '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

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

         'platformversion',

         'os',

         'osversion',

         'abi',

         'xpcnativewrappers',

         'tablet',

         'process',

         'contentaccessible',

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

@@ -41,10 +41,14 @@ EXTRA_JS_MODULES += [

 if CONFIG['MOZ_PLACES']:

     EXTRA_JS_MODULES += [

         'DownloadHistory.jsm',

     ]

 FINAL_LIBRARY = 'xul'

+LOCAL_INCLUDES += [

+    '/toolkit/xre'

+]

+

 with Files('**'):

     BUG_COMPONENT = ('Toolkit', 'Download Manager')

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

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

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

@@ -69,16 +69,18 @@ toolkit.jar:

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

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

    content/global/bindings/datekeeper.js       (widgets/datekeeper.js)

    content/global/bindings/datepicker.js       (widgets/datepicker.js)

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

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

    content/global/bindings/datetimebox.css     (widgets/datetimebox.css)

 *  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/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)

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,478 @@

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

+

+<!DOCTYPE bindings [

+  <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">

+  %globalKeysDTD;

+]>

+

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

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

+

+    <xul:keyset>

+      <xul:key phase="capturing" oncommand="document.documentElement.openHelp(event)"

+#ifdef XP_MACOSX

+           key="&openHelpMac.commandkey;" modifiers="accel"/>

+#else

+           keycode="&openHelp.commandkey;"/>

+#endif

+    </xul:keyset>

+

+    </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");

+          return "accept"; // default to the accept button

+        ]]>

+        </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;

+

+          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);

+

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

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

+

+        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") {

+                  document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);

+                  focusedElt = document.commandDispatcher.focusedElement;

+                  if (focusedElt == initialFocusedElt) {

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

+                      focusedElt.blur();

+                    }

+                    break;

+                  }

+                }

+

+                if (initialFocusedElt.localName == "tab") {

+                  if (focusedElt.hasAttribute("dlgtype")) {

+                    // We don't want to focus on anonymous OK, Cancel, etc. buttons,

+                    // so return focus to the tab itself

+                    initialFocusedElt.focus();

+                  }

+                } else if (!/Mac/.test(navigator.platform) &&

+                           focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {

+                  defaultButton.focus();

+                }

+              }

+            }

+

+            try {

+              if (defaultButton)

+                window.notifyDefaultButtonLoaded(defaultButton);

+            } catch (e) { }

+          }

+

+          // Give focus after onload completes, see bug 103197.

+          setTimeout(focusInit, 0);

+        ]]>

+        </body>

+      </method>

+

+      <method name="openHelp">

+        <parameter name="event"/>

+        <body>

+        <![CDATA[

+          var helpButton = document.documentElement.getButton("help");

+          if (helpButton.disabled || helpButton.hidden)

+            return;

+          this._fireButtonEvent("help");

+          event.stopPropagation();

+          event.preventDefault();

+        ]]>

+        </body>

+      </method>

+

+      <property name="mStrBundle">

+        <getter>

+        <![CDATA[

+          if (!this._mStrBundle) {

+            // need to create string bundle manually instead of using <xul:stringbundle/>

+            // see bug 63370 for details

+            this._mStrBundle = Cc["@mozilla.org/intl/stringbundle;1"]

+                                 .getService(Ci.nsIStringBundleService)

+                                 .createBundle("chrome://global/locale/dialog.properties");

+          }

+          return this._mStrBundle;

+        ]]></getter>

+      </property>

+

+      <method name="_configureButtons">

+        <parameter name="aButtons"/>

+        <body>

+        <![CDATA[

+          // by default, get all the anonymous button elements

+          var buttons = {};

+          this._buttons = buttons;

+          buttons.accept = document.getAnonymousElementByAttribute(this, "dlgtype", "accept");

+          buttons.cancel = document.getAnonymousElementByAttribute(this, "dlgtype", "cancel");

+          buttons.extra1 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra1");

+          buttons.extra2 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra2");

+          buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help");

+          buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure");

+

+          // look for any overriding explicit button elements

+          var exBtns = this.getElementsByAttribute("dlgtype", "*");

+          var dlgtype;

+          var i;

+          for (i = 0; i < exBtns.length; ++i) {

+            dlgtype = exBtns[i].getAttribute("dlgtype");

+            buttons[dlgtype].hidden = true; // hide the anonymous button

+            buttons[dlgtype] = exBtns[i];

+          }

+

+          // add the label and oncommand handler to each button

+          for (dlgtype in buttons) {

+            var button = buttons[dlgtype];

+            button.addEventListener("command", this._handleButtonCommand, true);

+

+            // don't override custom labels with pre-defined labels on explicit buttons

+            if (!button.hasAttribute("label")) {

+              // dialog attributes override the default labels in dialog.properties

+              if (this.hasAttribute("buttonlabel" + dlgtype)) {

+                button.setAttribute("label", this.getAttribute("buttonlabel" + dlgtype));

+                if (this.hasAttribute("buttonaccesskey" + dlgtype))

+                  button.setAttribute("accesskey", this.getAttribute("buttonaccesskey" + dlgtype));

+              } else if (dlgtype != "extra1" && dlgtype != "extra2") {

+                button.setAttribute("label", this.mStrBundle.GetStringFromName("button-" + dlgtype));

+                var accessKey = this.mStrBundle.GetStringFromName("accesskey-" + dlgtype);

+                if (accessKey)

+                  button.setAttribute("accesskey", accessKey);