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

add button single click check to hyprland workspaces

This commit is contained in:
Jeremy Huang 2023-11-27 16:20:05 -08:00
parent 1fe4a4ee9d
commit 0162dbd485
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ void Workspaces::on_workspace_created(std::string const &payload) {
void Workspaces::on_workspace_moved(std::string const &payload) { void Workspaces::on_workspace_moved(std::string const &payload) {
std::string workspace = payload.substr(0, payload.find(',')); std::string workspace = payload.substr(0, payload.find(','));
std::string new_output = payload.substr(payload.find(',') + 1); std::string new_output = payload.substr(payload.find(',') + 1);
bool should_show = show_special() || ! workspace.starts_with("special"); bool should_show = show_special() || !workspace.starts_with("special");
if (should_show && bar_.output->name == new_output) { // TODO: implement this better if (should_show && bar_.output->name == new_output) { // TODO: implement this better
const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces"); const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces");
for (Json::Value workspace_json : workspaces_json) { for (Json::Value workspace_json : workspaces_json) {
@ -849,19 +849,21 @@ std::string &Workspace::select_icon(std::map<std::string, std::string> &icons_ma
} }
bool Workspace::handle_clicked(GdkEventButton *bt) const { bool Workspace::handle_clicked(GdkEventButton *bt) const {
try { if (bt->type == GDK_BUTTON_PRESS) {
if (id() > 0) { // normal or numbered persistent try {
gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id())); if (id() > 0) { // normal or numbered persistent
} else if (!is_special()) { // named gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
gIPC->getSocket1Reply("dispatch workspace name:" + name()); } else if (!is_special()) { // named
} else if (id() != -99) { // named special gIPC->getSocket1Reply("dispatch workspace name:" + name());
gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name()); } else if (id() != -99) { // named special
} else { // special gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
gIPC->getSocket1Reply("dispatch togglespecialworkspace"); } else { // special
gIPC->getSocket1Reply("dispatch togglespecialworkspace");
}
return true;
} catch (const std::exception &e) {
spdlog::error("Failed to dispatch workspace: {}", e.what());
} }
return true;
} catch (const std::exception &e) {
spdlog::error("Failed to dispatch workspace: {}", e.what());
} }
return false; return false;
} }