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

workspaces.cpp

pull/2316/head
MightyPlaza 2023-07-16 01:18:41 +00:00 committed by GitHub
parent 7200b16520
commit ca0122c3cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,22 +102,22 @@ void Workspaces::onEvent(const std::string &ev) {
} else if (eventName == "focusedmon") { } else if (eventName == "focusedmon") {
active_workspace_name = payload.substr(payload.find(",") + 1); active_workspace_name = payload.substr(payload.find(",") + 1);
} else if (eventName == "moveworkspace") { } else if (eventName == "moveworkspace" && !all_outputs()) {
std::string workspace = payload.substr(0, payload.find(",")); std::string workspace = payload.substr(0, payload.find(","));
std::string new_monitor = payload.substr(payload.find(",") + 1); std::string new_output = payload.substr(payload.find(",") + 1);
if (all_outputs()) { if (bar_.output->name == new_output) { // TODO: implement this better
if (bar_.output->name == new_monitor) { // TODO: implement this better
const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces"); const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces");
for (auto &workspace_json : workspaces_json) { for (auto &workspace_json : workspaces_json) {
if (workspace_json["name"].asString() == workspace && if (workspace_json["name"].asString() == workspace &&
bar_.output->name == workspace_json["monitor"].asString()) bar_.output->name == workspace_json["monitor"].asString()) {
create_workspace(workspace_json); create_workspace(workspace_json);
break;
}
} }
} else { } else {
workspaces_to_remove_.push_back(workspace); workspaces_to_remove_.push_back(workspace);
} }
} }
}
dp.emit(); dp.emit();
} }
@ -166,7 +166,7 @@ Workspaces::~Workspaces() {
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 output_(value["monitor"].asString()), // TODO:allow using monitor desc
windows_(value["id"].asInt()) { windows_(value["id"].asInt()) {
active_ = true; active_ = true;
is_special_ = false; is_special_ = false;
@ -177,8 +177,6 @@ Workspace::Workspace(const Json::Value &value)
name_ = id_ == -99 ? name_ : name_.substr(13); name_ = id_ == -99 ? name_ : name_.substr(13);
is_special_ = 1; is_special_ = 1;
} }
// spdlog::info("\nNew workspace:\n\tid:({})\n\tname:({})\n\tmonitor:({})\n\tspecial:({})\n", id_,
// name_, monitor_, is_special_ ? "yes" : "no"); //make less noisy
button_.add_events(Gdk::BUTTON_PRESS_MASK); button_.add_events(Gdk::BUTTON_PRESS_MASK);
button_.signal_button_press_event().connect(sigc::mem_fun(*this, &Workspace::handle_clicked), button_.signal_button_press_event().connect(sigc::mem_fun(*this, &Workspace::handle_clicked),