Merge remote-tracking branch 'luka/gtk4' into gtk4

Alexays · Jan 12, 2024 · d5bc2f3 · d5bc2f3
2 parents f744d90 + f8eb01d
commit d5bc2f3
Show file tree

Hide file tree

Showing 18 changed files with 178 additions and 273 deletions.
diff --git a/include/ALabel.hpp b/include/ALabel.hpp
@@ -25,7 +25,7 @@ class ALabel : public AModule {
   bool alt_ = false;
   std::string default_format_;
 
-  bool handleToggle(GdkEventButton *const &e) override;
+//todo  bool handleToggle(GdkEventButton *const &e) override;
   virtual std::string getState(uint8_t value, bool lesser = false);
 };
 

diff --git a/include/AModule.hpp b/include/AModule.hpp
@@ -2,7 +2,7 @@
 
 #include <glibmm/dispatcher.h>
 #include <glibmm/markup.h>
-#include <gtkmm/eventbox.h>
+//#include <gtkmm/eventbox.h>
 #include <json/json.h>
 
 #include "IModule.hpp"
@@ -28,25 +28,25 @@ class AModule : public IModule {
 
   enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
 
-  SCROLL_DIR getScrollDir(GdkEventScroll *e);
+//  SCROLL_DIR getScrollDir(GdkEventScroll *e);
   bool tooltipEnabled();
 
   const std::string name_;
   const Json::Value &config_;
-  Gtk::EventBox event_box_;
+//  Gtk::EventBox event_box_;
 
-  virtual bool handleToggle(GdkEventButton *const &ev);
-  virtual bool handleScroll(GdkEventScroll *);
-  virtual bool handleRelease(GdkEventButton *const &ev);
+//  virtual bool handleToggle(GdkEventButton *const &ev);
+//  virtual bool handleScroll(GdkEventScroll *);
+//  virtual bool handleRelease(GdkEventButton *const &ev);
 
  private:
-  bool handleUserEvent(GdkEventButton *const &ev);
+//  bool handleUserEvent(GdkEventButton *const &ev);
   const bool isTooltip;
   std::vector<int> pid_;
   gdouble distance_scrolled_y_;
   gdouble distance_scrolled_x_;
   std::map<std::string, std::string> eventActionMap_;
-  static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
+ /* static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
       {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
       {std::make_pair(1, GdkEventType::GDK_BUTTON_RELEASE), "on-click-release"},
       {std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
@@ -66,7 +66,7 @@ class AModule : public IModule {
       {std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
       {std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"},
       {std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"},
-      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};
+      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};*/
 };
 
 }  // namespace waybar
diff --git a/include/bar.hpp b/include/bar.hpp
@@ -1,18 +1,13 @@
 #pragma once
 
 #include <gdkmm/monitor.h>
-#include <glibmm/refptr.h>
 #include <gtkmm/box.h>
+#include <gtkmm/centerbox.h>
 #include <gtkmm/cssprovider.h>
-#include <gtkmm/main.h>
 #include <gtkmm/window.h>
-#include <json/json.h>
-
-#include <memory>
-#include <vector>
 
 #include "AModule.hpp"
