GTK4: Migration, language, sway

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

Author: LukashonakV

include/AAppIconLabel.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <gtkmm/box.h>
-#include <gtkmm/image.h>
+#include <gtkmm/icontheme.h>
 
 #include "AIconLabel.hpp"
 
@@ -19,9 +18,12 @@ class AAppIconLabel : public AIconLabel {
   void updateAppIconName(const std::string &app_identifier,
                          const std::string &alternative_app_identifier);
   void updateAppIcon();
+
+ private:
   unsigned app_icon_size_{24};
   bool update_app_icon_{true};
   std::string app_icon_name_;
+  Glib::RefPtr<const Gtk::IconTheme> gtkTheme_;
 };
 
 }  // namespace waybar

include/AModule.hpp

@@ -6,7 +6,6 @@
 #include <json/json.h>
 
 #include "IModule.hpp"
-
 namespace waybar {
 
 class AModule : public IModule {

include/bar.hpp

@@ -68,6 +68,7 @@ class Bar {
   struct wl_surface *surface;
   bool visible = true;
   Gtk::Window window;
+  Json::Value config;
   Gtk::Orientation orientation = Gtk::Orientation::HORIZONTAL;
   Gtk::PositionType position = Gtk::PositionType::TOP;
 
@@ -89,7 +90,6 @@ class Bar {
   void onOutputGeometryChanged();
 
   Glib::RefPtr<Gdk::Surface> gdk_surface_;
-  Json::Value config;
   int x_global;
   int y_global;
 

include/modules/sway/bar.hpp

@@ -1,6 +1,4 @@
 #pragma once
-#include <atomic>
-#include <string>
 
 #include "modules/sway/ipc/client.hpp"
 #include "util/SafeSignal.hpp"

include/modules/sway/ipc/client.hpp

@@ -1,22 +1,14 @@
 #pragma once
 
-#include <sigc++/sigc++.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
-
-#include <cstring>
-#include <memory>
-#include <mutex>
-#include <stdexcept>
-#include <string>
 
 #include "ipc.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules::sway {
 
-class Ipc {
+class Ipc final {
  public:
   Ipc();
   ~Ipc();
@@ -27,15 +19,15 @@ class Ipc {
     std::string payload;
   };
 
-  sigc::signal<void, const struct ipc_response &> signal_event;
-  sigc::signal<void, const struct ipc_response &> signal_cmd;
+  sigc::signal<void(const struct ipc_response &)> signal_event;
+  sigc::signal<void(const struct ipc_response &)> signal_cmd;
 
   void sendCmd(uint32_t type, const std::string &payload = "");
   void subscribe(const std::string &payload);
   void handleEvent();
   void setWorker(std::function<void()> &&func);
 
- protected:
+ private:
   static inline const std::string ipc_magic_ = "i3-ipc";
   static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
 

include/modules/sway/language.hpp

@@ -1,20 +1,14 @@
 #pragma once
 
-#include <fmt/format.h>
 #include <xkbcommon/xkbregistry.h>
 
-#include <map>
-#include <string>
-
 #include "ALabel.hpp"
-#include "bar.hpp"
-#include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Language : public ALabel, public sigc::trackable {
+class Language final : public ALabel, public sigc::trackable {
  public:
   Language(const std::string& id, const Json::Value& config);
   virtual ~Language() = default;

include/modules/sway/mode.hpp

@@ -1,16 +1,12 @@
 #pragma once
 
-#include <fmt/format.h>
-
 #include "ALabel.hpp"
-#include "bar.hpp"
-#include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Mode : public ALabel, public sigc::trackable {
+class Mode final : public ALabel, public sigc::trackable {
  public:
   Mode(const std::string&, const Json::Value&);
   virtual ~Mode() = default;

include/modules/sway/scratchpad.hpp

@@ -1,18 +1,13 @@
 #pragma once
 
-#include <gtkmm/label.h>
-
 #include <mutex>
-#include <string>
 
 #include "ALabel.hpp"
-#include "bar.hpp"
-#include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
-class Scratchpad : public ALabel {
+class Scratchpad final : public ALabel {
  public:
   Scratchpad(const std::string&, const Json::Value&);
   virtual ~Scratchpad() = default;

include/modules/sway/window.hpp

@@ -1,18 +1,13 @@
 #pragma once
 
-#include <fmt/format.h>
-
-#include <tuple>
-
 #include "AAppIconLabel.hpp"
-#include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Window : public AAppIconLabel, public sigc::trackable {
+class Window final : public AAppIconLabel, public sigc::trackable {
  public:
   Window(const std::string&, const waybar::Bar&, const Json::Value&);
   virtual ~Window() = default;

include/modules/sway/workspaces.hpp

@@ -1,25 +1,20 @@
 #pragma once
 
-#include <fmt/format.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 
-#include <string_view>
-#include <unordered_map>
-
-#include "AModule.hpp"
-#include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Workspaces : public AModule, public sigc::trackable {
+class Workspaces final: public AModule, public sigc::trackable {
  public:
   Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
   virtual ~Workspaces() = default;
   auto update() -> void override;
+  operator Gtk::Widget &() override;
 
  private:
   static constexpr std::string_view workspace_switch_cmd_ = "workspace {} \"{}\"";
@@ -37,13 +32,14 @@ class Workspaces : public AModule, public sigc::trackable {
   const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
   uint16_t getWorkspaceIndex(const std::string& name) const;
   std::string trimWorkspaceName(std::string);
-  bool handleScroll(GdkEventScroll*) override;
+  bool handleScroll(double dx, double dy);
 
   const Bar& bar_;
   std::vector<Json::Value> workspaces_;
   std::vector<std::string> high_priority_named_;
   std::vector<std::string> workspaces_order_;
   Gtk::Box box_;
+
   util::JsonParser parser_;
   std::unordered_map<std::string, Gtk::Button> buttons_;
   std::mutex mutex_;

include/util/SafeSignal.hpp

@@ -1,15 +1,10 @@
 #pragma once
 
 #include <glibmm/dispatcher.h>
-#include <sigc++/signal.h>
 
-#include <functional>
 #include <mutex>
 #include <queue>
 #include <thread>
-#include <tuple>
-#include <type_traits>
-#include <utility>
 
 namespace waybar {
 
@@ -35,7 +30,7 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
       signal_t::emit(std::forward<EmitArgs>(args)...);
     } else {
       {
-        std::unique_lock lock(mutex_);
+        std::unique_lock lock{mutex_};
         queue_.emplace(std::forward<EmitArgs>(args)...);
       }
       dp_.emit();
@@ -56,8 +51,8 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
   using signal_t::make_slot;
 
   void handle_event() {
-    for (std::unique_lock lock(mutex_); !queue_.empty(); lock.lock()) {
-      auto args = queue_.front();
+    for (std::unique_lock lock{mutex_}; !queue_.empty(); lock.lock()) {
+      auto args{queue_.front()};
       queue_.pop();
       lock.unlock();
       std::apply(cached_fn_, args);
@@ -67,9 +62,9 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
   Glib::Dispatcher dp_;
   std::mutex mutex_;
   std::queue<arg_tuple_t> queue_;
-  const std::thread::id main_tid_ = std::this_thread::get_id();
+  const std::thread::id main_tid_{std::this_thread::get_id()};
   // cache functor for signal emission to avoid recreating it on each event
-  const slot_t cached_fn_ = make_slot();
+  const slot_t cached_fn_{make_slot()};
 };
 
 }  // namespace waybar

include/util/json.hpp

@@ -16,13 +16,13 @@ struct JsonParser {
   JsonParser() {}
 
   const Json::Value parse(const std::string& data) const {
-    Json::Value root(Json::objectValue);
+    Json::Value root{Json::objectValue};
     if (data.empty()) {
       return root;
     }
-    std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
+    std::unique_ptr<Json::CharReader> const reader{builder_.newCharReader()};
     std::string err;
-    bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
+    bool res{reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err)};
     if (!res) throw std::runtime_error(err);
     return root;
   }

meson.build

@@ -76,6 +76,7 @@ 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'])
 libudev = dependency('libudev', required: get_option('libudev'))
+xkbregistry = dependency('xkbregistry')
 
 gtk_layer_shell = dependency('gtk4-layer-shell-0',
                              version : ['>=1.0.2'],
@@ -125,6 +126,8 @@ src_files = files(
      'src/util/prepare_for_sleep.cpp',
      'src/AModule.cpp',
      'src/ALabel.cpp',
+     'src/AIconLabel.cpp',
+     'src/AAppIconLabel.cpp',
      'src/factory.cpp',
      'src/util/ustring_clen.cpp',
      'src/group.cpp',
@@ -133,7 +136,8 @@ src_files = files(
      'src/modules/load.cpp',
      'src/modules/disk.cpp',
      'src/modules/temperature.cpp',
-     'src/modules/idle_inhibitor.cpp'
+     'src/modules/idle_inhibitor.cpp',
+     'src/util/rewrite_string.cpp'
 )
 
 man_files = files(
@@ -230,6 +234,21 @@ elif is_dragonfly or is_freebsd or is_netbsd or is_openbsd
     endif
 endif
 
+add_project_arguments('-DHAVE_SWAY', language: 'cpp')
+src_files += files('src/modules/sway/ipc/client.cpp',
+                   'src/modules/sway/bar.cpp',
+                   'src/modules/sway/mode.cpp',
+                   'src/modules/sway/language.cpp',
+                   'src/modules/sway/window.cpp',
+                   'src/modules/sway/workspaces.cpp',
+                   'src/modules/sway/scratchpad.cpp')
+
+man_files += files('man/waybar-sway-language.5.scd',
+                   'man/waybar-sway-mode.5.scd',
+                   'man/waybar-sway-scratchpad.5.scd',
+                   'man/waybar-sway-window.5.scd',
+                   'man/waybar-sway-workspaces.5.scd')
+
 add_project_arguments('-DHAVE_DWL', language: 'cpp')
 src_files += files('src/modules/dwl/tags.cpp')
 man_files += files('man/waybar-dwl-tags.5.scd')
@@ -262,6 +281,7 @@ executable(
         wayland_cursor,
         client_protos,
         spdlog,
+        xkbregistry,
         cava
     ],
     include_directories: inc_dirs,