RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from zjeffer/pr-fixes 

use IPC for click events, clang-tidy fixes
pull/2316/head
MightyPlaza 2023-07-15 22:18:24 +00:00 committed by GitHub
parent f8a9a970b2 f3df15650a
commit e488daae16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/hyprland/workspaces.cpp
View File

@ -163,13 +163,13 @@ Workspaces::~Workspaces() {
std::lock_guard<std::mutex> lg(mutex_); std::lock_guard<std::mutex> lg(mutex_);
} }
Workspace::Workspace(const Json::Value &value) { Workspace::Workspace(const Json::Value &value)
id_ = value["id"].asInt(); : id_(value["id"].asInt()),
name_ = value["name"].asString(); name_(value["name"].asString()),
monitor_ = value["monitor"].asString(); // TODO:allow using monitor desc monitor_(value["monitor"].asString()), // TODO:allow using monitor desc
windows_ = value["id"].asInt(); windows_(value["id"].asInt()) {
active_ = 1; active_ = true;
is_special_ = 0; is_special_ = false;
if (name_.find("name:") == 0) { if (name_.find("name:") == 0) {
name_ = name_.substr(5); name_ = name_.substr(5);
@ -253,16 +253,21 @@ std::string &Workspace::select_icon(std::map<std::string, std::string> &icons_ma
} }
auto Workspace::handle_clicked(GdkEventButton *bt) -> bool { auto Workspace::handle_clicked(GdkEventButton *bt) -> bool {
try {
if (id() > 0) { // normal if (id() > 0) { // normal
system(("hyprctl dispatch workspace " + std::to_string(id()) + " &> /dev/null").c_str()); gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
} else if (!is_special()) { // named normal } else if (!is_special()) { // named normal
system(("hyprctl dispatch workspace name:" + name() + " &> /dev/null").c_str()); gIPC->getSocket1Reply("dispatch workspace name" + name());
} else if (id() != -99) { // named special } else if (id() != -99) { // named special
system(("hyprctl dispatch togglespecialworkspace name:" + name() + " &> /dev/null").c_str()); gIPC->getSocket1Reply("dispatch togglespecialworkspace name" + name());
} else { // special } else { // special
system("hyprctl dispatch togglespecialworkspace special &> /dev/null"); gIPC->getSocket1Reply("dispatch togglespecialworkspace special");
} }
return 1; return true;
} catch (const std::exception &e) {
spdlog::error("Failed to dispatch workspace: {}", e.what());
}
return false;
} }
} // namespace waybar::modules::hyprland } // namespace waybar::modules::hyprland