-#include "group.hpp"
+//#include "group.hpp"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
 namespace waybar {
@@ -91,6 +86,7 @@ class Bar {
   bool visible = true;
   bool vertical = false;
   Gtk::Window window;
+  Glib::RefPtr<Gdk::Surface> gdk_surface_;
 
   int x_global;
   int y_global;
@@ -100,13 +96,13 @@ class Bar {
 #endif
 
  private:
-  void onMap(GdkEventAny *);
+  void onMap();
   auto setupWidgets() -> void;
-  void getModules(const Factory &, const std::string &, waybar::Group *);
+//  void getModules(const Factory &, const std::string &, waybar::Group *);
   void setupAltFormatKeyForModule(const std::string &module_name);
   void setupAltFormatKeyForModuleList(const char *module_list_name);
   void setMode(const bar_mode &);
-  void onConfigure(GdkEventConfigure *ev);
+  void onConfigure(int width, int height);
   void configureGlobalOffset(int width, int height);
   void onOutputGeometryChanged();
 
@@ -120,7 +116,7 @@ class Bar {
   Gtk::Box left_;
   Gtk::Box center_;
   Gtk::Box right_;
-  Gtk::Box box_;
+  Gtk::CenterBox box_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_left_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_center_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_right_;

diff --git a/include/client.hpp b/include/client.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <fmt/format.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkwayland.h>
-#include <wayland-client.h>
+#include <gdk/wayland/gdkwayland.h>
 
 #include "bar.hpp"
 #include "config.hpp"
@@ -34,6 +31,7 @@ class Client {
 
  private:
   Client() = default;
+  Glib::RefPtr<Gio::ListModel> monitors_;
   const std::string getStyle(const std::string &style, std::optional<Appearance> appearance);
   void bindInterfaces();
   void handleOutput(struct waybar_output &output);
@@ -51,7 +49,6 @@ class Client {
   void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
   void handleDeferredMonitorRemoval(Glib::RefPtr<Gdk::Monitor> monitor);
 
-  Glib::RefPtr<Gtk::StyleContext> style_context_;
   Glib::RefPtr<Gtk::CssProvider> css_provider_;
   std::unique_ptr<Portal> portal;
   std::list<struct waybar_output> outputs_;

diff --git a/include/group.hpp b/include/group.hpp
@@ -19,7 +19,7 @@ class Group : public AModule {
   virtual Gtk::Box& getBox();
   void addWidget(Gtk::Widget& widget);
 
-  bool handleMouseHover(GdkEventCrossing* const& e);
+//  bool handleMouseHover(GdkEventCrossing* const& e);
 
  protected:
   Gtk::Box box;

diff --git a/include/modules/cffi.hpp b/include/modules/cffi.hpp
@@ -16,7 +16,7 @@ typedef struct wbcffi_module wbcffi_module;
 typedef struct {
   wbcffi_module* obj;
   const char* waybar_version;
-  GtkContainer* (*get_root_widget)(wbcffi_module*);
+//todo  GtkContainer* (*get_root_widget)(wbcffi_module*);
   void (*queue_update)(wbcffi_module*);
 } wbcffi_init_info;
 

diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp
@@ -26,8 +26,8 @@ class Custom : public ALabel {
   void parseOutputRaw();
   void parseOutputJson();
   void handleEvent();
-  bool handleScroll(GdkEventScroll* e) override;
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleScroll(GdkEventScroll* e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
 
   const std::string name_;
   const std::string output_name_;

diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp
@@ -19,7 +19,7 @@ class IdleInhibitor : public ALabel {
   static bool status;
 
  private:
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
   void toggleStatus();
 
   const Bar& bar_;

diff --git a/include/modules/user.hpp b/include/modules/user.hpp
@@ -14,7 +14,7 @@ class User : public AIconLabel {
   virtual ~User() = default;
   auto update() -> void override;
 
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
 
  private:
   util::SleeperThread thread_;

diff --git a/include/util/SafeSignal.hpp b/include/util/SafeSignal.hpp
@@ -52,7 +52,7 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
   using slot_t = decltype(std::declval<signal_t>().make_slot());
   using arg_tuple_t = std::tuple<std::decay_t<Args>...>;
   // ensure that unwrapped methods are not accessible
-  using signal_t::emit_reverse;
+  using signal_t::emit;
   using signal_t::make_slot;
 
   void handle_event() {

diff --git a/include/util/portal.hpp b/include/util/portal.hpp
@@ -19,7 +19,7 @@ class Portal : private DBus::Proxy {
   void refreshAppearance();
   Appearance getAppearance();
 
-  typedef sigc::signal<void, Appearance> type_signal_appearance_changed;
+  typedef sigc::signal<void(Appearance)> type_signal_appearance_changed;
   type_signal_appearance_changed signal_appearance_changed() { return m_signal_appearance_changed; }
 
  private: