GTK4: Migration MPD

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>

Author: LukashonakV

Diff for: include/modules/mpd/mpd.hpp

@@ -12,7 +12,7 @@
 
 namespace waybar::modules {
 
-class MPD : public ALabel {
+class MPD final : public ALabel {
   friend class detail::Context;
 
   // State machine
@@ -47,7 +47,7 @@ class MPD : public ALabel {
   std::string getOptionIcon(std::string optionName, bool activated) const;
 
   // GUI-side methods
-  bool handlePlayPause(GdkEventButton* const&);
+  bool handlePlayPause(int n_press, double dx, double dy);
   void emit() { dp.emit(); }
 
   // MPD-side, Non-GUI methods.

Diff for: meson.build

@@ -84,6 +84,7 @@ xkbregistry = dependency('xkbregistry')
 libnl = dependency('libnl-3.0', required: get_option('libnl'))
 libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
 libpulse = dependency('libpulse', required: get_option('pulseaudio'))
+libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
 libjack = dependency('jack', required: get_option('jack'))
 upower_glib = dependency('upower-glib', required: get_option('upower_glib'))
 
@@ -208,6 +209,17 @@ if libevdev.found() and (is_linux or libepoll.found()) and libinput.found() and
     man_files += files('man/waybar-keyboard-state.5.scd')
 endif
 
+#if libmpdclient.found()
+    add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp')
+    src_files += files(
+        'src/modules/mpd/mpd.cpp',
+        'src/modules/mpd/state.cpp',
+    )
+    man_files += files(
+        'man/waybar-mpd.5.scd',
+    )
+#endif
+
 if libsndio.found()
     add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
     src_files += files('src/modules/sndio.cpp')
@@ -365,6 +377,7 @@ executable(
         libnl,
         libnlgen,
         libpulse,
+        libmpdclient,
         libjack,
         libsndio,
         upower_glib

Diff for: src/modules/mpd/mpd.cpp

@@ -39,8 +39,7 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
     server_ = config["server"].asCString();
   }
 
-  event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
-  event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &MPD::handlePlayPause));
+  controllClick_->signal_pressed().connect(sigc::mem_fun(*this, &MPD::handlePlayPause), false);
 }
 
 auto waybar::modules::MPD::update() -> void {
@@ -327,17 +326,18 @@ void waybar::modules::MPD::fetchState() {
   checkErrors(conn);
 }
 
-bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) {
-  if (e->type == GDK_2BUTTON_PRESS || e->type == GDK_3BUTTON_PRESS || connection_ == nullptr) {
+bool waybar::modules::MPD::handlePlayPause(int n_press, double dx, double dy) {
+  if (n_press != 1 || connection_ = nullptr)
     return false;
-  }
 
-  if (e->button == 1) {
+  auto button{controllClick_->get_current_button()};
+
+  if (button == 1u) {
     if (state_ == MPD_STATE_PLAY)
       context_.pause();
     else
       context_.play();
-  } else if (e->button == 3) {
+  } else if (button == 3u) {
     context_.stop();
   }
 

Diff for: src/modules/mpd/state.cpp

@@ -66,10 +66,10 @@ void Idle::entry() noexcept {
     spdlog::error("mpd: Idle: failed to register for IDLE events");
   } else {
     spdlog::debug("mpd: Idle: watching FD");
-    sigc::slot<bool, Glib::IOCondition const&> idle_slot = sigc::mem_fun(*this, &Idle::on_io);
+    sigc::slot<bool(Glib::IOCondition const&)> idle_slot = sigc::mem_fun(*this, &Idle::on_io);
     idle_connection_ =
         Glib::signal_io().connect(idle_slot, mpd_connection_get_fd(conn),
-                                  Glib::IO_IN | Glib::IO_PRI | Glib::IO_ERR | Glib::IO_HUP);
+                                  Glib::IOCondition::IO_IN | Glib::IOCondition::IO_PRI | Glib::IOCondition::IO_ERR | Glib::IOCondition::IO_HUP);
   }
 }
 
@@ -118,7 +118,7 @@ bool Idle::on_io(Glib::IOCondition const&) {
 }
 
 void Playing::entry() noexcept {
-  sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Playing::on_timer);
+  sigc::slot<bool()> timer_slot = sigc::mem_fun(*this, &Playing::on_timer);
   timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 1'000);
   spdlog::debug("mpd: Playing: enabled 1 second periodic timer.");
 }
@@ -186,7 +186,7 @@ void Playing::pause() {
 void Playing::update() noexcept { ctx_->do_update(); }
 
 void Paused::entry() noexcept {
-  sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Paused::on_timer);
+  sigc::slot<bool()> timer_slot = sigc::mem_fun(*this, &Paused::on_timer);
   timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200);
   spdlog::debug("mpd: Paused: enabled 200 ms periodic timer.");
 }
@@ -257,7 +257,7 @@ void Paused::stop() {
 void Paused::update() noexcept { ctx_->do_update(); }
 
 void Stopped::entry() noexcept {
-  sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Stopped::on_timer);
+  sigc::slot<bool()> timer_slot = sigc::mem_fun(*this, &Stopped::on_timer);
   timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200);
   spdlog::debug("mpd: Stopped: enabled 200 ms periodic timer.");
 }
@@ -332,7 +332,7 @@ void Disconnected::arm_timer(int interval) noexcept {
   disarm_timer();
 
   // register timer
-  sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer);
+  sigc::slot<bool()> timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer);
   timer_connection_ = Glib::signal_timeout().connect(timer_slot, interval);
   spdlog::debug("mpd: Disconnected: enabled interval timer.");
 }