GTK4: Migration MPRIS

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

Author: LukashonakV

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

@@ -47,7 +47,7 @@ class MPD final : public ALabel {
   std::string getOptionIcon(std::string optionName, bool activated) const;
 
   // GUI-side methods
-  bool handlePlayPause(int n_press, double dx, double dy);
+  void handlePlayPause(int n_press, double dx, double dy);
   void emit() { dp.emit(); }
 
   // MPD-side, Non-GUI methods.

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

@@ -16,12 +16,12 @@ extern "C" {
 
 namespace waybar::modules::mpris {
 
-class Mpris : public ALabel {
+class Mpris final : public ALabel {
  public:
   Mpris(const std::string&, const Json::Value&);
   virtual ~Mpris();
   auto update() -> void override;
-  bool handleToggle(GdkEventButton* const&) override;
+  void handleToggle(int n_press, double dx, double dy) override;
 
  private:
   static auto onPlayerNameAppeared(PlayerctlPlayerManager*, PlayerctlPlayerName*, gpointer) -> void;

Diff for: meson.build

@@ -87,6 +87,7 @@ 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'))
+playerctl = dependency('playerctl', version : ['>=2.0.0'], required: get_option('mpris'))
 
 libsndio = compiler.find_library('sndio', required: get_option('sndio'))
 if libsndio.found()
@@ -209,7 +210,7 @@ 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()
+if libmpdclient.found()
     add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp')
     src_files += files(
         'src/modules/mpd/mpd.cpp',
@@ -218,7 +219,7 @@ endif
     man_files += files(
         'man/waybar-mpd.5.scd',
     )
-#endif
+endif
 
 if libsndio.found()
     add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
@@ -333,6 +334,12 @@ if (upower_glib.found() and not get_option('logind').disabled())
     man_files += files('man/waybar-upower.5.scd')
 endif
 
+if playerctl.found()
+    add_project_arguments('-DHAVE_MPRIS', language: 'cpp')
+    src_files += files('src/modules/mpris/mpris.cpp')
+    man_files += files('man/waybar-mpris.5.scd')
+endif
+
 if libpulse.found()
     add_project_arguments('-DHAVE_LIBPULSE', language: 'cpp')
     src_files += files(
@@ -376,6 +383,7 @@ executable(
         libinput,
         libnl,
         libnlgen,
+        playerctl,
         libpulse,
         libmpdclient,
         libjack,

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

@@ -326,9 +326,9 @@ void waybar::modules::MPD::fetchState() {
   checkErrors(conn);
 }
 
-bool waybar::modules::MPD::handlePlayPause(int n_press, double dx, double dy) {
+void waybar::modules::MPD::handlePlayPause(int n_press, double dx, double dy) {
   if (n_press != 1 || connection_ = nullptr)
-    return false;
+    return;
 
   auto button{controllClick_->get_current_button()};
 
@@ -340,6 +340,4 @@ bool waybar::modules::MPD::handlePlayPause(int n_press, double dx, double dy) {
   } else if (button == 3u) {
     context_.stop();
   }
-
-  return true;
 }

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

@@ -14,6 +14,7 @@ extern "C" {
 
 #include <glib.h>
 #include <spdlog/spdlog.h>
+#include <glibmm/markup.h>
 
 namespace waybar::modules::mpris {
 
@@ -462,7 +463,7 @@ auto Mpris::onPlayerStop(PlayerctlPlayer* player, gpointer data) -> void {
   spdlog::debug("mpris: player-stop callback");
 
   // hide widget
-  mpris->event_box_.set_visible(false);
+  mpris->label_.set_visible(false);
   // update widget
   mpris->dp.emit();
 }
@@ -586,7 +587,7 @@ auto Mpris::getPlayerInfo() -> std::optional<PlayerInfo> {
   return std::nullopt;
 }
 
-bool Mpris::handleToggle(GdkEventButton* const& e) {
+void Mpris::handleToggle(int n_press, double dx, double dy) {
   GError* error = nullptr;
   waybar::util::ScopeGuard error_deleter([error]() {
     if (error) {
@@ -595,36 +596,33 @@ bool Mpris::handleToggle(GdkEventButton* const& e) {
   });
 
   auto info = getPlayerInfo();
-  if (!info) return false;
+  if (!info) return;
 
-  if (e->type == GdkEventType::GDK_BUTTON_PRESS) {
-    switch (e->button) {
+  if (n_press == 1) {
+    switch (controllClick_->get_current_button()) {
       case 1:  // left-click
         if (config_["on-click"].isString()) {
-          return ALabel::handleToggle(e);
+          return ALabel::handleToggle(n_press, dx, dy);
         }
         playerctl_player_play_pause(player, &error);
         break;
       case 2:  // middle-click
         if (config_["on-click-middle"].isString()) {
-          return ALabel::handleToggle(e);
+          return ALabel::handleToggle(n_press, dx, dy);
         }
         playerctl_player_previous(player, &error);
         break;
       case 3:  // right-click
         if (config_["on-click-right"].isString()) {
-          return ALabel::handleToggle(e);
+          return ALabel::handleToggle(n_press, dx, dy);
         }
         playerctl_player_next(player, &error);
         break;
     }
   }
-  if (error) {
+  if (error)
     spdlog::error("mpris[{}]: error running builtin on-click action: {}", (*info).name,
                   error->message);
-    return false;
-  }
-  return true;
 }
 
 auto Mpris::update() -> void {
@@ -634,7 +632,7 @@ auto Mpris::update() -> void {
 
   auto opt = getPlayerInfo();
   if (!opt) {
-    event_box_.set_visible(false);
+    label_.set_visible(false);
     ALabel::update();
     return;
   }
@@ -732,7 +730,7 @@ auto Mpris::update() -> void {
     }
   }
 
-  event_box_.set_visible(true);
+  label_.set_visible(true);
   // call parent update
   ALabel::update();
 }