duplicate the logic to assign numbers to workspaces from sway into waybar to handle perisstent workspaces

This commit is contained in:
Michael Rodler 2020-07-22 16:13:24 +02:00
parent 759602af64
commit 15fe73a252
1 changed files with 36 additions and 3 deletions

View File

@ -1,9 +1,28 @@
#include "modules/sway/workspaces.hpp" #include "modules/sway/workspaces.hpp"
#include <string>
#include <cctype>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
namespace waybar::modules::sway { namespace waybar::modules::sway {
// this is the code that sway uses to assign a number to a workspace. This is
// taken quite verbatim from `sway/ipc-json.c`.
int sway_wsname_to_num(std::string name) {
if (isdigit(name[0])) {
errno = 0;
char * endptr = NULL;
long long parsed_num = strtoll(name.c_str(), &endptr, 10);
if (errno != 0 || parsed_num > INT32_MAX || parsed_num < 0 || endptr == name.c_str()) {
return -1;
} else {
return (int)parsed_num;
}
}
return -1;
}
Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config) Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
: AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), : AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()),
bar_(bar), bar_(bar),
@ -102,13 +121,27 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
// the "num" property (integer type): // the "num" property (integer type):
// The workspace number or -1 for workspaces that do // The workspace number or -1 for workspaces that do
// not start with a number. // not start with a number.
auto l = lhs["num"].asInt(); //auto l = lhs["num"].asInt();
auto r = rhs["num"].asInt(); //auto r = rhs["num"].asInt();
// We cannot rely on the "num" property as provided by sway
// via IPC, because persistent workspace might not exist in
// sway's view. However, we need this property also for
// not-yet created persistent workspace. As such, we simply
// duplicate sway's logic of assigning the "num" property
// into waybar (see sway_wsname_to_num). This way the
// sorting should work out even when we include workspaces
// that do not currently exist.
auto lname = lhs["name"].asString();
auto rname = rhs["name"].asString();
auto l = sway_wsname_to_num(lname);
auto r = sway_wsname_to_num(rname);
if (l == r) { if (l == r) {
// in case both integers are the same, lexicographical // in case both integers are the same, lexicographical
// sort. This also covers the case when both don't have a // sort. This also covers the case when both don't have a
// number (i.e., l == r == -1). // number (i.e., l == r == -1).
return lhs["name"].asString() < rhs["name"].asString(); return lname < rname;
} }
// one of the workspaces doesn't begin with a number, so // one of the workspaces doesn't begin with a number, so