Skip to content

Commit ee777d8

Browse files
LukashonakVLukashonakV
committed
GTK4: Migration pulseaudio
Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
1 parent bbc916d commit ee777d8

File tree

5 files changed

+62
-50
lines changed

5 files changed

+62
-50
lines changed

‎include/modules/pulseaudio.hpp

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
#pragma once
22

3-
#include <fmt/format.h>
4-
5-
#include <algorithm>
6-
#include <array>
7-
#include <memory>
8-
93
#include "ALabel.hpp"
104
#include "util/audio_backend.hpp"
115

126
namespace waybar::modules {
137

14-
class Pulseaudio : public ALabel {
8+
class Pulseaudio final : public ALabel {
159
public:
1610
Pulseaudio(const std::string&, const Json::Value&);
1711
virtual ~Pulseaudio() = default;
1812
auto update() -> void override;
1913

2014
private:
21-
bool handleScroll(GdkEventScroll* e) override;
15+
bool handleScroll(double dx, double dy) override;
2216
const std::vector<std::string> getPulseIcon() const;
2317

24-
std::shared_ptr<util::AudioBackend> backend = nullptr;
18+
std::shared_ptr<util::AudioBackend> backend{nullptr};
2519
};
2620

2721
} // namespace waybar::modules

‎meson.build

+16-1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ libudev = dependency('libudev', required: get_option('libudev'))
7979
xkbregistry = dependency('xkbregistry')
8080
libnl = dependency('libnl-3.0', required: get_option('libnl'))
8181
libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
82+
libpulse = dependency('libpulse', required: get_option('pulseaudio'))
8283

8384
gtk_layer_shell = dependency('gtk4-layer-shell-0',
8485
version : ['>=1.0.2'],
@@ -281,6 +282,19 @@ if not get_option('logind').disabled()
281282
)
282283
endif
283284

285+
if libpulse.found()
286+
add_project_arguments('-DHAVE_LIBPULSE', language: 'cpp')
287+
src_files += files(
288+
'src/modules/pulseaudio.cpp',
289+
'src/modules/pulseaudio_slider.cpp',
290+
'src/util/audio_backend.cpp',
291+
)
292+
man_files += files(
293+
'man/waybar-pulseaudio.5.scd',
294+
'man/waybar-pulseaudio-slider.5.scd',
295+
)
296+
endif
297+
284298
subdir('protocol')
285299

286300
executable(
@@ -300,7 +314,8 @@ executable(
300314
xkbregistry,
301315
cava,
302316
libnl,
303-
libnlgen
317+
libnlgen,
318+
libpulse
304319
],
305320
include_directories: inc_dirs,
306321
install: true,

‎src/factory.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,15 @@ gtk4 todo
263263
if (ref == "keyboard-state") {
264264
return new waybar::modules::KeyboardState(id, bar_, config_[name]);
265265
}
266-
#endif
266+
#endif*/
267267
#ifdef HAVE_LIBPULSE
268268
if (ref == "pulseaudio") {
269269
return new waybar::modules::Pulseaudio(id, config_[name]);
270270
}
271271
if (ref == "pulseaudio/slider") {
272272
return new waybar::modules::PulseaudioSlider(id, config_[name]);
273273
}
274-
#endif
274+
#endif/*
275275
#ifdef HAVE_LIBMPDCLIENT
276276
if (ref == "mpd") {
277277
return new waybar::modules::MPD(id, config_[name]);

‎src/modules/dwl/tags.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace waybar::modules::dwl {
1212
/* dwl stuff */
1313
wl_array tags, layouts;
1414

15-
static uint num_tags = 0;
15+
static uint num_tags{0};
1616

1717
void toggle_visibility(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
1818
// Intentionally empty
@@ -88,8 +88,8 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
8888
bar_(bar),
8989
box_{bar.orientation, 0},
9090
output_status_{nullptr} {
91-
struct wl_display *display = Client::inst()->wl_display;
92-
struct wl_registry *registry = wl_display_get_registry(display);
91+
struct wl_display *display{Client::inst()->wl_display};
92+
struct wl_registry *registry{wl_display_get_registry(display)};
9393
wl_registry_add_listener(registry, &registry_listener_impl, this);
9494
wl_display_roundtrip(display);
9595

@@ -109,26 +109,26 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
109109
box_.get_style_context()->add_class(MODULE_CLASS);
110110

111111
// Default to 9 tags, cap at 32
112-
const uint32_t num_tags =
113-
config["num-tags"].isUInt() ? std::min<uint32_t>(32, config_["num-tags"].asUInt()) : 9;
112+
const uint32_t num_tags{
113+
config["num-tags"].isUInt() ? std::min<uint32_t>(32, config_["num-tags"].asUInt()) : 9};
114114

115115
std::vector<std::string> tag_labels(num_tags);
116-
for (uint32_t tag = 0; tag < num_tags; ++tag) {
116+
for (uint32_t tag{0}; tag < num_tags; ++tag) {
117117
tag_labels[tag] = std::to_string(tag + 1);
118118
}
119-
const Json::Value custom_labels = config["tag-labels"];
119+
const Json::Value custom_labels{config["tag-labels"]};
120120
if (custom_labels.isArray() && !custom_labels.empty()) {
121-
for (uint32_t tag = 0; tag < std::min(num_tags, custom_labels.size()); ++tag) {
121+
for (uint32_t tag{0}; tag < std::min(num_tags, custom_labels.size()); ++tag) {
122122
tag_labels[tag] = custom_labels[tag].asString();
123123
}
124124
}
125125

126-
uint32_t i = 1;
126+
uint32_t i{1};
127127
for (const auto &tag_label : tag_labels) {
128128
Gtk::Button &button{buttons_.emplace_back(tag_label)};
129129
auto controlClick{clickControls_.emplace_back(Gtk::GestureClick::create())};
130-
controlClick->set_propagation_phase(Gtk::PropagationPhase::TARGET);
131-
controlClick->set_button(0);
130+
controlClick->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
131+
controlClick->set_button(1u);
132132
button.add_controller(controlClick);
133133
button.set_has_frame(false);
134134
box_.prepend(button);
@@ -142,7 +142,7 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
142142
i <<= 1;
143143
}
144144

145-
struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj());
145+
struct wl_output *output{gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj())};
146146
output_status_ = zdwl_ipc_manager_v2_get_output(status_manager_, output);
147147
zdwl_ipc_output_v2_add_listener(output_status_, &output_status_listener_impl, this);
148148

@@ -171,7 +171,7 @@ void Tags::handle_button_press(int n_press, double dx, double dy, uint32_t tag,
171171

172172
void Tags::handle_view_tags(uint32_t tag, uint32_t state, uint32_t clients, uint32_t focused) {
173173
// First clear all occupied state
174-
auto &button = buttons_[tag];
174+
auto &button{buttons_[tag]};
175175
if (clients) {
176176
button.get_style_context()->add_class("occupied");
177177
} else {

‎src/modules/pulseaudio.cpp

+28-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
#include "modules/pulseaudio.hpp"
22

3-
waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config)
4-
: ALabel(config, "pulseaudio", id, "{volume}%") {
5-
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
6-
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleScroll));
3+
#include <fmt/format.h>
74

5+
namespace waybar::modules {
6+
7+
Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config)
8+
: ALabel(config, "pulseaudio", id, "{volume}%", 60, false, false, true) {
89
backend = util::AudioBackend::getInstance([this] { this->dp.emit(); });
910
backend->setIgnoredSinks(config_["ignored-sinks"]);
1011
}
1112

12-
bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
13+
bool Pulseaudio::handleScroll(double dx, double dy) {
1314
// change the pulse volume only when no user provided
1415
// events are configured
1516
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
16-
return AModule::handleScroll(e);
17+
return AModule::handleScroll(dx, dy);
1718
}
18-
auto dir = AModule::getScrollDir(e);
19+
auto dir{AModule::getScrollDir(controllScroll_->get_current_event())};
1920
if (dir == SCROLL_DIR::NONE) {
2021
return true;
2122
}
22-
int max_volume = 100;
23-
double step = 1;
23+
int max_volume{100};
24+
double step{1};
2425
// isDouble returns true for integers as well, just in case
2526
if (config_["scroll-step"].isDouble()) {
2627
step = config_["scroll-step"].asDouble();
@@ -29,21 +30,21 @@ bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
2930
max_volume = config_["max-volume"].asInt();
3031
}
3132

32-
auto change_type = (dir == SCROLL_DIR::UP || dir == SCROLL_DIR::RIGHT)
33+
auto change_type{(dir == SCROLL_DIR::UP || dir == SCROLL_DIR::RIGHT)
3334
? util::ChangeType::Increase
34-
: util::ChangeType::Decrease;
35+
: util::ChangeType::Decrease};
3536

3637
backend->changeVolume(change_type, step, max_volume);
3738
return true;
3839
}
3940

40-
static const std::array<std::string, 9> ports = {
41+
static const std::array<std::string, 9> ports{
4142
"headphone", "speaker", "hdmi", "headset", "hands-free", "portable", "car", "hifi", "phone",
4243
};
4344

4445
const std::vector<std::string> waybar::modules::Pulseaudio::getPulseIcon() const {
45-
std::vector<std::string> res = {backend->getCurrentSinkName(), backend->getDefaultSourceName()};
46-
std::string nameLC = backend->getSinkPortName() + backend->getFormFactor();
46+
std::vector<std::string> res{backend->getCurrentSinkName(), backend->getDefaultSourceName()};
47+
std::string nameLC{backend->getSinkPortName() + backend->getFormFactor()};
4748
std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
4849
for (auto const &port : ports) {
4950
if (nameLC.find(port) != std::string::npos) {
@@ -54,12 +55,12 @@ const std::vector<std::string> waybar::modules::Pulseaudio::getPulseIcon() const
5455
return res;
5556
}
5657

57-
auto waybar::modules::Pulseaudio::update() -> void {
58-
auto format = format_;
58+
auto Pulseaudio::update() -> void {
59+
auto format{format_};
5960
std::string tooltip_format;
60-
auto sink_volume = backend->getSinkVolume();
61+
auto sink_volume{backend->getSinkVolume()};
6162
if (!alt_) {
62-
std::string format_name = "format";
63+
std::string format_name{"format"};
6364
if (backend->isBluetooth()) {
6465
format_name = format_name + "-bluetooth";
6566
label_.get_style_context()->add_class("bluetooth");
@@ -78,15 +79,15 @@ auto waybar::modules::Pulseaudio::update() -> void {
7879
label_.get_style_context()->remove_class("muted");
7980
label_.get_style_context()->remove_class("sink-muted");
8081
}
81-
auto state = getState(sink_volume, true);
82+
auto state{getState(sink_volume, true)};
8283
if (!state.empty() && config_[format_name + "-" + state].isString()) {
8384
format = config_[format_name + "-" + state].asString();
8485
} else if (config_[format_name].isString()) {
8586
format = config_[format_name].asString();
8687
}
8788
}
8889
// TODO: find a better way to split source/sink
89-
std::string format_source = "{volume}%";
90+
std::string format_source{"{volume}%"};
9091
if (backend->getSourceMuted()) {
9192
label_.get_style_context()->add_class("source-muted");
9293
if (config_["format-source-muted"].isString()) {
@@ -99,15 +100,15 @@ auto waybar::modules::Pulseaudio::update() -> void {
99100
}
100101
}
101102

102-
auto source_volume = backend->getSourceVolume();
103-
auto sink_desc = backend->getSinkDesc();
104-
auto source_desc = backend->getSourceDesc();
103+
auto source_volume{backend->getSourceVolume()};
104+
auto sink_desc{backend->getSinkDesc()};
105+
auto source_desc{backend->getSourceDesc()};
105106

106107
format_source = fmt::format(fmt::runtime(format_source), fmt::arg("volume", source_volume));
107-
auto text = fmt::format(
108+
auto text{fmt::format(
108109
fmt::runtime(format), fmt::arg("desc", sink_desc), fmt::arg("volume", sink_volume),
109110
fmt::arg("format_source", format_source), fmt::arg("source_volume", source_volume),
110-
fmt::arg("source_desc", source_desc), fmt::arg("icon", getIcon(sink_volume, getPulseIcon())));
111+
fmt::arg("source_desc", source_desc), fmt::arg("icon", getIcon(sink_volume, getPulseIcon())))};
111112
if (text.empty()) {
112113
label_.hide();
113114
} else {
@@ -133,3 +134,5 @@ auto waybar::modules::Pulseaudio::update() -> void {
133134
// Call parent update
134135
ALabel::update();
135136
}
137+
138+
} // namespace waybar::modules

0 commit comments

Comments
 (0)