AlexandClaude Opus 4.8
f72f84e011
Post-0.15.0 review of the 0.15.0..HEAD range surfaced regressions and
bugs. This restores backward compatibility for existing configs/CSS,
fixes confirmed defects, and repairs the scdoc man-page build break on
master. Pango-markup tooltips are intentional and were kept.
Backward-compat restorations:
- AModule: honor legacy numeric Gdk::CursorType cursor values (int overload)
- memory: correct GiB divisor (was ~2.3% low); round bare {} placeholders
- wireplumber: scale max-volume into the linear domain so the cap works again
- idle_inhibitor: gate right/middle-click deactivate & scroll on dynamic-timeouts;
accept both dynamic-timeout(s); widen timeout to double (no fractional truncation)
- custom: keep #custom-<name>.<class> CSS selectors working (classes on box_)
- image: don't wordexp-split a single path; fall back to the literal path
- niri/window: restore hide-when-empty (new show-empty opt-in); escape tooltip
- wlr/taskbar: plain-text tooltip when markup is disabled
Bug fixes:
- tray: fix use-after-free in onAdd; guard the watcher retry timeout
- hyprland: clamp max-windows iterator (OOB); drop duplicate language tooltip block
- niri/window: supply {col}/{max_col} args in the empty branch (fmt::format_error)
- mpris: escape {dynamic}/{player} tooltip; fix dangling player; albumArtist source
- mango: fix use-after-free race (dispatch under callback_mutex_)
- mpd: contain throwing checkErrors in noexcept idle paths (no std::terminate/UAF)
- keyboard_state: always render every lock label, with guarded defaults
- bluetooth: bound GATT ReadValue timeout, opt-in + services-resolved gating,
preserve authoritative Battery1 percentage
- wireplumber: fix WpDevice reference leak / NULL handling
- battery, clock, dwl, wayfire, graph, custom_graph, transform, river: assorted
crash/logic fixes
Man page / build:
- niri-workspaces: fix scdoc "indented by an amount greater than 1"
(workspace-taskbar sub-options were mis-indented; breaks man-page build)
- document new show-empty (niri/window); correct network {txBitrate}/{rxBitrate}
Not compiled locally (no gtkmm on this host); C++ build relies on CI.
Man pages validated with scdoc 1.11.4.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
135 lines
5.3 KiB
C++
135 lines
5.3 KiB
C++
#pragma once
|
|
|
|
#include <fmt/args.h>
|
|
#include <fmt/format.h>
|
|
#include <glibmm/dispatcher.h>
|
|
#include <glibmm/markup.h>
|
|
#include <gtkmm.h>
|
|
#include <gtkmm/eventbox.h>
|
|
#include <json/json.h>
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "IModule.hpp"
|
|
|
|
namespace waybar {
|
|
|
|
class AModule : public IModule {
|
|
public:
|
|
static constexpr const char* MODULE_CLASS = "module";
|
|
|
|
~AModule() override;
|
|
sigc::signal<void, AModule*> signal_updated;
|
|
auto update() -> void override;
|
|
virtual auto refresh(int shouldRefresh) -> void {};
|
|
operator Gtk::Widget&() override;
|
|
auto doAction(const std::string& name) -> void override;
|
|
|
|
/// Emitting on this dispatcher triggers a update() call
|
|
Glib::Dispatcher dp;
|
|
|
|
bool expandEnabled() const;
|
|
|
|
virtual void suspend() {};
|
|
virtual void resume() {};
|
|
bool shouldSuspend() const { return disable_on_sleep_; }
|
|
|
|
protected:
|
|
// Don't need to make an object directly
|
|
// Derived classes are able to use it
|
|
AModule(const Json::Value&, const std::string&, const std::string&, bool enable_click = false,
|
|
bool enable_scroll = false);
|
|
|
|
enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
|
|
|
|
SCROLL_DIR getScrollDir(GdkEventScroll* e);
|
|
bool tooltipEnabled() const;
|
|
|
|
// --- Generic format/tooltip resolution (config-only, usable by any module,
|
|
// ALabel-derived or not). Prefers `<key>-<state>`, then `<key>`, then default.
|
|
std::string resolveFormat(const std::string& defaultFormat, const std::string& state = "") const {
|
|
if (!state.empty() && config_["format-" + state].isString()) {
|
|
return config_["format-" + state].asString();
|
|
}
|
|
if (config_["format"].isString()) {
|
|
return config_["format"].asString();
|
|
}
|
|
return defaultFormat;
|
|
}
|
|
std::string resolveTooltipFormat(const std::string& defaultFormat,
|
|
const std::string& state = "") const {
|
|
if (!state.empty() && config_["tooltip-format-" + state].isString()) {
|
|
return config_["tooltip-format-" + state].asString();
|
|
}
|
|
if (config_["tooltip-format"].isString()) {
|
|
return config_["tooltip-format"].asString();
|
|
}
|
|
return defaultFormat;
|
|
}
|
|
|
|
// Generic tooltip for any widget: honors the `tooltip` toggle and
|
|
// `tooltip-format`, formats with the given args and applies it. Lets modules
|
|
// that are not ALabel-derived (e.g. gamemode) reuse the shared logic.
|
|
template <typename... Args>
|
|
void updateTooltip(Gtk::Widget& widget, const std::string& defaultFormat, Args&&... args) {
|
|
if (!tooltipEnabled()) {
|
|
return;
|
|
}
|
|
widget.set_tooltip_markup(
|
|
fmt::format(fmt::runtime(resolveTooltipFormat(defaultFormat)), std::forward<Args>(args)...));
|
|
}
|
|
|
|
std::vector<int> pid_children_;
|
|
const std::string name_;
|
|
const Json::Value& config_;
|
|
Gtk::EventBox event_box_;
|
|
|
|
virtual void setCursor(std::string const& c);
|
|
// Backward-compat overload for legacy numeric Gdk::CursorType configs (pre-0.16)
|
|
virtual void setCursor(Gdk::CursorType const& c);
|
|
|
|
virtual bool handleToggle(GdkEventButton* const& ev);
|
|
virtual bool handleMouseEnter(GdkEventCrossing* const& ev);
|
|
virtual bool handleMouseLeave(GdkEventCrossing* const& ev);
|
|
virtual bool handleScroll(GdkEventScroll*);
|
|
virtual bool handleRelease(GdkEventButton* const& ev);
|
|
|
|
bool disable_on_sleep_{false};
|
|
GObject* menu_ = nullptr;
|
|
|
|
private:
|
|
bool handleUserEvent(GdkEventButton* const& ev);
|
|
const bool isTooltip;
|
|
const bool isExpand;
|
|
bool hasUserEvents_;
|
|
gdouble distance_scrolled_y_;
|
|
gdouble distance_scrolled_x_;
|
|
sigc::connection cursor_timeout_conn_;
|
|
std::map<std::string, std::string> eventActionMap_;
|
|
static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
|
|
{std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
|
|
{std::make_pair(1, GdkEventType::GDK_BUTTON_RELEASE), "on-click-release"},
|
|
{std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
|
|
{std::make_pair(1, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click"},
|
|
{std::make_pair(2, GdkEventType::GDK_BUTTON_PRESS), "on-click-middle"},
|
|
{std::make_pair(2, GdkEventType::GDK_BUTTON_RELEASE), "on-click-middle-release"},
|
|
{std::make_pair(2, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-middle"},
|
|
{std::make_pair(2, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-middle"},
|
|
{std::make_pair(3, GdkEventType::GDK_BUTTON_PRESS), "on-click-right"},
|
|
{std::make_pair(3, GdkEventType::GDK_BUTTON_RELEASE), "on-click-right-release"},
|
|
{std::make_pair(3, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-right"},
|
|
{std::make_pair(3, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-right"},
|
|
{std::make_pair(8, GdkEventType::GDK_BUTTON_PRESS), "on-click-backward"},
|
|
{std::make_pair(8, GdkEventType::GDK_BUTTON_RELEASE), "on-click-backward-release"},
|
|
{std::make_pair(8, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-backward"},
|
|
{std::make_pair(8, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-backward"},
|
|
{std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
|
|
{std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"},
|
|
{std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"},
|
|
{std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"},
|
|
{std::make_pair(10, GdkEventType::GDK_BUTTON_PRESS), "on-click-copy"}};
|
|
};
|
|
|
|
} // namespace waybar
|