mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
2c7cb0e9d4
The first crash occurs when trying to parse the ID of a workspace as an uint, since named workspaces has negative IDs. This is fixed by using ints for workspace IDs instead of uints. The second crash occurs when converting a workspace name that isn't a number to an integer. This is fixed by wrapping std::stoi in a try block and only sorting by number, when both names can successfully be converted to integers.
33 lines
659 B
C++
33 lines
659 B
C++
#include <fmt/format.h>
|
|
|
|
#include <tuple>
|
|
|
|
#include "ALabel.hpp"
|
|
#include "bar.hpp"
|
|
#include "modules/hyprland/backend.hpp"
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::hyprland {
|
|
|
|
class Window : public waybar::ALabel,
|
|
public EventHandler {
|
|
public:
|
|
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
|
~Window();
|
|
|
|
auto update() -> void;
|
|
|
|
private:
|
|
int getActiveWorkspaceID(std::string);
|
|
std::string getLastWindowTitle(int);
|
|
void onEvent(const std::string&);
|
|
|
|
bool separate_outputs;
|
|
std::mutex mutex_;
|
|
const Bar& bar_;
|
|
util::JsonParser parser_;
|
|
std::string lastView;
|
|
};
|
|
|
|
} // namespace waybar::modules::hyprland
|