Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/modules/hyprland/workspaces.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class Workspaces : public AModule, public EventHandler {
auto specialVisibleOnly() const -> bool { return m_specialVisibleOnly; }
auto persistentOnly() const -> bool { return m_persistentOnly; }
auto moveToMonitor() const -> bool { return m_moveToMonitor; }
auto deduplicateWindows() const -> bool { return m_deduplicateWindows; }
auto enableTaskbar() const -> bool { return m_enableTaskbar; }
auto taskbarWithIcon() const -> bool { return m_taskbarWithIcon; }

Expand Down Expand Up @@ -145,6 +146,7 @@ class Workspaces : public AModule, public EventHandler {
bool m_specialVisibleOnly = false;
bool m_persistentOnly = false;
bool m_moveToMonitor = false;
bool m_deduplicateWindows = false;
Json::Value m_persistentWorkspaceConfig;

// Map for windows stored in workspaces not present in the current bar.
Expand Down
18 changes: 18 additions & 0 deletions src/modules/hyprland/workspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <spdlog/spdlog.h>

#include <memory>
#include <set>
#include <string>
#include <utility>

Expand Down Expand Up @@ -247,8 +248,18 @@ void Workspace::update(const std::string &workspace_icon) {
auto windowSeparator = m_workspaceManager.getWindowSeparator();

bool isNotFirst = false;
std::set<std::string> seenWindows;

for (const auto &window_repr : m_windowMap) {
if (shouldSkipWindow(window_repr)) {
continue;
}
if (m_workspaceManager.deduplicateWindows()) {
if (seenWindows.contains(window_repr.repr_rewrite)) {
continue; // skip duplicate
}
seenWindows.insert(window_repr.repr_rewrite);
}
if (isNotFirst) {
windows.append(windowSeparator);
}
Expand Down Expand Up @@ -287,10 +298,17 @@ void Workspace::updateTaskbar(const std::string &workspace_icon) {
}

bool isFirst = true;
std::set<std::string> seenWindows;
auto processWindow = [&](const WindowRepr &window_repr) {
if (shouldSkipWindow(window_repr)) {
return; // skip
}
if (m_workspaceManager.deduplicateWindows()) {
if (seenWindows.contains(window_repr.repr_rewrite)) {
return; // skip duplicate
}
seenWindows.insert(window_repr.repr_rewrite);
}
if (isFirst) {
isFirst = false;
} else if (m_workspaceManager.getWindowSeparator() != "") {
Expand Down
1 change: 1 addition & 0 deletions src/modules/hyprland/workspaces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
populateBoolConfig(config, "persistent-only", m_persistentOnly);
populateBoolConfig(config, "active-only", m_activeOnly);
populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
populateBoolConfig(config, "deduplicate-windows", m_deduplicateWindows);

m_persistentWorkspaceConfig = config.get("persistent-workspaces", Json::Value());
populateSortByConfig(config);
Expand Down