GTK4. wlr migration

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

Author: LukashonakV

include/modules/cffi.hpp

@@ -1,19 +1,21 @@
 #pragma once
 
+#include <gtkmm/box.h>
+
 #include "AModule.hpp"
 
 namespace waybar::modules {
 
 namespace ffi {
 extern "C" {
-typedef struct wbcffi_module wbcffi_module;
+using wbcffi_module = struct wbcffi_module;
 
-typedef struct {
+using wbcffi_init_info = struct {
   wbcffi_module* obj;
   const char* waybar_version;
   GtkWidget* (*get_root_widget)(wbcffi_module*);
   void (*queue_update)(wbcffi_module*);
-} wbcffi_init_info;
+} ;
 
 struct wbcffi_config_entry {
   const char* key;
@@ -30,10 +32,12 @@ class CFFI final : public AModule {
   virtual auto refresh(int signal) -> void override;
   virtual auto doAction(const std::string& name) -> void override;
   virtual auto update() -> void override;
+  operator Gtk::Widget&() override;
 
  private:
   ///
   void* cffi_instance_ = nullptr;
+  Glib::RefPtr<Gtk::Box> const box_;
 
   typedef void*(InitFn)(const ffi::wbcffi_init_info* init_info,
                         const ffi::wbcffi_config_entry* config_entries, size_t config_entries_len);

include/modules/hyprland/backend.hpp

@@ -1,13 +1,11 @@
 #pragma once
 
+#include "util/json.hpp"
+
 #include <filesystem>
 #include <list>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <utility>
-
-#include "util/json.hpp"
+#include <sys/socket.h>
+#include <sys/un.h>
 
 namespace waybar::modules::hyprland {
 

include/modules/hyprland/window.hpp

@@ -1,13 +1,8 @@
 #pragma once
 
-#include <fmt/format.h>
-
-#include <string>
-
 #include "AAppIconLabel.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
-#include "util/json.hpp"
 
 namespace waybar::modules::hyprland {
 

include/modules/hyprland/windowcreationpayload.hpp

@@ -1,24 +1,8 @@
 #pragma once
 
-#include <gtkmm/button.h>
-#include <gtkmm/label.h>
 #include <json/value.h>
 
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <optional>
-#include <regex>
-#include <string>
 #include <variant>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-#include "util/enum.hpp"
-#include "util/regex_collection.hpp"
 
 using WindowAddress = std::string;
 

include/modules/hyprland/workspace.hpp

@@ -2,24 +2,8 @@
 
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
-#include <json/value.h>
 
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <optional>
-#include <regex>
-#include <string>
-#include <variant>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-#include "modules/hyprland/windowcreationpayload.hpp"
-#include "util/enum.hpp"
-#include "util/regex_collection.hpp"
+#include "modules/hyprland/workspaces.hpp"
 
 using WindowAddress = std::string;
 
@@ -82,7 +66,7 @@ class Workspace {
   Gtk::Button m_button;
   Gtk::Box m_content;
   Gtk::Label m_label;
-  Glib::RefPtr<Gtk::GestureClick> controllClick_;
+  Glib::RefPtr<Gtk::GestureClick> const controllClick_;
 };
 
 }  // namespace waybar::modules::hyprland

include/modules/hyprland/workspaces.hpp

@@ -1,17 +1,7 @@
 #pragma once
 
-#include <gtkmm/button.h>
-#include <gtkmm/label.h>
 #include <json/value.h>
 
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <regex>
-#include <string>
-#include <vector>
-
-#include "AModule.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
 #include "modules/hyprland/windowcreationpayload.hpp"
@@ -23,8 +13,6 @@ using WindowAddress = std::string;
 
 namespace waybar::modules::hyprland {
 
-class Workspaces;
-
 class Workspaces : public AModule, public EventHandler {
  public:
   Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);

include/modules/wlr/taskbar.hpp

@@ -8,7 +8,6 @@
 
 #include <unordered_set>
 
-#include "AModule.hpp"
 #include "bar.hpp"
 #include "wlr-foreign-toplevel-management-unstable-v1-client-protocol.h"
 
@@ -123,6 +122,7 @@ class Taskbar : public waybar::AModule {
   Taskbar(const std::string &, const waybar::Bar &, const Json::Value &);
   ~Taskbar();
   void update();
+  operator Gtk::Widget&() override;
 
  private:
   const waybar::Bar &bar_;

include/modules/wlr/workspace_manager.hpp

@@ -1,16 +1,8 @@
 #pragma once
 
-#include <fmt/format.h>
 #include <gtkmm/button.h>
-#include <gtkmm/image.h>
 #include <gtkmm/label.h>
 
-#include <functional>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "AModule.hpp"
 #include "bar.hpp"
 #include "ext-workspace-unstable-v1-client-protocol.h"
 
@@ -41,7 +33,7 @@ class Workspace {
   auto handle_duplicate() -> void;
 
   auto handle_done() -> void;
-  auto handle_clicked(GdkEventButton *bt) -> bool;
+  void handleClick(int n_press, double dx, double dy);
   auto show() -> void;
   auto hide() -> void;
   auto get_button_ref() -> Gtk::Button & { return button_; }
@@ -75,6 +67,7 @@ class Workspace {
   bool persistent_ = false;
 
   Gtk::Button button_;
+  Glib::RefPtr<Gtk::GestureClick> const controllClick_;
   Gtk::Box content_;
   Gtk::Label label_;
 };
@@ -133,6 +126,7 @@ class WorkspaceManager : public AModule {
   WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config);
   ~WorkspaceManager() override;
   auto update() -> void override;
+  operator Gtk::Widget&() override;
 
   auto all_outputs() const -> bool { return all_outputs_; }
   auto active_only() const -> bool { return active_only_; }

resources/custom_modules/cffi_example/main.c

@@ -3,7 +3,6 @@
 
 typedef struct {
   wbcffi_module* waybar_module;
-  GtkBox* container;
   GtkButton* button;
 } ExampleMod;
 
@@ -30,24 +29,22 @@ void* wbcffi_init(const wbcffi_init_info* init_info, const wbcffi_config_entry*
   ExampleMod* inst = malloc(sizeof(ExampleMod));
   inst->waybar_module = init_info->obj;
 
-  GtkContainer* root = init_info->get_root_widget(init_info->obj);
-
-  // Add a container for displaying the next widgets
-  inst->container = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5));
-  gtk_container_add(GTK_CONTAINER(root), GTK_WIDGET(inst->container));
+  GtkWidget* root = init_info->get_root_widget(init_info->obj);
+  gtk_box_set_spacing(GTK_BOX(root), 5);
+  gtk_orientable_set_orientation(GTK_ORIENTABLE(root), GTK_ORIENTATION_HORIZONTAL);
 
   // Add a label
   GtkLabel* label = GTK_LABEL(gtk_label_new("[Example C FFI Module:"));
-  gtk_container_add(GTK_CONTAINER(inst->container), GTK_WIDGET(label));
+  gtk_box_append(GTK_BOX(root), GTK_WIDGET(label));
 
   // Add a button
   inst->button = GTK_BUTTON(gtk_button_new_with_label("click me !"));
   g_signal_connect(inst->button, "clicked", G_CALLBACK(onclicked), NULL);
-  gtk_container_add(GTK_CONTAINER(inst->container), GTK_WIDGET(inst->button));
+  gtk_box_append(GTK_BOX(root), GTK_WIDGET(inst->button));
 
   // Add a label
   label = GTK_LABEL(gtk_label_new("]"));
-  gtk_container_add(GTK_CONTAINER(inst->container), GTK_WIDGET(label));
+  gtk_box_append(GTK_BOX(root), GTK_WIDGET(label));
 
   // Return instance object
   printf("cffi_example inst=%p: init success ! (%d total instances)\n", inst, ++instance_count);
@@ -67,4 +64,4 @@ void wbcffi_refresh(void* instance, int signal) {
 
 void wbcffi_doaction(void* instance, const char* name) {
   printf("cffi_example inst=%p: doAction(%s)\n", instance, name);
-}
+}

resources/custom_modules/cffi_example/meson.build

@@ -1,13 +1,13 @@
 project(
     'waybar_cffi_example', 'c',
-    version: '0.1.0',
+    version: '4.1.0',
     license: 'MIT',
 )
 
 shared_library('wb_cffi_example',
     ['main.c'],
     dependencies: [
-        dependency('gtk+-3.0', version : ['>=3.22.0'])
+        dependency('gtk4', version : ['>=4.17.0'])
     ],
     name_prefix: ''
 )

resources/custom_modules/cffi_example/waybar_cffi_module.h

@@ -23,7 +23,7 @@ typedef struct {
 
   /// Returns the waybar widget allocated for this module
   /// @param obj Waybar CFFI object pointer
-  GtkContainer* (*get_root_widget)(wbcffi_module* obj);
+  GtkWidget* (*get_root_widget)(wbcffi_module* obj);
 
   /// Queues a request for calling wbcffi_update() on the next GTK main event
   /// loop iteration

src/modules/cffi.cpp

@@ -7,7 +7,9 @@
 namespace waybar::modules {
 
 CFFI::CFFI(const std::string& name, const std::string& id, const Json::Value& config)
-    : AModule(config, name, id, true, true) {
+    : AModule(config, name, id, true, true) ,
+      box_{new Gtk::Box()} {
+  box_->set_name(name_);
   const auto dynlib_path = config_["module_path"].asString();
   if (dynlib_path.empty()) {
     throw std::runtime_error{"Missing or empty 'module_path' in module config"};
@@ -101,6 +103,11 @@ auto CFFI::update() -> void {
   AModule::update();
 }
 
+CFFI::operator Gtk::Widget&() {
+  assert(box_);
+  return *box_;
+}
+
 auto CFFI::refresh(int signal) -> void {
   assert(cffi_instance_ != nullptr);
   hooks_.refresh(cffi_instance_, signal);

src/modules/hyprland/backend.cpp

@@ -1,17 +1,6 @@
 #include "modules/hyprland/backend.hpp"
 
-#include <netdb.h>
-#include <netinet/in.h>
 #include <spdlog/spdlog.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-#include <filesystem>
-#include <string>
-#include <thread>
 
 namespace waybar::modules::hyprland {
 

src/modules/hyprland/window.cpp

@@ -1,14 +1,7 @@
 #include "modules/hyprland/window.hpp"
 
-#include <glibmm/fileutils.h>
-#include <glibmm/keyfile.h>
-#include <glibmm/miscutils.h>
 #include <spdlog/spdlog.h>
 
-#include <algorithm>
-#include <vector>
-
-#include "modules/hyprland/backend.hpp"
 #include "util/rewrite_string.hpp"
 #include "util/sanitize_str.hpp"
 

src/modules/hyprland/workspace.cpp

@@ -1,12 +1,7 @@
-#include <json/value.h>
-#include <spdlog/spdlog.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-
 #include "modules/hyprland/workspaces.hpp"
 
+#include <spdlog/spdlog.h>
+
 namespace waybar::modules::hyprland {
 
 Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_manager,
@@ -18,7 +13,8 @@ Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_ma
       m_windows(workspace_data["windows"].asInt()),
       m_isActive(true),
       m_isPersistentRule(workspace_data["persistent-rule"].asBool()),
-      m_isPersistentConfig(workspace_data["persistent-config"].asBool()) {
+      m_isPersistentConfig(workspace_data["persistent-config"].asBool()),
+      controllClick_{Gtk::GestureClick::create()} {
   if (m_name.starts_with("name:")) {
     m_name = m_name.substr(5);
   } else if (m_name.starts_with("special")) {