GTK4: Migration network

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

Author: LukashonakV

include/modules/network.hpp

@@ -1,15 +1,8 @@
 #pragma once
 
-#include <arpa/inet.h>
-#include <fmt/format.h>
-#include <linux/nl80211.h>
-#include <netlink/genl/ctrl.h>
 #include <netlink/genl/genl.h>
-#include <netlink/netlink.h>
 #include <sys/epoll.h>
 
-#include <optional>
-
 #include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 #ifdef WANT_RFKILL
@@ -18,7 +11,7 @@
 
 namespace waybar::modules {
 
-class Network : public ALabel {
+class Network final : public ALabel {
  public:
   Network(const std::string&, const Json::Value&);
   virtual ~Network();

include/util/format.hpp

@@ -16,12 +16,12 @@ class pow_format {
 namespace fmt {
 template <>
 struct formatter<pow_format> {
-  char spec = 0;
-  int width = 0;
+  char spec{0};
+  int width{0};
 
   template <typename ParseContext>
   constexpr auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    auto it = ctx.begin(), end = ctx.end();
+    auto it{ctx.begin()}, end{ctx.end()};
     if (it != end && *it == ':') ++it;
     if (it && (*it == '>' || *it == '<' || *it == '=')) {
       spec = *it;
@@ -46,21 +46,21 @@ struct formatter<pow_format> {
 
   template <class FormatContext>
   auto format(const pow_format& s, FormatContext& ctx) -> decltype(ctx.out()) {
-    const char* units[] = {"", "k", "M", "G", "T", "P", nullptr};
+    const char* units[]{"", "k", "M", "G", "T", "P", nullptr};
 
-    auto base = s.binary_ ? 1024ull : 1000ll;
-    auto fraction = (double)s.val_;
+    auto base{s.binary_ ? 1024ull : 1000ll};
+    auto fraction{(double)s.val_};
 
     int pow;
     for (pow = 0; units[pow + 1] != nullptr && fraction / base >= 1; ++pow) {
       fraction /= base;
     }
 
-    auto number_width = 5              // coeff in {:.1f} format
-                        + s.binary_;   // potential 4th digit before the decimal point
-    auto max_width = number_width + 1  // prefix from units array
+    auto number_width{5                // coeff in {:.1f} format
+                        + s.binary_};  // potential 4th digit before the decimal point
+    auto max_width{number_width + 1    // prefix from units array
                      + s.binary_       // for the 'i' in GiB.
-                     + s.unit_.length();
+                     + s.unit_.length()};
 
     const char* format;
     std::string string;

include/util/rfkill.hpp

@@ -2,12 +2,10 @@
 
 #include <glibmm/iochannel.h>
 #include <linux/rfkill.h>
-#include <sigc++/signal.h>
-#include <sigc++/trackable.h>
 
 namespace waybar::util {
 
-class Rfkill : public sigc::trackable {
+class Rfkill final : public sigc::trackable {
  public:
   Rfkill(enum rfkill_type rfkill_type);
   ~Rfkill();
@@ -17,8 +15,8 @@ class Rfkill : public sigc::trackable {
 
  private:
   enum rfkill_type rfkill_type_;
-  bool state_ = false;
-  int fd_ = -1;
+  bool state_{false};
+  int fd_{-1};
 
   bool on_event(Glib::IOCondition cond);
 };

meson.build

@@ -77,6 +77,8 @@ giounix = dependency('gio-unix-2.0', version: ['>=2.76.4'])
 spdlog = dependency('spdlog', version : ['>=1.10.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=enabled'])
 libudev = dependency('libudev', required: get_option('libudev'))
 xkbregistry = dependency('xkbregistry')
+libnl = dependency('libnl-3.0', required: get_option('libnl'))
+libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
 
 gtk_layer_shell = dependency('gtk4-layer-shell-0',
                              version : ['>=1.0.2'],
@@ -180,6 +182,13 @@ if libudev.found() and (is_linux or libepoll.found())
     )
 endif
 
+if get_option('rfkill').enabled() and is_linux
+    add_project_arguments('-DWANT_RFKILL', language: 'cpp')
+    src_files += files(
+        'src/util/rfkill.cpp'
+    )
+endif
+
 cava = dependency('cava',
                   version : '>=0.10.1',
                   required: get_option('cava'),
@@ -254,6 +263,12 @@ add_project_arguments('-DHAVE_DWL', language: 'cpp')
 src_files += files('src/modules/dwl/tags.cpp')
 man_files += files('man/waybar-dwl-tags.5.scd')
 
+if libnl.found() and libnlgen.found()
+    add_project_arguments('-DHAVE_LIBNL', language: 'cpp')
+    src_files += files('src/modules/network.cpp')
+    man_files += files('man/waybar-network.5.scd')
+endif
+
 if not get_option('logind').disabled()
     add_project_arguments('-DHAVE_GAMEMODE', '-DHAVE_LOGIND_INHIBITOR', language: 'cpp')
     src_files += files(
@@ -283,7 +298,9 @@ executable(
         client_protos,
         spdlog,
         xkbregistry,
-        cava
+        cava,
+        libnl,
+        libnlgen
     ],
     include_directories: inc_dirs,
     install: true,

src/factory.cpp

@@ -244,20 +244,21 @@ gtk4 todo
     if (ref == "tray") {
       return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
     }
-#endif
+#endif*/
 #ifdef HAVE_LIBNL
     if (ref == "network") {
       return new waybar::modules::Network(id, config_[name]);
     }
-#endif*/
+#endif
 #ifdef HAVE_LIBUDEV
     if (ref == "backlight") {
       return new waybar::modules::Backlight(id, config_[name]);
     }
     if (ref == "backlight/slider") {
       return new waybar::modules::BacklightSlider(id, config_[name]);
     }
-#endif/*
+#endif
+/*
 #ifdef HAVE_LIBEVDEV
     if (ref == "keyboard-state") {
       return new waybar::modules::KeyboardState(id, bar_, config_[name]);