diff -urN Pale-Moon-27.4.0_Release/modules/libpref/Makefile.in Pale-Moon-27.4.0_Release-patched/modules/libpref/Makefile.in --- Pale-Moon-27.4.0_Release/modules/libpref/Makefile.in 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/modules/libpref/Makefile.in 2017-07-13 00:39:38.930612615 +1000 @@ -26,6 +26,8 @@ endif endif +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + goanna.js: $(grepref_files) $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@) diff -urN Pale-Moon-27.4.0_Release/modules/libpref/Preferences.cpp Pale-Moon-27.4.0_Release-patched/modules/libpref/Preferences.cpp --- Pale-Moon-27.4.0_Release/modules/libpref/Preferences.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/modules/libpref/Preferences.cpp 2017-07-13 00:38:15.791612932 +1000 @@ -32,6 +32,7 @@ #include "nsXPCOMCID.h" #include "nsAutoPtr.h" #include "nsPrintfCString.h" +#include "nsKDEUtils.h" #include "nsQuickSort.h" #include "pldhash.h" @@ -1162,6 +1163,24 @@ 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 list; dirSvc->Get(listId, NS_GET_IID(nsISimpleEnumerator), @@ -1187,7 +1206,7 @@ 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; } @@ -1291,6 +1310,7 @@ "winpref.js" #elif defined(XP_UNIX) "unix.js" + , "" // placeholder for KDE (empty is otherwise harmless) #if defined(VMS) , "openvms.js" #elif defined(_AIX) @@ -1301,6 +1321,17 @@ #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."); diff -urN Pale-Moon-27.4.0_Release/python/mozbuild/mozpack/chrome/flags.py Pale-Moon-27.4.0_Release-patched/python/mozbuild/mozpack/chrome/flags.py --- Pale-Moon-27.4.0_Release/python/mozbuild/mozpack/chrome/flags.py 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/python/mozbuild/mozpack/chrome/flags.py 2017-07-13 00:38:15.792612932 +1000 @@ -213,6 +213,7 @@ 'platform': Flag, 'xpcnativewrappers': Flag, 'tablet': Flag, + 'desktop': StringFlag, 'process': StringFlag, } RE = re.compile(r'([!<>=]+)') diff -urN Pale-Moon-27.4.0_Release/python/mozbuild/mozpack/chrome/manifest.py Pale-Moon-27.4.0_Release-patched/python/mozbuild/mozpack/chrome/manifest.py --- Pale-Moon-27.4.0_Release/python/mozbuild/mozpack/chrome/manifest.py 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/python/mozbuild/mozpack/chrome/manifest.py 2017-07-13 00:38:15.792612932 +1000 @@ -35,6 +35,7 @@ 'abi', 'xpcnativewrappers', 'tablet', + 'desktop', 'process', ] diff -urN Pale-Moon-27.4.0_Release/toolkit/components/downloads/moz.build Pale-Moon-27.4.0_Release-patched/toolkit/components/downloads/moz.build --- Pale-Moon-27.4.0_Release/toolkit/components/downloads/moz.build 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/components/downloads/moz.build 2017-07-13 00:38:15.793612932 +1000 @@ -51,7 +51,8 @@ LOCAL_INCLUDES += [ '../protobuf', - '/ipc/chromium/src' + '/ipc/chromium/src', + '/toolkit/xre', ] DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True diff -urN Pale-Moon-27.4.0_Release/toolkit/components/downloads/nsDownloadManager.cpp Pale-Moon-27.4.0_Release-patched/toolkit/components/downloads/nsDownloadManager.cpp --- Pale-Moon-27.4.0_Release/toolkit/components/downloads/nsDownloadManager.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/components/downloads/nsDownloadManager.cpp 2017-07-13 00:38:15.800612932 +1000 @@ -51,6 +51,10 @@ #endif #endif +#if defined(XP_UNIX) && !defined(XP_MACOSX) +#include "nsKDEUtils.h" +#endif + #ifdef XP_MACOSX #include #endif @@ -2714,6 +2718,15 @@ pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert); if (showTaskbarAlert) { + if( nsKDEUtils::kdeSupport()) { + nsTArray 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); @@ -2751,9 +2764,10 @@ 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 fileURL = do_QueryInterface(mTarget); diff -urN Pale-Moon-27.4.0_Release/toolkit/content/jar.mn Pale-Moon-27.4.0_Release-patched/toolkit/content/jar.mn --- Pale-Moon-27.4.0_Release/toolkit/content/jar.mn 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/content/jar.mn 2017-07-13 00:38:15.801612932 +1000 @@ -64,6 +64,8 @@ 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) @@ -77,6 +79,8 @@ 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) diff -urN Pale-Moon-27.4.0_Release/toolkit/content/widgets/dialog-kde.xml Pale-Moon-27.4.0_Release-patched/toolkit/content/widgets/dialog-kde.xml --- Pale-Moon-27.4.0_Release/toolkit/content/widgets/dialog-kde.xml 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/content/widgets/dialog-kde.xml 2017-07-13 00:38:15.802612932 +1000 @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + null + (function(event) { + if (!document.documentElement.cancelDialog()) + event.preventDefault(); + }) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (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 ); + ]]> + + + + + + 0 ? xOffset : 0; + yOffset = yOffset > 0 ? yOffset : 0; + window.moveTo(xOffset, yOffset); + ]]> + + + + + + + + + + + + + + + + + + // see bug 63370 for details + this._mStrBundle = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService) + .createBundle("chrome://global/locale/dialog.properties"); + } + return this._mStrBundle; + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if (!event.defaultPrevented) + this.cancelDialog(); + +#ifdef XP_MACOSX + +#else + + var btn = this.getButton(this.defaultButton); + if (btn) + btn.setAttribute("default", event.originalTarget == btn || !(event.originalTarget instanceof Components.interfaces.nsIDOMXULButtonElement)); + +#endif + + + + + + + + + + + + + + + diff -urN Pale-Moon-27.4.0_Release/toolkit/content/widgets/preferences-kde.xml Pale-Moon-27.4.0_Release-patched/toolkit/content/widgets/preferences-kde.xml --- Pale-Moon-27.4.0_Release/toolkit/content/widgets/preferences-kde.xml 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/content/widgets/preferences-kde.xml 2017-07-13 00:38:15.805612932 +1000 @@ -0,0 +1,1358 @@ + + + + %preferencesDTD; + + %globalKeysDTD; +]> + + + +# +# = Preferences Window Framework +# +# The syntax for use looks something like: +# +# +# +# +# +# +# +# +# +# +# + + + + + + elements is constructed. Its purpose is to propagate + // the values to the associated form elements + + var elements = this.getElementsByTagName("preference"); + for (let element of elements) { + if (!element._constructed) { + return; + } + } + for (let element of elements) { + element.updateElements(); + } + ]]> + + + + + + + + + + + + + + + + + + + + Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); + + + Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); + + + this.service.getDefaultBranch(""); + + + Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranchInternal); + + + + + + + + + + + + + + + + + + + + + this.preferences.rootBranchInternal + .removeObserver(this.name, this.preferences); + + false + + + return this.getAttribute("instantApply") == "true" || this.preferences.instantApply; + + + + + + + if (val == this.name) + return val; + + this.preferences.rootBranchInternal + .removeObserver(this.name, this.preferences); + this.setAttribute('name', val); + this.preferences.rootBranchInternal + .addObserver(val, this.preferences, false); + + return val; + + + + + + + null + + + + + + + + + + + return this.preferences.rootBranch.prefIsLocked(this.name); + + + + + + return this.getAttribute("disabled") == "true"; + + + + + + + + + return parseInt(this.getAttribute("tabindex")); + + + + + + + + + + + + + + + // defer reset until preference update + this.value = undefined; + + + + false + + + + + + + + + return this._useDefault ? this.preferences.defaultBranch : this.preferences.rootBranch; + + + + false + + + + with id='" + this.id + "' and name='" + + this.name + "' has unknown type '" + this.type + "'."; + consoleService.logStringMessage(msg); + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + this.updateElements(); + + + + + + + + + +#else + title="&preferencesDefaultTitleMac.title;"> +#endif + + + + + + + + + +#ifdef XP_UNIX_GNOME + + + + + + + + + + + + + + + false + + + + + + + + + + this.setAttribute("lastSelected", val); + document.persist(this.id, "lastSelected"); + return val; + + + + + if (!this._currentPane) + this._currentPane = this.preferencePanes[0]; + + return this._currentPane; + + + null + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + 1) + aPaneElement.removeAttribute("flex"); + // Calling sizeToContent after the first prefpane is loaded + // will size the windows contents so style information is + // available to calculate correct sizing. + if (!this._initialized && prefpanes.length > 1) { + if (this._shouldAnimate) + this.style.minHeight = 0; + window.sizeToContent(); + } + + var oldPane = this.lastSelected ? document.getElementById(this.lastSelected) : this.preferencePanes[0]; + oldPane.selected = !(aPaneElement.selected = true); + this.lastSelected = aPaneElement.id; + this.currentPane = aPaneElement; + this._initialized = true; + + // Only animate if we've switched between prefpanes + if (this._shouldAnimate && oldPane.id != aPaneElement.id) { + aPaneElement.style.opacity = 0.0; + this.animate(oldPane, aPaneElement); + } + else if (!this._shouldAnimate && prefpanes.length > 1) { + var targetHeight = parseInt(window.getComputedStyle(this._paneDeckContainer, "").height); + var verticalPadding = parseInt(window.getComputedStyle(aPaneElement, "").paddingTop); + verticalPadding += parseInt(window.getComputedStyle(aPaneElement, "").paddingBottom); + if (aPaneElement.contentHeight > targetHeight - verticalPadding) { + // To workaround the bottom border of a groupbox from being + // cutoff an hbox with a class of bottomBox may enclose it. + // This needs to include its padding to resize properly. + // See bug 394433 + var bottomPadding = 0; + var bottomBox = aPaneElement.getElementsByAttribute("class", "bottomBox")[0]; + if (bottomBox) + bottomPadding = parseInt(window.getComputedStyle(bottomBox, "").paddingBottom); + window.innerHeight += bottomPadding + verticalPadding + aPaneElement.contentHeight - targetHeight; + } + + // XXX rstrong - extend the contents of the prefpane to + // prevent elements from being cutoff (see bug 349098). + if (aPaneElement.contentHeight + verticalPadding < targetHeight) + aPaneElement._content.style.height = targetHeight - verticalPadding + "px"; + } + } + break; + } + } + ]]> + + + + + + + + + + + + + + oldHeight ? 1 : -1; + var sizeDelta = Math.abs(oldHeight - aNewPane.contentHeight); + this._animateRemainder = sizeDelta % this._animateIncrement; + + this._setUpAnimationTimer(oldHeight); + ]]> + + + + + + 0 && this._currentHeight >= lastSelectedPane.contentHeight) || + (this._multiplier < 0 && this._currentHeight <= lastSelectedPane.contentHeight)) + return 0; + + if ((this._multiplier > 0 && newHeight > lastSelectedPane.contentHeight) || + (this._multiplier < 0 && newHeight < lastSelectedPane.contentHeight)) + increment = this._animateRemainder * this._multiplier; + return increment; + ]]> + + + + + + + + + + + + + + + + + + + + + + + + null + null + 15 + 40 + 5 + 0.40 + 0 + 0 + 0 + + + + + + + + + + + + + + return openDialog(aURL, "", "modal,centerscreen,resizable=no" + (aFeatures != "" ? ("," + aFeatures) : ""), aParams); + + + + + + + + + + + + + + + + + + + if (event.originalTarget.hasAttribute("pane")) { + var pane = document.getElementById(event.originalTarget.getAttribute("pane")); + this.showPane(pane); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + return document.getElementById(aElement.getAttribute("preference")); + + + + + + + + + + + + + + + + + + + + var targetHeight = parseInt(window.getComputedStyle(this._content, "").height); + targetHeight += parseInt(window.getComputedStyle(this._content, "").marginTop); + targetHeight += parseInt(window.getComputedStyle(this._content, "").marginBottom); + return targetHeight; + + + + document.getAnonymousElementByAttribute(this, "class", "content-box"); + + + + + // This "command" event handler tracks changes made to preferences by + // the user in this window. + if (event.sourceEvent) + event = event.sourceEvent; + this.userChangedValue(event.target); + + + // This "select" event handler tracks changes made to colorpicker + // preferences by the user in this window. + if (event.target.localName == "colorpicker") + this.userChangedValue(event.target); + + + // This "change" event handler tracks changes made to preferences by + // the user in this window. + this.userChangedValue(event.target); + + + // This "input" event handler tracks changes made to preferences by + // the user in this window. + this.userChangedValue(event.target); + + + + + + + + + + + + + + + + + + + +# -*- Mode: Java; 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/. + +# +# This is PrefWindow 6. The Code Could Well Be Ready, Are You? +# +# Historical References: +# PrefWindow V (February 1, 2003) +# PrefWindow IV (April 24, 2000) +# PrefWindow III (January 6, 2000) +# PrefWindow II (???) +# PrefWindow I (June 4, 1999) +# diff -urN Pale-Moon-27.4.0_Release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Pale-Moon-27.4.0_Release-patched/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- Pale-Moon-27.4.0_Release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2017-07-13 00:38:15.806612932 +1000 @@ -19,6 +19,8 @@ #include "nsInterfaceHashtable.h" #include "mozilla/Attributes.h" #include "nsIURI.h" +#include "nsVoidArray.h" +#include "nsKDEUtils.h" class nsUnixSystemProxySettings final : public nsISystemProxySettings { public: @@ -43,6 +45,7 @@ nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult); 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) @@ -505,6 +508,9 @@ 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)) @@ -540,3 +546,29 @@ }; NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule; + +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 command; + command.AppendElement( NS_LITERAL_CSTRING( "GETPROXY" )); + command.AppendElement( url ); + nsTArray result; + if( !nsKDEUtils::command( command, &result ) || result.Length() != 1 ) + return NS_ERROR_FAILURE; + aResult = result[0]; + return NS_OK; +} + diff -urN Pale-Moon-27.4.0_Release/toolkit/xre/moz.build Pale-Moon-27.4.0_Release-patched/toolkit/xre/moz.build --- Pale-Moon-27.4.0_Release/toolkit/xre/moz.build 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/xre/moz.build 2017-07-13 00:38:15.806612932 +1000 @@ -50,7 +50,9 @@ 'nsQAppInstance.cpp', ] elif CONFIG['MOZ_ENABLE_GTK']: + EXPORTS += ['nsKDEUtils.h'] UNIFIED_SOURCES += [ + 'nsKDEUtils.cpp', 'nsNativeAppSupportUnix.cpp', ] else: diff -urN Pale-Moon-27.4.0_Release/toolkit/xre/nsKDEUtils.cpp Pale-Moon-27.4.0_Release-patched/toolkit/xre/nsKDEUtils.cpp --- Pale-Moon-27.4.0_Release/toolkit/xre/nsKDEUtils.cpp 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/xre/nsKDEUtils.cpp 2017-07-13 00:38:15.807612932 +1000 @@ -0,0 +1,339 @@ +/* -*- 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 + +#include +#include +#include +#include +#include +#include + +//#define DEBUG_KDE +#ifdef DEBUG_KDE +#define KMOONHELPER "kmoonhelper" +#else +// not need for lib64, it's a binary +#define KMOONHELPER "/usr/lib/mozilla/kmoonhelper" +#endif + +#define KMOONHELPER_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 command; + command.AppendElement( NS_LITERAL_CSTRING( "CHECK" )); + command.AppendElement( NS_LITERAL_CSTRING( MAKE_STR( KMOONHELPER_VERSION ))); + 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* output; + GMainLoop* loop; + bool success; + }; + +static gboolean kdeReadFunc( GIOChannel*, GIOCondition, gpointer data ) + { + nsKDECommandData* p = static_cast< nsKDECommandData* >( data ); + char buf[ 8192 ]; // TODO big enough + bool command_done = false; + bool command_failed = false; + while( !command_done && !command_failed && fgets( buf, 8192, p->file ) != NULL ) + { // TODO what if the kernel splits a line into two chunks? +//#ifdef DEBUG_KDE +// fprintf( stderr, "READ: %s %d\n", buf, feof( p->file )); +//#endif + if( char* eol = strchr( buf, '\n' )) + *eol = '\0'; + command_done = ( strcmp( buf, "\\1" ) == 0 ); + command_failed = ( strcmp( buf, "\\0" ) == 0 ); + nsAutoCString line( buf ); + line.ReplaceSubstring( "\\n", "\n" ); + line.ReplaceSubstring( "\\" "\\", "\\" ); // \\ -> \ , i.e. unescape + if( p->output && !( command_done || command_failed )) + p->output->AppendElement( nsCString( buf )); // TODO utf8? + } + bool quit = false; + if( feof( p->file ) || command_failed ) + { + quit = true; + p->success = false; + } + if( command_done ) + { // reading one reply finished + quit = true; + p->success = true; + } + if( quit ) + { + if( p->loop ) + g_main_loop_quit( p->loop ); + return FALSE; + } + return TRUE; + } + +bool nsKDEUtils::command( const nsTArray& command, nsTArray* output ) + { + return self()->internalCommand( command, NULL, false, output ); + } + +bool nsKDEUtils::command( nsIArray* command, nsIArray** output) + { + nsTArray in; + PRUint32 length; + command->GetLength( &length ); + for ( PRUint32 i = 0; i < length; i++ ) + { + nsCOMPtr str = do_QueryElementAt( command, i ); + if( str ) + { + nsAutoCString s; + str->GetData( s ); + in.AppendElement( s ); + } + } + + nsTArray out; + bool ret = self()->internalCommand( in, NULL, false, &out ); + + if ( !output ) return ret; + + nsCOMPtr result = do_CreateInstance( NS_ARRAY_CONTRACTID ); + if ( !result ) return false; + + for ( PRUint32 i = 0; i < out.Length(); i++ ) + { + nsCOMPtr rstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); + if ( !rstr ) return false; + + rstr->SetData( out[i] ); + result->AppendElement( rstr, false ); + } + + NS_ADDREF( *output = result); + return ret; + } + + +bool nsKDEUtils::commandBlockUi( const nsTArray& command, const GtkWindow* parent, nsTArray* output ) + { + return self()->internalCommand( command, parent, true, output ); + } + +bool nsKDEUtils::internalCommand( const nsTArray& command, const GtkWindow* parent, bool blockUi, + nsTArray* output ) + { + if( !startHelper()) + return false; + feedCommand( command ); + // do not store the data in 'this' but in extra structure, just in case there + // is reentrancy (can there be? the event loop is re-entered) + nsKDECommandData data; + data.file = replyFile; + data.output = output; + data.success = false; + if( blockUi ) + { + data.loop = g_main_loop_new( NULL, FALSE ); + GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + if( parent && parent->group ) + gtk_window_group_add_window( parent->group, GTK_WINDOW( window )); + gtk_widget_realize( window ); + gtk_widget_set_sensitive( window, TRUE ); + gtk_grab_add( window ); + GIOChannel* channel = g_io_channel_unix_new( fileno( data.file )); + g_io_add_watch( channel, static_cast< GIOCondition >( G_IO_IN | G_IO_ERR | G_IO_HUP ), kdeReadFunc, &data ); + g_io_channel_unref( channel ); + g_main_loop_run( data.loop ); + g_main_loop_unref( data.loop ); + gtk_grab_remove( window ); + gtk_widget_destroy( window ); + } + else + { + data.loop = NULL; + while( kdeReadFunc( NULL, static_cast< GIOCondition >( 0 ), &data )) + ; + } + return data.success; + } + +bool nsKDEUtils::startHelper() + { + if( helperRunning ) + return true; + if( helperFailed ) + return false; + helperFailed = true; + int fdcommand[ 2 ]; + int fdreply[ 2 ]; + if( pipe( fdcommand ) < 0 ) + return false; + if( pipe( fdreply ) < 0 ) + { + close( fdcommand[ 0 ] ); + close( fdcommand[ 1 ] ); + return false; + } + char* args[ 2 ] = { const_cast< char* >( KMOONHELPER ), NULL }; + switch( fork()) + { + case -1: + { + close( fdcommand[ 0 ] ); + close( fdcommand[ 1 ] ); + close( fdreply[ 0 ] ); + close( fdreply[ 1 ] ); + return false; + } + case 0: // child + { + if( dup2( fdcommand[ 0 ], STDIN_FILENO ) < 0 ) + _exit( 1 ); + if( dup2( fdreply[ 1 ], STDOUT_FILENO ) < 0 ) + _exit( 1 ); + int maxfd = 1024; // close all other fds + struct rlimit rl; + if( getrlimit( RLIMIT_NOFILE, &rl ) == 0 ) + maxfd = rl.rlim_max; + for( int i = 3; + i < maxfd; + ++i ) + close( i ); +#ifdef DEBUG_KDE + execvp( KMOONHELPER, args ); +#else + execv( KMOONHELPER, args ); +#endif + _exit( 1 ); // failed + } + default: // parent + { + commandFile = fdopen( fdcommand[ 1 ], "w" ); + replyFile = fdopen( fdreply[ 0 ], "r" ); + close( fdcommand[ 0 ] ); + close( fdreply[ 1 ] ); + if( commandFile == NULL || replyFile == NULL ) + { + closeHelper(); + return false; + } + // ok, helper ready, getKdeRunning() will check if it works + } + } + helperFailed = false; + helperRunning = true; + return true; + } + +void nsKDEUtils::closeHelper() + { + if( commandFile != NULL ) + fclose( commandFile ); // this will also make the helper quit + if( replyFile != NULL ) + fclose( replyFile ); + helperRunning = false; + } + +void nsKDEUtils::feedCommand( const nsTArray& command ) + { + for( int i = 0; + i < command.Length(); + ++i ) + { + nsCString line = command[ i ]; + line.ReplaceSubstring( "\\", "\\" "\\" ); // \ -> \\ , i.e. escape + line.ReplaceSubstring( "\n", "\\n" ); +#ifdef DEBUG_KDE + fprintf( stderr, "COMM: %s\n", line.get()); +#endif + fputs( line.get(), commandFile ); + fputs( "\n", commandFile ); + } + fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data + fflush( commandFile ); + } diff -urN Pale-Moon-27.4.0_Release/toolkit/xre/nsKDEUtils.h Pale-Moon-27.4.0_Release-patched/toolkit/xre/nsKDEUtils.h --- Pale-Moon-27.4.0_Release/toolkit/xre/nsKDEUtils.h 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/toolkit/xre/nsKDEUtils.h 2017-07-13 00:38:15.807612932 +1000 @@ -0,0 +1,48 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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/. */ + +#ifndef nsKDEUtils_h__ +#define nsKDEUtils_h__ + +#include "nsStringGlue.h" +#include "nsTArray.h" +#include + +typedef struct _GtkWindow GtkWindow; + +class nsIArray; + +class NS_EXPORT nsKDEUtils + { + public: + /* Returns true if running inside a KDE session (regardless of whether there is KDE + support available for Firefox). This should be used e.g. when determining + dialog button order but not for code that requires the KDE support. */ + static bool kdeSession(); + /* Returns true if running inside a KDE session and KDE support is available + for New Moon. This should be used everywhere where the external helper is needed. */ + static bool kdeSupport(); + /* Executes the given helper command, returns true if helper returned success. */ + static bool command( const nsTArray& command, nsTArray* output = NULL ); + static bool command( nsIArray* command, nsIArray** output = NULL ); + /* Like command(), but additionally blocks the parent widget like if there was + a modal dialog shown and enters the event loop (i.e. there are still paint updates, + this is for commands that take long). */ + static bool commandBlockUi( const nsTArray& command, const GtkWindow* parent, nsTArray* output = NULL ); + + private: + nsKDEUtils(); + ~nsKDEUtils(); + static nsKDEUtils* self(); + bool startHelper(); + void closeHelper(); + void feedCommand( const nsTArray& command ); + bool internalCommand( const nsTArray& command, const GtkWindow* parent, bool isParent, + nsTArray* output ); + FILE* commandFile; + FILE* replyFile; + }; + +#endif // nsKDEUtils diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/moz.build Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/moz.build --- Pale-Moon-27.4.0_Release/uriloader/exthandler/moz.build 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/moz.build 2017-07-13 00:38:15.808612932 +1000 @@ -73,7 +73,9 @@ if CONFIG['MOZ_ENABLE_GTK']: UNIFIED_SOURCES += [ + 'unix/nsCommonRegistry.cpp', 'unix/nsGNOMERegistry.cpp', + 'unix/nsKDERegistry.cpp', 'unix/nsMIMEInfoUnix.cpp', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': @@ -128,6 +130,7 @@ '/dom/ipc', '/netwerk/base', '/netwerk/protocol/http', + '/toolkit/xre', ] if CONFIG['MOZ_ENABLE_DBUS']: diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsCommonRegistry.cpp Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsCommonRegistry.cpp --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsCommonRegistry.cpp 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsCommonRegistry.cpp 2017-07-13 00:38:15.808612932 +1000 @@ -0,0 +1,54 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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 "nsCommonRegistry.h" + +#include "nsGNOMERegistry.h" +#include "nsKDERegistry.h" +#include "nsString.h" +#include "nsVoidArray.h" +#include "nsKDEUtils.h" + +/* static */ bool +nsCommonRegistry::HandlerExists(const char *aProtocolScheme) +{ + if( nsKDEUtils::kdeSupport()) + return nsKDERegistry::HandlerExists( aProtocolScheme ); + return nsGNOMERegistry::HandlerExists( aProtocolScheme ); +} + +/* static */ nsresult +nsCommonRegistry::LoadURL(nsIURI *aURL) +{ + if( nsKDEUtils::kdeSupport()) + return nsKDERegistry::LoadURL( aURL ); + return nsGNOMERegistry::LoadURL( aURL ); +} + +/* static */ void +nsCommonRegistry::GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc) +{ + if( nsKDEUtils::kdeSupport()) + return nsKDERegistry::GetAppDescForScheme( aScheme, aDesc ); + return nsGNOMERegistry::GetAppDescForScheme( aScheme, aDesc ); +} + + +/* static */ already_AddRefed +nsCommonRegistry::GetFromExtension(const nsACString& aFileExt) +{ + if( nsKDEUtils::kdeSupport()) + return nsKDERegistry::GetFromExtension( aFileExt ); + return nsGNOMERegistry::GetFromExtension( aFileExt ); +} + +/* static */ already_AddRefed +nsCommonRegistry::GetFromType(const nsACString& aMIMEType) +{ + if( nsKDEUtils::kdeSupport()) + return nsKDERegistry::GetFromType( aMIMEType ); + return nsGNOMERegistry::GetFromType( aMIMEType ); +} diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsCommonRegistry.h Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsCommonRegistry.h --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsCommonRegistry.h 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsCommonRegistry.h 2017-07-13 00:38:15.809612932 +1000 @@ -0,0 +1,27 @@ +/* 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/. */ + +#ifndef nsCommonRegistry_h__ +#define nsCommonRegistry_h__ + +#include "nsIURI.h" +#include "nsCOMPtr.h" + +class nsMIMEInfoBase; + +class nsCommonRegistry +{ + public: + static bool HandlerExists(const char *aProtocolScheme); + + static nsresult LoadURL(nsIURI *aURL); + + static void GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc); + + static already_AddRefed GetFromExtension(const nsACString& aFileExt); + + static already_AddRefed GetFromType(const nsACString& aMIMEType); +}; +#endif // nsCommonRegistry_h__ diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsKDERegistry.cpp Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsKDERegistry.cpp --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsKDERegistry.cpp 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsKDERegistry.cpp 2017-07-13 00:38:15.809612932 +1000 @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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 "nsKDERegistry.h" +#include "prlink.h" +#include "prmem.h" +#include "nsString.h" +#include "nsILocalFile.h" +#include "nsMIMEInfoUnix.h" +#include "nsAutoPtr.h" +#include "nsKDEUtils.h" + +/* static */ bool +nsKDERegistry::HandlerExists(const char *aProtocolScheme) +{ + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "HANDLEREXISTS" )); + command.AppendElement( nsAutoCString( aProtocolScheme )); + return nsKDEUtils::command( command ); +} + +/* static */ nsresult +nsKDERegistry::LoadURL(nsIURI *aURL) +{ + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "OPEN" )); + nsCString url; + aURL->GetSpec( url ); + command.AppendElement( url ); + bool rv = nsKDEUtils::command( command ); + if (!rv) + return NS_ERROR_FAILURE; + + return NS_OK; +} + +/* static */ void +nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc) +{ + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "GETAPPDESCFORSCHEME" )); + command.AppendElement( aScheme ); + nsTArray output; + if( nsKDEUtils::command( command, &output ) && output.Length() == 1 ) + CopyUTF8toUTF16( output[ 0 ], aDesc ); +} + + +/* static */ already_AddRefed +nsKDERegistry::GetFromExtension(const nsACString& aFileExt) +{ + NS_ASSERTION(aFileExt[0] != '.', "aFileExt shouldn't start with a dot"); + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "GETFROMEXTENSION" )); + command.AppendElement( aFileExt ); + return GetFromHelper( command ); +} + +/* static */ already_AddRefed +nsKDERegistry::GetFromType(const nsACString& aMIMEType) +{ + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "GETFROMTYPE" )); + command.AppendElement( aMIMEType ); + return GetFromHelper( command ); +} + +/* static */ already_AddRefed +nsKDERegistry::GetFromHelper(const nsTArray& command) +{ + nsTArray output; + if( nsKDEUtils::command( command, &output ) && output.Length() == 3 ) + { + nsCString mimetype = output[ 0 ]; + nsRefPtr mimeInfo = new nsMIMEInfoUnix( mimetype ); + NS_ENSURE_TRUE(mimeInfo, nullptr); + nsCString description = output[ 1 ]; + mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description)); + nsCString handlerAppName = output[ 2 ]; + mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName)); + mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault); + return mimeInfo.forget(); + } + return nullptr; +} diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsKDERegistry.h Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsKDERegistry.h --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsKDERegistry.h 1970-01-01 10:00:00.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsKDERegistry.h 2017-07-13 00:38:15.809612932 +1000 @@ -0,0 +1,33 @@ +/* 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/. */ + +#ifndef nsKDERegistry_h__ +#define nsKDERegistry_h__ + +#include "nsIURI.h" +#include "nsCOMPtr.h" +#include "nsTArray.h" + +class nsMIMEInfoBase; +class nsAutoCString; +class nsCString; + +class nsKDERegistry +{ + public: + static bool HandlerExists(const char *aProtocolScheme); + + static nsresult LoadURL(nsIURI *aURL); + + static void GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc); + + static already_AddRefed GetFromExtension(const nsACString& aFileExt); + + static already_AddRefed GetFromType(const nsACString& aMIMEType); + private: + static already_AddRefed GetFromHelper(const nsTArray& command); + +}; +#endif // nsKDERegistry_h__ diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2017-07-13 00:38:15.810612932 +1000 @@ -12,7 +12,7 @@ #endif #include "nsMIMEInfoUnix.h" -#include "nsGNOMERegistry.h" +#include "nsCommonRegistry.h" #include "nsIGIOService.h" #include "nsNetCID.h" #include "nsIIOService.h" @@ -23,11 +23,14 @@ #ifdef MOZ_WIDGET_QT #include "nsMIMEInfoQt.h" #endif +#if defined(XP_UNIX) && !defined(XP_MACOSX) +#include "nsKDEUtils.h" +#endif nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) { - nsresult rv = nsGNOMERegistry::LoadURL(aURI); + nsresult rv = nsCommonRegistry::LoadURL(aURI); #ifdef MOZ_WIDGET_QT if (NS_FAILED(rv)) { @@ -50,14 +53,14 @@ *_retval = false; if (mClass == eProtocolInfo) { - *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get()); + *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get()); } else { - nsRefPtr mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); + nsRefPtr mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType); if (!mimeInfo) { nsAutoCString ext; nsresult rv = GetPrimaryExtension(ext); if (NS_SUCCEEDED(rv)) { - mimeInfo = nsGNOMERegistry::GetFromExtension(ext); + mimeInfo = nsCommonRegistry::GetFromExtension(ext); } } if (mimeInfo) @@ -102,6 +105,23 @@ return NS_ERROR_FAILURE; #endif + if( nsKDEUtils::kdeSupport()) { + bool supports; + if( NS_SUCCEEDED( GetHasDefaultHandler( &supports )) && supports ) { + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "OPEN" )); + command.AppendElement( nativePath ); + command.AppendElement( NS_LITERAL_CSTRING( "MIMETYPE" )); + command.AppendElement( mSchemeOrType ); + if( nsKDEUtils::command( command )) + return NS_OK; + } + if (!mDefaultApplication) + return NS_ERROR_FILE_NOT_FOUND; + + return LaunchWithIProcess(mDefaultApplication, nativePath); + } + nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); if (!giovfs) { return NS_ERROR_FAILURE; diff -urN Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsOSHelperAppService.cpp Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- Pale-Moon-27.4.0_Release/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2017-07-13 00:38:15.811612932 +1000 @@ -15,7 +15,7 @@ #include "nsOSHelperAppService.h" #include "nsMIMEInfoUnix.h" #ifdef MOZ_WIDGET_GTK -#include "nsGNOMERegistry.h" +#include "nsCommonRegistry.h" #endif #include "nsISupports.h" #include "nsString.h" @@ -1151,7 +1151,7 @@ #ifdef MOZ_WIDGET_GTK // Check the GNOME registry for a protocol handler - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); #endif return NS_OK; @@ -1160,7 +1160,7 @@ NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) { #ifdef MOZ_WIDGET_GTK - nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval); + nsCommonRegistry::GetAppDescForScheme(aScheme, _retval); return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK; #else return NS_ERROR_NOT_AVAILABLE; @@ -1257,7 +1257,7 @@ #ifdef MOZ_WIDGET_GTK LOG(("Looking in GNOME registry\n")); nsRefPtr gnomeInfo = - nsGNOMERegistry::GetFromExtension(aFileExt); + nsCommonRegistry::GetFromExtension(aFileExt); if (gnomeInfo) { LOG(("Got MIMEInfo from GNOME registry\n")); return gnomeInfo.forget(); @@ -1378,7 +1378,7 @@ #ifdef MOZ_WIDGET_GTK if (handler.IsEmpty()) { - nsRefPtr gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); + nsRefPtr gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); if (gnomeInfo) { LOG(("Got MIMEInfo from GNOME registry without extensions; setting them " "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get())); diff -urN Pale-Moon-27.4.0_Release/widget/gtk/moz.build Pale-Moon-27.4.0_Release-patched/widget/gtk/moz.build --- Pale-Moon-27.4.0_Release/widget/gtk/moz.build 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/widget/gtk/moz.build 2017-07-13 00:38:15.811612932 +1000 @@ -84,6 +84,7 @@ '/layout/generic', '/layout/xul', '/other-licenses/atk-1.0', + '/toolkit/xre', '/widget', ] diff -urN Pale-Moon-27.4.0_Release/widget/gtk/nsFilePicker.cpp Pale-Moon-27.4.0_Release-patched/widget/gtk/nsFilePicker.cpp --- Pale-Moon-27.4.0_Release/widget/gtk/nsFilePicker.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/widget/gtk/nsFilePicker.cpp 2017-07-13 00:38:15.812612932 +1000 @@ -9,6 +9,7 @@ #include #include +#include #include "nsGtkUtils.h" #include "nsIFileURL.h" @@ -25,6 +26,7 @@ #include "mozcontainer.h" #include "nsFilePicker.h" +#include "nsKDEUtils.h" using namespace mozilla; @@ -248,7 +250,9 @@ { if (aFilter.EqualsLiteral("..apps")) { // No platform specific thing we can do here, really.... - return NS_OK; + // Unless it's KDE. + if( mMode != modeOpen || !nsKDEUtils::kdeSupport()) + return NS_OK; } nsAutoCString filter, name; @@ -373,6 +377,22 @@ if (mRunning) return NS_ERROR_NOT_AVAILABLE; + // KDE file picker is not handled via callback + if( nsKDEUtils::kdeSupport()) { + int16_t result; + mCallback = aCallback; + mRunning = true; + kdeFileDialog(&result); + if (mCallback) { + mCallback->Done(result); + mCallback = nullptr; + } else { + mResult = result; + } + mRunning = false; + return NS_OK; + } + nsXPIDLCString title; title.Adopt(ToNewUTF8String(mTitle)); @@ -561,3 +581,230 @@ } NS_RELEASE_THIS(); } + +nsCString nsFilePicker::kdeMakeFilter( int index ) + { + nsCString buf = mFilters[ index ]; + for( PRUint32 i = 0; + i < buf.Length(); + ++i ) + if( buf[ i ] == ';' ) // KDE separates just using spaces + buf.SetCharAt( ' ', i ); + if (!mFilterNames[index].IsEmpty()) + { + buf += "|"; + buf += mFilterNames[index].get(); + } + return buf; + } + +static PRInt32 windowToXid( nsIWidget* widget ) + { + GtkWindow *parent_widget = GTK_WINDOW(widget->GetNativeData(NS_NATIVE_SHELLWIDGET)); + GdkWindow* gdk_window = gtk_widget_get_window( gtk_widget_get_toplevel( GTK_WIDGET( parent_widget ))); + return GDK_WINDOW_XID( gdk_window ); + } + +NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn) + { + NS_ENSURE_ARG_POINTER(aReturn); + + if( mMode == modeOpen && mFilters.Length() == 1 && mFilters[ 0 ].EqualsLiteral( "..apps" )) + return kdeAppsDialog( aReturn ); + + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); + + const char* arg = NULL; + if( mAllowURLs ) + { + switch( mMode ) + { + case nsIFilePicker::modeOpen: + case nsIFilePicker::modeOpenMultiple: + arg = "GETOPENURL"; + break; + case nsIFilePicker::modeSave: + arg = "GETSAVEURL"; + break; + case nsIFilePicker::modeGetFolder: + arg = "GETDIRECTORYURL"; + break; + } + } + else + { + switch( mMode ) + { + case nsIFilePicker::modeOpen: + case nsIFilePicker::modeOpenMultiple: + arg = "GETOPENFILENAME"; + break; + case nsIFilePicker::modeSave: + arg = "GETSAVEFILENAME"; + break; + case nsIFilePicker::modeGetFolder: + arg = "GETDIRECTORYFILENAME"; + break; + } + } + + nsAutoCString directory; + if (mDisplayDirectory) { + mDisplayDirectory->GetNativePath(directory); + } else if (mPrevDisplayDirectory) { + mPrevDisplayDirectory->GetNativePath(directory); + } + + nsAutoCString startdir; + if (!directory.IsEmpty()) { + startdir = directory; + } + if (mMode == nsIFilePicker::modeSave) { + if( !startdir.IsEmpty()) + { + startdir += "/"; + startdir += ToNewUTF8String(mDefault); + } + else + startdir = ToNewUTF8String(mDefault); + } + if( startdir.IsEmpty()) + startdir = "."; + + nsAutoCString filters; + PRInt32 count = mFilters.Length(); + if( count == 0 ) //just in case + filters = "*"; + else + { + filters = kdeMakeFilter( 0 ); + for (PRInt32 i = 1; i < count; ++i) + { + filters += "\n"; + filters += kdeMakeFilter( i ); + } + } + + nsTArray command; + command.AppendElement( nsAutoCString( arg )); + command.AppendElement( startdir ); + if( mMode != nsIFilePicker::modeGetFolder ) + { + command.AppendElement( filters ); + nsAutoCString selected; + selected.AppendInt( mSelectedType ); + command.AppendElement( selected ); + } + command.AppendElement( title ); + if( mMode == nsIFilePicker::modeOpenMultiple ) + command.AppendElement( NS_LITERAL_CSTRING( "MULTIPLE" )); + if( PRInt32 xid = windowToXid( mParentWidget )) + { + command.AppendElement( NS_LITERAL_CSTRING( "PARENT" )); + nsAutoCString parent; + parent.AppendInt( xid ); + command.AppendElement( parent ); + } + + nsTArray output; + if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output )) + { + *aReturn = nsIFilePicker::returnOK; + mFiles.Clear(); + if( mMode != nsIFilePicker::modeGetFolder ) + { + mSelectedType = atoi( output[ 0 ].get()); + output.RemoveElementAt( 0 ); + } + if (mMode == nsIFilePicker::modeOpenMultiple) + { + mFileURL.Truncate(); + PRUint32 count = output.Length(); + for( PRUint32 i = 0; + i < count; + ++i ) + { + nsCOMPtr localfile; + nsresult rv = NS_NewNativeLocalFile( output[ i ], + PR_FALSE, + getter_AddRefs(localfile)); + if (NS_SUCCEEDED(rv)) + mFiles.AppendObject(localfile); + } + } + else + { + if( output.Length() == 0 ) + mFileURL = nsCString(); + else if( mAllowURLs ) + mFileURL = output[ 0 ]; + else // GetFile() actually requires it to be url even for local files :-/ + { + mFileURL = nsCString( "file://" ); + mFileURL.Append( output[ 0 ] ); + } + } + // Remember last used directory. + nsCOMPtr file; + GetFile(getter_AddRefs(file)); + if (file) { + nsCOMPtr dir; + file->GetParent(getter_AddRefs(dir)); + nsCOMPtr localDir(do_QueryInterface(dir)); + if (localDir) { + localDir.swap(mPrevDisplayDirectory); + } + } + if (mMode == nsIFilePicker::modeSave) + { + nsCOMPtr file; + GetFile(getter_AddRefs(file)); + if (file) + { + bool exists = false; + file->Exists(&exists); + if (exists) // TODO do overwrite check in the helper app + *aReturn = nsIFilePicker::returnReplace; + } + } + } + else + { + *aReturn = nsIFilePicker::returnCancel; + } + return NS_OK; + } + + +NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn) + { + NS_ENSURE_ARG_POINTER(aReturn); + + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); + + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING( "APPSDIALOG" )); + command.AppendElement( title ); + if( PRInt32 xid = windowToXid( mParentWidget )) + { + command.AppendElement( NS_LITERAL_CSTRING( "PARENT" )); + nsAutoCString parent; + parent.AppendInt( xid ); + command.AppendElement( parent ); + } + + nsTArray output; + if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output )) + { + *aReturn = nsIFilePicker::returnOK; + mFileURL = output.Length() > 0 ? output[ 0 ] : nsCString(); + } + else + { + *aReturn = nsIFilePicker::returnCancel; + } + return NS_OK; + } + diff -urN Pale-Moon-27.4.0_Release/widget/gtk/nsFilePicker.h Pale-Moon-27.4.0_Release-patched/widget/gtk/nsFilePicker.h --- Pale-Moon-27.4.0_Release/widget/gtk/nsFilePicker.h 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/widget/gtk/nsFilePicker.h 2017-07-13 00:38:15.813612932 +1000 @@ -73,6 +73,12 @@ private: static nsIFile *mPrevDisplayDirectory; + + bool kdeRunning(); + bool getKdeRunning(); + NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn); + NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn); + nsCString kdeMakeFilter( int index ); }; #endif diff -urN Pale-Moon-27.4.0_Release/xpcom/components/ManifestParser.cpp Pale-Moon-27.4.0_Release-patched/xpcom/components/ManifestParser.cpp --- Pale-Moon-27.4.0_Release/xpcom/components/ManifestParser.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/xpcom/components/ManifestParser.cpp 2017-07-13 00:38:15.814612932 +1000 @@ -36,6 +36,7 @@ #include "nsIScriptError.h" #include "nsIXULAppInfo.h" #include "nsIXULRuntime.h" +#include "nsKDEUtils.h" #ifdef MOZ_B2G_LOADER #include "mozilla/XPTInterfaceInfoManager.h" #endif @@ -495,6 +496,7 @@ NS_NAMED_LITERAL_STRING(kOs, "os"); NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kABI, "abi"); + NS_NAMED_LITERAL_STRING(kDesktop, "desktop"); NS_NAMED_LITERAL_STRING(kProcess, "process"); #if defined(MOZ_WIDGET_ANDROID) NS_NAMED_LITERAL_STRING(kTablet, "tablet"); @@ -555,6 +557,7 @@ } nsAutoString osVersion; + nsAutoString desktop; #if defined(XP_WIN) #pragma warning(push) #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx @@ -564,6 +567,7 @@ info.dwMajorVersion, info.dwMinorVersion); } + desktop = NS_LITERAL_STRING("win"); #pragma warning(pop) #elif defined(MOZ_WIDGET_COCOA) SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); @@ -571,10 +575,12 @@ nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), majorVersion, minorVersion); + desktop = NS_LITERAL_STRING("macosx"); #elif defined(MOZ_WIDGET_GTK) nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), gtk_major_version, gtk_minor_version); + desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); #elif defined(MOZ_WIDGET_ANDROID) bool isTablet = false; if (mozilla::AndroidBridge::Bridge()) { @@ -583,6 +589,7 @@ osVersion); isTablet = mozilla::widget::GoannaAppShell::IsTablet(); } + desktop = NS_LITERAL_STRING("android"); #endif if (XRE_GetProcessType() == GoannaProcessType_Content) { @@ -682,6 +689,7 @@ TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; + TriState stDesktop = eUnspecified; TriState stProcess = eUnspecified; #if defined(MOZ_WIDGET_ANDROID) TriState stTablet = eUnspecified; @@ -696,6 +704,7 @@ if (CheckStringFlag(kApplication, wtoken, appID, stApp) || CheckStringFlag(kOs, wtoken, osTarget, stOs) || CheckStringFlag(kABI, wtoken, abi, stABI) || + CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || CheckStringFlag(kProcess, wtoken, process, stProcess) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || @@ -755,6 +764,7 @@ stGoannaVersion == eBad || stOs == eBad || stOsVersion == eBad || + stDesktop == eBad || #ifdef MOZ_WIDGET_ANDROID stTablet == eBad || #endif diff -urN Pale-Moon-27.4.0_Release/xpcom/components/moz.build Pale-Moon-27.4.0_Release-patched/xpcom/components/moz.build --- Pale-Moon-27.4.0_Release/xpcom/components/moz.build 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/xpcom/components/moz.build 2017-07-13 00:38:15.814612932 +1000 @@ -53,6 +53,7 @@ '../reflect/xptinfo', '/chrome', '/modules/libjar', + '/toolkit/xre', ] if CONFIG['MOZ_WIDGET_GTK']: diff -urN Pale-Moon-27.4.0_Release/xpcom/io/nsLocalFileUnix.cpp Pale-Moon-27.4.0_Release-patched/xpcom/io/nsLocalFileUnix.cpp --- Pale-Moon-27.4.0_Release/xpcom/io/nsLocalFileUnix.cpp 2017-07-10 22:23:16.000000000 +1000 +++ Pale-Moon-27.4.0_Release-patched/xpcom/io/nsLocalFileUnix.cpp 2017-07-13 00:38:15.816612932 +1000 @@ -49,6 +49,7 @@ #ifdef MOZ_WIDGET_GTK #include "nsIGIOService.h" +#include "nsKDEUtils.h" #endif #ifdef MOZ_WIDGET_COCOA @@ -1969,18 +1970,16 @@ nsLocalFile::Reveal() { #ifdef MOZ_WIDGET_GTK - nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - if (!giovfs) { - return NS_ERROR_FAILURE; - } + nsAutoCString url; bool isDirectory; if (NS_FAILED(IsDirectory(&isDirectory))) { return NS_ERROR_FAILURE; } + nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); if (isDirectory) { - return giovfs->ShowURIForInput(mPath); + url = mPath; } else if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { return NS_OK; } else { @@ -1993,8 +1992,21 @@ return NS_ERROR_FAILURE; } - return giovfs->ShowURIForInput(dirPath); + url = dirPath; + } + + if(nsKDEUtils::kdeSupport()) { + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING("REVEAL") ); + command.AppendElement( mPath ); + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; } + + if (!giovfs) + return NS_ERROR_FAILURE; + + return giovfs->ShowURIForInput(url); + #elif defined(MOZ_WIDGET_COCOA) CFURLRef url; if (NS_SUCCEEDED(GetCFURL(&url))) { @@ -2012,6 +2024,13 @@ nsLocalFile::Launch() { #ifdef MOZ_WIDGET_GTK + if( nsKDEUtils::kdeSupport()) { + nsTArray command; + command.AppendElement( NS_LITERAL_CSTRING("OPEN") ); + command.AppendElement( mPath ); + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + } + nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); if (!giovfs) { return NS_ERROR_FAILURE;