Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hyprland/workspaces] New options to change on click behaviour and active workspace status #2987

Merged
merged 2 commits into from
Mar 22, 2024
Merged

[hyprland/workspaces] New options to change on click behaviour and active workspace status #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df7f1ff
feat(hyprland/workspaces): added options `move-to-monitor` and `activ…
tom-quadrille Mar 4, 2024
6888949
Removed option `active-per-monitor`
tom-quadrille Mar 5, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
auto allOutputs() const -> bool { return m_allOutputs; }
auto showSpecial() const -> bool { return m_showSpecial; }
auto activeOnly() const -> bool { return m_activeOnly; }
auto moveToMonitor() const -> bool { return m_moveToMonitor; }

auto getBarOutput() const -> std::string { return m_bar.output->name; }

Expand Down Expand Up @@ -182,7 +183,8 @@
bool m_allOutputs = false;
bool m_showSpecial = false;
bool m_activeOnly = false;
bool m_moveToMonitor = false;

Check warning on line 186 in include/modules/hyprland/workspaces.hpp

View workflow job for this annotation

GitHub Actions / build

include/modules/hyprland/workspaces.hpp:186:8 [readability-identifier-naming] 

invalid case style for private member 'm_moveToMonitor'
Json::Value m_persistentWorkspaceConfig;

Check warning on line 187 in include/modules/hyprland/workspaces.hpp

View workflow job for this annotation

GitHub Actions / build

include/modules/hyprland/workspaces.hpp:187:15 [readability-identifier-naming] 

invalid case style for private member 'm_persistentWorkspaceConfig'

// Map for windows stored in workspaces not present in the current bar.
// This happens when the user has multiple monitors (hence, multiple bars)
Expand Down
7 changes: 7 additions & 0 deletions man/waybar-hyprland-workspaces.5.scd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ Addressed by *hyprland/workspaces*
default: false ++
If set to true, only the active workspace will be shown.

*move-to-monitor*: ++
typeof: bool ++
default: false ++
If set to true, open the workspace on the current monitor when clicking on a workspace button.
Otherwise, the workspace will open on the monitor where it was previously assigned.
Analog to using `focusworkspaceoncurrentmonitor` dispatcher instead of `workspace` in Hyprland.

*ignore-workspaces*: ++
typeof: array ++
default: [] ++
Expand Down
17 changes: 15 additions & 2 deletions src/modules/hyprland/workspaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
registerIpc();
}

auto Workspaces::parseConfig(const Json::Value &config) -> void {

Check warning on line 57 in src/modules/hyprland/workspaces.cpp

View workflow job for this annotation

GitHub Actions / build

src/modules/hyprland/workspaces.cpp:57:18 [readability-function-cognitive-complexity] 

function 'parseConfig' has cognitive complexity of 31 (threshold 25)
const Json::Value &configFormat = config["format"];

m_format = configFormat.isString() ? configFormat.asString() : "{name}";
Expand Down Expand Up @@ -83,6 +83,11 @@
m_activeOnly = configActiveOnly.asBool();
}

auto configMoveToMonitor = config_["move-to-monitor"];
if (configMoveToMonitor.isBool()) {
m_moveToMonitor = configMoveToMonitor.asBool();
}

auto configSortBy = config_["sort-by"];
if (configSortBy.isString()) {
auto sortByStr = configSortBy.asString();
Expand Down Expand Up @@ -1019,9 +1024,17 @@
if (bt->type == GDK_BUTTON_PRESS) {
try {
if (id() > 0) { // normal
gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
if (m_workspaceManager.moveToMonitor()) {
gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
} else {
gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
}
} else if (!isSpecial()) { // named (this includes persistent)
gIPC->getSocket1Reply("dispatch workspace name:" + name());
if (m_workspaceManager.moveToMonitor()) {
gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
} else {
gIPC->getSocket1Reply("dispatch workspace name:" + name());
}
} else if (id() != -99) { // named special
gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
} else { // special
Expand Down
Loading