Merge pull request #3474 from schmop/battery-plugging-instant-updates

Make battery module update on plugging/unplugging again (refs #2519)

include/modules/battery.hpp

@@ -5,8 +5,11 @@
 #include <filesystem>
 #if defined(__linux__)
 #include <sys/inotify.h>
+#include "util/udev_deleter.hpp"
 #endif
 
+#include <sys/poll.h>
+
 #include <algorithm>
 #include <fstream>
 #include <string>
@@ -36,11 +39,12 @@ class Battery : public ALabel {
   const std::string formatTimeRemaining(float hoursRemaining);
   void setBarClass(std::string&);
 
-  int global_watch;
   std::map<fs::path, int> batteries_;
+  std::unique_ptr<udev, util::UdevDeleter> udev_;
+  std::array<pollfd, 1> poll_fds_;
+  std::unique_ptr<udev_monitor, util::UdevMonitorDeleter> mon_;
   fs::path adapter_;
   int battery_watch_fd_;
-  int global_watch_fd_;
   std::mutex battery_list_mutex_;
   std::string old_status_;
   bool warnFirstTime_{true};

include/util/udev_deleter.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <libudev.h>
+
+namespace waybar::util {
+struct UdevDeleter {
+  void operator()(udev *ptr) const { udev_unref(ptr); }
+};
+
+struct UdevDeviceDeleter {
+  void operator()(udev_device *ptr) const { udev_device_unref(ptr); }
+};
+
+struct UdevEnumerateDeleter {
+  void operator()(udev_enumerate *ptr) const { udev_enumerate_unref(ptr); }
+};
+
+struct UdevMonitorDeleter {
+  void operator()(udev_monitor *ptr) const { udev_monitor_unref(ptr); }
+};
+}  // namespace waybar::util