Alex
6294ed2520
onEvent() runs on the Hyprland IPC listener thread and mutated the label's style context (add/remove class) directly, racing the GTK main thread's drawing and corrupting the heap (double free / corrupted double-linked list). Follow the Submap pattern: onEvent only stores the layout under the mutex and emits the dispatcher; update() swaps the CSS class on the main thread, tracking the previously applied class. Fixes #4665
46 lines
917 B
C++
46 lines
917 B
C++
#pragma once
|
|
|
|
#include <fmt/format.h>
|
|
|
|
#include <string>
|
|
|
|
#include "ALabel.hpp"
|
|
#include "bar.hpp"
|
|
#include "modules/hyprland/backend.hpp"
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::hyprland {
|
|
|
|
class Language : public waybar::ALabel, public EventHandler {
|
|
public:
|
|
Language(const std::string&, const waybar::Bar&, const Json::Value&);
|
|
virtual ~Language();
|
|
|
|
auto update() -> void override;
|
|
|
|
private:
|
|
void onEvent(const std::string&) override;
|
|
|
|
void initLanguage();
|
|
|
|
struct Layout {
|
|
std::string full_name;
|
|
std::string short_name;
|
|
std::string variant;
|
|
std::string short_description;
|
|
};
|
|
|
|
static auto getLayout(const std::string&) -> Layout;
|
|
|
|
std::mutex mutex_;
|
|
const Bar& bar_;
|
|
util::JsonParser parser_;
|
|
|
|
Layout layout_;
|
|
std::string prev_short_name_; // applied CSS class; touched only in update() (#4665)
|
|
|
|
IPC& m_ipc;
|
|
};
|
|
|
|
} // namespace waybar::modules::hyprland
|