Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1645776 [Linux/Gtk] Workspace restore - get window manager name only when XDG_CURRENT_DESKTOP is missing and check/ship widget.disable-workspace-management to disable it, r=jhorak

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D84515
This commit is contained in:
Martin Stransky 2020-07-24 11:59:38 +00:00
parent 71463e0b8f
commit ce7f53a5ec
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/libpref/init/all.js
View File

@ -3824,6 +3824,7 @@ pref("network.psl.onUpdate_notify", false);
#ifdef MOZ_WIDGET_GTK
pref("gfx.xrender.enabled",false);
pref("widget.content.gtk-theme-override", "");
pref("widget.disable-workspace-management", false);
#endif
#ifdef MOZ_WAYLAND
pref("widget.wayland_vsync.enabled", false);

57
widget/gtk/nsWindow.cpp
View File

@ -1889,35 +1889,42 @@ static bool GetWindowManagerName(GdkWindow* gdk_window, nsACString& wmName) {
#define kDesktopMutterSchema "org.gnome.mutter"
#define kDesktopDynamicWorkspacesKey "dynamic-workspaces"
static bool DesktopUsesDynamicWorkspaces(GdkWindow* gdk_window) {
nsAutoCString wmName;
if (GetWindowManagerName(gdk_window, wmName)) {
if (wmName.EqualsLiteral("bspwm")) {
return true;
}
if (wmName.EqualsLiteral("i3")) {
return true;
}
static bool WorkspaceManagementDisabled(GdkWindow* gdk_window) {
if (Preferences::GetBool("widget.disable-workspace-management", false)) {
return true;
}
static const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
if (!currentDesktop || !strstr(currentDesktop, "GNOME")) {
return false;
if (currentDesktop && strstr(currentDesktop, "GNOME")) {
// Gnome uses dynamic workspaces by default so disable workspace management
// in that case.
bool usesDynamicWorkspaces = true;
nsCOMPtr<nsIGSettingsService> gsettings =
do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
if (gsettings) {
nsCOMPtr<nsIGSettingsCollection> mutterSettings;
gsettings->GetCollectionForSchema(nsLiteralCString(kDesktopMutterSchema),
getter_AddRefs(mutterSettings));
if (mutterSettings) {
bool usesDynamicWorkspaces;
if (NS_SUCCEEDED(mutterSettings->GetBoolean(
nsLiteralCString(kDesktopDynamicWorkspacesKey),
&usesDynamicWorkspaces))) {
}
}
}
return usesDynamicWorkspaces;
}
nsCOMPtr<nsIGSettingsService> gsettings =
do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
if (gsettings) {
nsCOMPtr<nsIGSettingsCollection> mutterSettings;
gsettings->GetCollectionForSchema(nsLiteralCString(kDesktopMutterSchema),
getter_AddRefs(mutterSettings));
if (mutterSettings) {
bool usesDynamicWorkspaces;
if (NS_SUCCEEDED(mutterSettings->GetBoolean(
nsLiteralCString(kDesktopDynamicWorkspacesKey),
&usesDynamicWorkspaces))) {
return usesDynamicWorkspaces;
// When XDG_CURRENT_DESKTOP is missing, try to get window manager name.
if (!currentDesktop) {
nsAutoCString wmName;
if (GetWindowManagerName(gdk_window, wmName)) {
if (wmName.EqualsLiteral("bspwm")) {
return true;
}
if (wmName.EqualsLiteral("i3")) {
return true;
}
}
}
@ -1937,7 +1944,7 @@ void nsWindow::GetWorkspaceID(nsAString& workspaceID) {
return;
}
if (DesktopUsesDynamicWorkspaces(gdk_window)) {
if (WorkspaceManagementDisabled(gdk_window)) {
return;
}