Siriusuna
81fd9ee4ab
Fix an issue in the MPD module where text failed to render when raw tags containing markup characters were truncated mid-sequence after sanitization, resulting in fragmented XML entities (such as `&` cut into `&am`). Resolve this by shifting the order of operations to truncate the raw strings *before* running `sanitize_string`. To keep `setLabel` decoupled and clean, we introduce helper methods (`getArtistStr`, `getAlbumArtistStr`, `getAlbumStr`, `getTitleStr`) inside the `MPD` class, matching the architectural style of MPRIS. Additionally: - Introduce support for the customizable `ellipsis` config option (defaulting to `…`). - Switch the truncation logic of the MPD module to be visual-width-aware using the newly extracted `waybar::util::utf8_truncate`. - Decouple the tooltip text from the main label's truncated text. The tooltip now displays un-truncated, complete metadata (properly escaped), providing a significantly better user experience.
74 lines
1.9 KiB
C++
74 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include <fmt/format.h>
|
|
#include <mpd/client.h>
|
|
#include <spdlog/spdlog.h>
|
|
|
|
#include <condition_variable>
|
|
#include <thread>
|
|
|
|
#include "ALabel.hpp"
|
|
#include "modules/mpd/state.hpp"
|
|
|
|
namespace waybar::modules {
|
|
|
|
class MPD : public ALabel {
|
|
friend class detail::Context;
|
|
|
|
// State machine
|
|
detail::Context context_{this};
|
|
|
|
const std::string module_name_;
|
|
|
|
// Not using unique_ptr since we don't manage the pointer
|
|
// (It's either nullptr, or from the config)
|
|
const char* server_;
|
|
const unsigned port_;
|
|
const std::string password_;
|
|
|
|
unsigned timeout_;
|
|
|
|
detail::unique_connection connection_;
|
|
|
|
detail::unique_status status_;
|
|
mpd_state state_;
|
|
detail::unique_song song_;
|
|
std::string ellipsis_;
|
|
|
|
public:
|
|
MPD(const std::string&, const Json::Value&);
|
|
virtual ~MPD() noexcept = default;
|
|
auto update() -> void override;
|
|
|
|
private:
|
|
std::string getTag(mpd_tag_type type, unsigned idx = 0) const;
|
|
std::string getFilename() const;
|
|
void setLabel();
|
|
std::string getStateIcon() const;
|
|
std::string getOptionIcon(const std::string& optionName, bool activated) const;
|
|
std::string getArtistStr(bool truncated) const;
|
|
std::string getAlbumArtistStr(bool truncated) const;
|
|
std::string getAlbumStr(bool truncated) const;
|
|
std::string getTitleStr(bool truncated) const;
|
|
|
|
// GUI-side methods
|
|
bool handlePlayPause(GdkEventButton* const&);
|
|
void emit() { dp.emit(); }
|
|
|
|
// MPD-side, Non-GUI methods.
|
|
void tryConnect();
|
|
void checkErrors(mpd_connection* conn);
|
|
void fetchState();
|
|
void queryMPD();
|
|
|
|
inline bool stopped() const { return connection_ && state_ == MPD_STATE_STOP; }
|
|
inline bool playing() const { return connection_ && state_ == MPD_STATE_PLAY; }
|
|
inline bool paused() const { return connection_ && state_ == MPD_STATE_PAUSE; }
|
|
};
|
|
|
|
#if !defined(MPD_NOINLINE)
|
|
#include "modules/mpd/state.inl.hpp"
|
|
#endif
|
|
|
|
} // namespace waybar::modules
|