From ed71da316e48ec258158210e50c58a1b15f7940b Mon Sep 17 00:00:00 2001 From: scorpion-26 Date: Tue, 8 Aug 2023 17:52:35 +0200 Subject: [PATCH] Only use workspace manager when not using IPC Since we always init Wayland, we would previously have both zext_workspace_manager_v1 and Hyprland IPC which is terrible --- src/Wayland.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Wayland.cpp b/src/Wayland.cpp index 914c2ed..6b529b5 100644 --- a/src/Wayland.cpp +++ b/src/Wayland.cpp @@ -146,7 +146,7 @@ namespace Wayland wl_output* output = (wl_output*)wl_registry_bind(registry, name, &wl_output_interface, 4); wl_output_add_listener(output, &outputListener, nullptr); } - if (strcmp(interface, "zext_workspace_manager_v1") == 0) + if (strcmp(interface, "zext_workspace_manager_v1") == 0 && !Config::Get().useHyprlandIPC) { workspaceManager = (zext_workspace_manager_v1*)wl_registry_bind(registry, name, &zext_workspace_manager_v1_interface, version); zext_workspace_manager_v1_add_listener(workspaceManager, &workspaceManagerListener, nullptr); @@ -180,7 +180,7 @@ namespace Wayland WaitFor(registeredMonitors); registeredMonitors = false; - if (!workspaceManager) + if (!workspaceManager && !Config::Get().useHyprlandIPC) { LOG("Compositor doesn't implement zext_workspace_manager_v1, disabling workspaces!"); RuntimeConfig::Get().hasWorkspaces = false;