GTK4: Migration keyboard-state

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

Author: LukashonakV

Diff for: include/AIconLabel.hpp

@@ -14,6 +14,7 @@ class AIconLabel : public ALabel {
              bool enable_click = false, bool enable_scroll = false);
   virtual ~AIconLabel() = default;
   auto update() -> void override;
+  operator Gtk::Widget &() override;
 
  protected:
   Gtk::Image image_;

Diff for: include/modules/keyboard_state.hpp

@@ -4,24 +4,23 @@
 #include <gtkmm/label.h>
 
 #include <set>
-#include <unordered_map>
 
 #include "AModule.hpp"
 #include "bar.hpp"
 #include "util/sleeper_thread.hpp"
 
 extern "C" {
-#include <libevdev/libevdev.h>
 #include <libinput.h>
 }
 
 namespace waybar::modules {
 
-class KeyboardState : public AModule {
+class KeyboardState final : public AModule {
  public:
   KeyboardState(const std::string&, const waybar::Bar&, const Json::Value&);
   virtual ~KeyboardState();
   auto update() -> void override;
+  operator Gtk::Widget &() override;
 
  private:
   auto tryAddDevice(const std::string&) -> void;

Diff for: meson.build

@@ -75,7 +75,11 @@ sigcpp = dependency('sigc++-3.0', version: ['>=3.4.0'])
 gtkmm = dependency('gtkmm-4.0', version : ['>=4.12.0'])
 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'])
+libinotify = dependency('libinotify', required: false)
+libepoll = dependency('epoll-shim', required: false)
+libinput = dependency('libinput', required: get_option('libinput'))
 libudev = dependency('libudev', required: get_option('libudev'))
+libevdev = dependency('libevdev', required: get_option('libevdev'))
 xkbregistry = dependency('xkbregistry')
 libnl = dependency('libnl-3.0', required: get_option('libnl'))
 libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
@@ -195,11 +199,18 @@ if libudev.found() and (is_linux or libepoll.found())
     )
 endif
 
-#if libsndio.found()
+if libevdev.found() and (is_linux or libepoll.found()) and libinput.found() and (is_linux or libinotify.found())
+    add_project_arguments('-DHAVE_LIBEVDEV', language: 'cpp')
+    add_project_arguments('-DHAVE_LIBINPUT', language: 'cpp')
+    src_files += files('src/modules/keyboard_state.cpp')
+    man_files += files('man/waybar-keyboard-state.5.scd')
+endif
+
+if libsndio.found()
     add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
     src_files += files('src/modules/sndio.cpp')
     man_files += files('man/waybar-sndio.5.scd')
-#endif
+endif
 
 if get_option('rfkill').enabled() and is_linux
     add_project_arguments('-DWANT_RFKILL', language: 'cpp')
@@ -323,6 +334,7 @@ executable(
         gtkmm,
         giounix,
         sigcpp,
+        libevdev,
         libudev,
         jsoncpp,
         wayland_client,
@@ -331,6 +343,9 @@ executable(
         spdlog,
         xkbregistry,
         cava,
+        libinotify,
+        libepoll,
+        libinput,
         libnl,
         libnlgen,
         libpulse,

Diff for: src/AIconLabel.cpp

@@ -21,4 +21,6 @@ bool AIconLabel::iconEnabled() const {
   return config_["icon"].isBool() ? config_["icon"].asBool() : false;
 }
 
+AIconLabel::operator Gtk::Widget&() { return box_; };
+
 }  // namespace waybar

Diff for: src/bar.cpp

@@ -530,7 +530,7 @@ auto waybar::Bar::setupWidgets() -> void {
   getModules(factory, "modules-center");
   getModules(factory, "modules-right");
   for (auto const& module : modules_left_) {
-    left_.prepend(*module);
+    left_.append(*module);
   }
   for (auto const& module : modules_center_) {
     center_.append(*module);

Diff for: src/factory.cpp

@@ -148,10 +148,10 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     }
     if (ref == "sway/workspaces") {
       return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
-    }/*
+    }
     if (ref == "sway/window") {
       return new waybar::modules::sway::Window(id, bar_, config_[name]);
-    }*/
+    }
     if (ref == "sway/language") {
       return new waybar::modules::sway::Language(id, config_[name]);
     }
@@ -258,12 +258,11 @@ gtk4 todo
       return new waybar::modules::BacklightSlider(id, config_[name]);
     }
 #endif
-/*
 #ifdef HAVE_LIBEVDEV
     if (ref == "keyboard-state") {
       return new waybar::modules::KeyboardState(id, bar_, config_[name]);
     }
-#endif*/
+#endif
 #ifdef HAVE_LIBPULSE
     if (ref == "pulseaudio") {
       return new waybar::modules::Pulseaudio(id, config_[name]);
@@ -276,12 +275,12 @@ gtk4 todo
     if (ref == "mpd") {
       return new waybar::modules::MPD(id, config_[name]);
     }
-#endif
+#endif*/
 #ifdef HAVE_LIBSNDIO
     if (ref == "sndio") {
       return new waybar::modules::Sndio(id, config_[name]);
     }
-#endif*/
+#endif
 #ifdef HAVE_GIO_UNIX
     if (ref == "bluetooth") {
       return new waybar::modules::Bluetooth(id, config_[name]);