b1a87f943c
The window module re-entered the same shared_mutex while refreshing IPC state: update() took the lock and then called queryActiveWorkspace(), which tried to lock it again. That is undefined behavior for std::shared_mutex and could manifest as a deadlock. Remove the recursive lock path and reset the derived window state before each IPC refresh. That keeps solo/floating/swallowing/fullscreen classes from sticking around when the client lookup fails or a workspace becomes empty. Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
68 lines
1.5 KiB
C++
68 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <fmt/format.h>
|
|
|
|
#include <string>
|
|
|
|
#include "AAppIconLabel.hpp"
|
|
#include "bar.hpp"
|
|
#include "modules/hyprland/backend.hpp"
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::hyprland {
|
|
|
|
class Window : public waybar::AAppIconLabel, public EventHandler {
|
|
public:
|
|
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
|
~Window() override;
|
|
|
|
auto update() -> void override;
|
|
|
|
private:
|
|
struct Workspace {
|
|
int id = 0;
|
|
int windows = 0;
|
|
std::string last_window;
|
|
std::string last_window_title;
|
|
|
|
static auto parse(const Json::Value& value) -> Workspace;
|
|
};
|
|
|
|
struct WindowData {
|
|
bool floating = false;
|
|
int monitor = -1;
|
|
std::string class_name;
|
|
std::string initial_class_name;
|
|
std::string title;
|
|
std::string initial_title;
|
|
bool fullscreen = false;
|
|
bool grouped = false;
|
|
|
|
static auto parse(const Json::Value&) -> WindowData;
|
|
};
|
|
|
|
static auto getActiveWorkspace(const std::string&) -> Workspace;
|
|
static auto getActiveWorkspace() -> Workspace;
|
|
void onEvent(const std::string& ev) override;
|
|
void queryActiveWorkspace();
|
|
void setClass(const std::string&, bool enable);
|
|
|
|
bool separateOutputs_ = false;
|
|
std::mutex mutex_;
|
|
const Bar& bar_;
|
|
util::JsonParser parser_;
|
|
WindowData windowData_;
|
|
Workspace workspace_;
|
|
std::string soloClass_;
|
|
std::string lastSoloClass_;
|
|
bool solo_ = false;
|
|
bool allFloating_ = false;
|
|
bool swallowing_ = false;
|
|
bool fullscreen_ = false;
|
|
bool focused_ = false;
|
|
|
|
IPC& m_ipc;
|
|
};
|
|
|
|
} // namespace waybar::modules::hyprland
|