2024-08-23 16:57:44 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Martin Sirringhaus <msirringhaus@suse.de>
|
|
|
|
Date: Tue, 8 Aug 2023 16:18:24 +0300
|
|
|
|
Subject: [PATCH] Add KDE integration to Firefox
|
|
|
|
|
|
|
|
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
|
|
|
|
Bug: https://bugzilla.suse.com/show_bug.cgi?id=170055
|
|
|
|
|
2024-05-03 10:46:31 +02:00
|
|
|
How to apply this patch:
|
2024-08-23 16:57:44 +02:00
|
|
|
|
2024-05-03 10:46:31 +02:00
|
|
|
1. Import and apply it
|
|
|
|
2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
|
|
|
|
3. Find editBookmarkPanelDoneButton
|
|
|
|
4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
|
|
|
|
5. hg qrefresh
|
2024-08-23 16:57:44 +02:00
|
|
|
---
|
|
|
|
browser/components/preferences/main.js | 18 +++
|
|
|
|
browser/components/shell/moz.build | 2 +
|
|
|
|
.../components/shell/nsKDEShellService.cpp | 109 ++++++++++++++++++
|
|
|
|
browser/components/shell/nsKDEShellService.h | 32 +++++
|
|
|
|
.../components/shell/nsUnixShellService.cpp | 22 ++++
|
|
|
|
browser/components/shell/nsUnixShellService.h | 15 +++
|
|
|
|
6 files changed, 198 insertions(+)
|
|
|
|
create mode 100644 browser/components/shell/nsKDEShellService.cpp
|
|
|
|
create mode 100644 browser/components/shell/nsKDEShellService.h
|
|
|
|
create mode 100644 browser/components/shell/nsUnixShellService.cpp
|
|
|
|
create mode 100644 browser/components/shell/nsUnixShellService.h
|
2024-05-03 10:46:31 +02:00
|
|
|
|
2024-08-23 16:57:44 +02:00
|
|
|
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
|
|
|
|
--- a/browser/components/preferences/main.js
|
|
|
|
+++ b/browser/components/preferences/main.js
|
|
|
|
@@ -292,16 +292,23 @@ var gMainPane = {
|
|
|
|
}, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
|
|
|
|
};
|
|
|
|
|
|
|
|
window.setTimeout(() => {
|
|
|
|
window.requestIdleCallback(pollForDefaultBrowser);
|
2024-05-03 10:46:31 +02:00
|
|
|
}, backoffTimes[this._backoffIndex]);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ var env = Components.classes["@mozilla.org/process/environment;1"]
|
|
|
|
+ .getService(Components.interfaces.nsIEnvironment);
|
|
|
|
+ var kde_session = 0;
|
|
|
|
+ if (env.get('KDE_FULL_SESSION') == "true") {
|
|
|
|
+ kde_session = 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
this.initBrowserContainers();
|
|
|
|
this.buildContentProcessCountMenuList();
|
|
|
|
|
2024-08-23 16:57:44 +02:00
|
|
|
this.updateDefaultPerformanceSettingsPref();
|
|
|
|
|
|
|
|
let defaultPerformancePref = Preferences.get(
|
|
|
|
"browser.preferences.defaultPerformanceSettings.enabled"
|
|
|
|
);
|
|
|
|
@@ -1753,16 +1760,27 @@ var gMainPane = {
|
|
|
|
|
|
|
|
// Disable the set default button, so that the user doesn't try to hit it again
|
|
|
|
// while awaiting on setDefaultBrowser
|
|
|
|
let setDefaultButton = document.getElementById("setDefaultButton");
|
|
|
|
setDefaultButton.disabled = true;
|
|
|
|
|
2024-05-03 10:46:31 +02:00
|
|
|
try {
|
2024-08-23 16:57:44 +02:00
|
|
|
await shellSvc.setDefaultBrowser(false);
|
2024-05-03 10:46:31 +02:00
|
|
|
+ if (kde_session == 1) {
|
|
|
|
+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
|
|
|
|
+ .createInstance(Components.interfaces.nsILocalFile);
|
|
|
|
+ shellObj.initWithPath("/usr/bin/kwriteconfig");
|
|
|
|
+ var process = Components.classes["@mozilla.org/process/util;1"]
|
|
|
|
+ .createInstance(Components.interfaces.nsIProcess);
|
|
|
|
+ process.init(shellObj);
|
|
|
|
+ var args = ["--file", "kdeglobals", "--group", "General", "--key",
|
|
|
|
+ "BrowserApplication", "firefox"];
|
|
|
|
+ process.run(false, args, args.length);
|
|
|
|
+ }
|
|
|
|
} catch (ex) {
|
|
|
|
console.error(ex);
|
|
|
|
return;
|
2024-08-23 16:57:44 +02:00
|
|
|
} finally {
|
|
|
|
// Make sure to re-enable the default button when we're finished, regardless of the outcome
|
|
|
|
setDefaultButton.disabled = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
|
|
|
|
--- a/browser/components/shell/moz.build
|
|
|
|
+++ b/browser/components/shell/moz.build
|
|
|
|
@@ -31,16 +31,18 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "coco
|
|
|
|
]
|
|
|
|
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
|
|
|
XPIDL_SOURCES += [
|
|
|
|
"nsIGNOMEShellService.idl",
|
|
|
|
]
|
2024-05-03 10:46:31 +02:00
|
|
|
|
|
|
|
SOURCES += [
|
|
|
|
"nsGNOMEShellService.cpp",
|
|
|
|
+ "nsKDEShellService.cpp",
|
|
|
|
+ "nsUnixShellService.cpp",
|
|
|
|
]
|
|
|
|
if CONFIG["MOZ_ENABLE_DBUS"]:
|
|
|
|
SOURCES += [
|
2024-08-23 16:57:44 +02:00
|
|
|
"nsGNOMEShellDBusHelper.cpp",
|
|
|
|
"nsGNOMEShellSearchProvider.cpp",
|
|
|
|
]
|
|
|
|
include("/ipc/chromium/chromium-config.mozbuild")
|
|
|
|
|
|
|
|
diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
|
|
|
|
new file mode 100644
|
2024-05-03 10:46:31 +02:00
|
|
|
--- /dev/null
|
2024-08-23 16:57:44 +02:00
|
|
|
+++ b/browser/components/shell/nsKDEShellService.cpp
|
|
|
|
@@ -0,0 +1,108 @@
|
2024-05-03 10:46:31 +02:00
|
|
|
+/* -*- 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 "mozilla/ArrayUtils.h"
|
|
|
|
+
|
|
|
|
+#include "nsCOMPtr.h"
|
|
|
|
+#include "nsKDEShellService.h"
|
|
|
|
+#include "nsShellService.h"
|
|
|
|
+#include "nsKDEUtils.h"
|
|
|
|
+#include "nsIPrefService.h"
|
|
|
|
+#include "nsIProcess.h"
|
|
|
|
+#include "nsIFile.h"
|
|
|
|
+#include "nsServiceManagerUtils.h"
|
|
|
|
+#include "nsComponentManagerUtils.h"
|
|
|
|
+#include "nsIMutableArray.h"
|
|
|
|
+#include "nsISupportsPrimitives.h"
|
|
|
|
+#include "nsArrayUtils.h"
|
|
|
|
+
|
|
|
|
+using namespace mozilla;
|
|
|
|
+
|
|
|
|
+nsresult
|
|
|
|
+nsKDEShellService::Init()
|
|
|
|
+{
|
|
|
|
+ if( !nsKDEUtils::kdeSupport())
|
|
|
|
+ return NS_ERROR_NOT_AVAILABLE;
|
|
|
|
+ return NS_OK;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService)
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::IsDefaultBrowser(bool aForAllTypes,
|
|
|
|
+ bool* aIsDefaultBrowser)
|
|
|
|
+{
|
|
|
|
+ *aIsDefaultBrowser = false;
|
|
|
|
+
|
|
|
|
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
|
|
|
|
+ if (!command)
|
|
|
|
+ return NS_ERROR_FAILURE;
|
|
|
|
+
|
|
|
|
+ nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
|
|
|
|
+ if (!str)
|
|
|
|
+ return NS_ERROR_FAILURE;
|
|
|
|
+
|
|
|
|
+ str->SetData("ISDEFAULTBROWSER"_ns);
|
|
|
|
+ command->AppendElement( str );
|
|
|
|
+
|
|
|
|
+ if( nsKDEUtils::command( command ))
|
|
|
|
+ *aIsDefaultBrowser = true;
|
|
|
|
+ return NS_OK;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
2024-08-23 16:57:44 +02:00
|
|
|
+nsKDEShellService::SetDefaultBrowser(bool aForAllUsers)
|
2024-05-03 10:46:31 +02:00
|
|
|
+{
|
|
|
|
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
|
|
|
|
+ if (!command)
|
|
|
|
+ return NS_ERROR_FAILURE;
|
|
|
|
+
|
|
|
|
+ nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
|
|
|
|
+ nsCOMPtr<nsISupportsCString> paramstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
|
|
|
|
+ if (!cmdstr || !paramstr)
|
|
|
|
+ return NS_ERROR_FAILURE;
|
|
|
|
+
|
|
|
|
+ cmdstr->SetData("SETDEFAULTBROWSER"_ns);
|
|
|
|
+ command->AppendElement( cmdstr );
|
|
|
|
+
|
2024-08-23 16:57:44 +02:00
|
|
|
+ paramstr->SetData("ALLTYPES"_ns);
|
2024-05-03 10:46:31 +02:00
|
|
|
+ command->AppendElement( paramstr );
|
|
|
|
+
|
|
|
|
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult)
|
|
|
|
+{
|
|
|
|
+ *aResult = true;
|
|
|
|
+ return NS_OK;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
|
|
|
|
+ int32_t aPosition,
|
|
|
|
+ const nsACString& aImageName)
|
|
|
|
+{
|
|
|
|
+ return NS_ERROR_NOT_IMPLEMENTED;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
|
|
|
|
+{
|
|
|
|
+ return NS_ERROR_NOT_IMPLEMENTED;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
|
|
|
|
+{
|
|
|
|
+ return NS_ERROR_NOT_IMPLEMENTED;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsKDEShellService::IsDefaultForScheme(nsTSubstring<char> const& aScheme, bool* aIsDefaultBrowser)
|
|
|
|
+{
|
|
|
|
+ return NS_ERROR_NOT_IMPLEMENTED;
|
|
|
|
+}
|
|
|
|
+
|
2024-08-23 16:57:44 +02:00
|
|
|
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
|
|
|
|
new file mode 100644
|
2024-05-03 10:46:31 +02:00
|
|
|
--- /dev/null
|
2024-08-23 16:57:44 +02:00
|
|
|
+++ b/browser/components/shell/nsKDEShellService.h
|
2024-05-03 10:46:31 +02:00
|
|
|
@@ -0,0 +1,32 @@
|
|
|
|
+/* -*- 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 nskdeshellservice_h____
|
|
|
|
+#define nskdeshellservice_h____
|
|
|
|
+
|
|
|
|
+#include "nsIGNOMEShellService.h"
|
|
|
|
+#include "nsToolkitShellService.h"
|
|
|
|
+#include "nsString.h"
|
|
|
|
+#include "mozilla/Attributes.h"
|
|
|
|
+
|
|
|
|
+class nsKDEShellService final : public nsIGNOMEShellService,
|
|
|
|
+ public nsToolkitShellService
|
|
|
|
+{
|
|
|
|
+public:
|
|
|
|
+ nsKDEShellService() : mCheckedThisSession(false) { }
|
|
|
|
+
|
|
|
|
+ NS_DECL_ISUPPORTS
|
|
|
|
+ NS_DECL_NSISHELLSERVICE
|
|
|
|
+ NS_DECL_NSIGNOMESHELLSERVICE
|
|
|
|
+
|
|
|
|
+ nsresult Init();
|
|
|
|
+
|
|
|
|
+private:
|
|
|
|
+ ~nsKDEShellService() {}
|
|
|
|
+
|
|
|
|
+ bool mCheckedThisSession;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+#endif // nskdeshellservice_h____
|
2024-08-23 16:57:44 +02:00
|
|
|
diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
|
|
|
|
new file mode 100644
|
2024-05-03 10:46:31 +02:00
|
|
|
--- /dev/null
|
2024-08-23 16:57:44 +02:00
|
|
|
+++ b/browser/components/shell/nsUnixShellService.cpp
|
2024-05-03 10:46:31 +02:00
|
|
|
@@ -0,0 +1,22 @@
|
|
|
|
+/* -*- 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 "nsUnixShellService.h"
|
|
|
|
+#include "nsGNOMEShellService.h"
|
|
|
|
+#include "nsKDEShellService.h"
|
|
|
|
+#include "nsKDEUtils.h"
|
|
|
|
+#include "mozilla/ModuleUtils.h"
|
|
|
|
+
|
|
|
|
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
|
|
|
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult)
|
|
|
|
+{
|
|
|
|
+ if( nsKDEUtils::kdeSupport())
|
|
|
|
+ return nsKDEShellServiceConstructor( aIID, aResult );
|
|
|
|
+ return nsGNOMEShellServiceConstructor( aIID, aResult );
|
|
|
|
+}
|
2024-08-23 16:57:44 +02:00
|
|
|
diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
|
|
|
|
new file mode 100644
|
2024-05-03 10:46:31 +02:00
|
|
|
--- /dev/null
|
2024-08-23 16:57:44 +02:00
|
|
|
+++ b/browser/components/shell/nsUnixShellService.h
|
2024-05-03 10:46:31 +02:00
|
|
|
@@ -0,0 +1,15 @@
|
|
|
|
+/* -*- 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 nsunixshellservice_h____
|
|
|
|
+#define nsunixshellservice_h____
|
|
|
|
+
|
|
|
|
+#include "nsIGNOMEShellService.h"
|
|
|
|
+
|
|
|
|
+NS_IMETHODIMP
|
|
|
|
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
|
|
|
|
+
|
|
|
|
+#endif // nsunixshellservice_h____
|