From b45dcdf74e8773f1fb695d11e7efaf437c2aef9b Mon Sep 17 00:00:00 2001
From: RX14 <chris@rx14.co.uk>
Date: Thu, 16 May 2019 22:18:43 +0100
Subject: [PATCH] Allow scrolling on the entire bar surface

---
 include/bar.hpp                     |  1 +
 include/modules/sway/workspaces.hpp |  3 ++-
 src/bar.cpp                         | 31 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index c4cd8148..45bdf016 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -55,6 +55,7 @@ class Bar {
   void setMarginsAndZone(uint32_t height, uint32_t width);
   auto setupWidgets() -> void;
   void getModules(const Factory &, const std::string &);
+  bool handleScroll(GdkEventScroll*);
   void setupAltFormatKeyForModule(const std::string &module_name);
   void setupAltFormatKeyForModuleList(const char *module_list_name);
 
diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp
index 84c2eb0e..97b82e74 100644
--- a/include/modules/sway/workspaces.hpp
+++ b/include/modules/sway/workspaces.hpp
@@ -19,6 +19,8 @@ class Workspaces : public IModule, public sigc::trackable {
   auto update() -> void;
        operator Gtk::Widget&();
 
+  bool handleScroll(GdkEventScroll*);
+
  private:
   void              onCmd(const struct Ipc::ipc_response&);
   void              onEvent(const struct Ipc::ipc_response&);
@@ -27,7 +29,6 @@ class Workspaces : public IModule, public sigc::trackable {
   Gtk::Button&      addButton(const Json::Value&);
   void              onButtonReady(const Json::Value&, Gtk::Button&);
   std::string       getIcon(const std::string&, const Json::Value&);
-  bool              handleScroll(GdkEventScroll*);
   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);
diff --git a/src/bar.cpp b/src/bar.cpp
index 6c6de20c..cb0d01c6 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -72,6 +72,12 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
   wl_surface_commit(surface);
   wl_display_roundtrip(client->wl_display);
 
+
+  if (!config["disable-workspace-scroll"].asBool()) {
+    window.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+    window.signal_scroll_event().connect(sigc::mem_fun(*this, &Bar::handleScroll));
+  }
+
   setupWidgets();
 }
 
@@ -217,6 +223,31 @@ void waybar::Bar::handleSignal(int signal) {
   }
 }
 
+bool waybar::Bar::handleScroll(GdkEventScroll *e) {
+  std::cerr << "handleScroll" << std::endl;
+
+  for (auto& module : modules_left_) {
+    if (auto workspaces = dynamic_cast<waybar::modules::sway::Workspaces*>(module.get())) {
+      workspaces->handleScroll(e);
+      return true;
+    }
+  }
+  for (auto& module : modules_center_) {
+    if (auto workspaces = dynamic_cast<waybar::modules::sway::Workspaces*>(module.get())) {
+      workspaces->handleScroll(e);
+      return true;
+    }
+  }
+  for (auto& module : modules_right_) {
+    if (auto workspaces = dynamic_cast<waybar::modules::sway::Workspaces*>(module.get())) {
+      workspaces->handleScroll(e);
+      return true;
+    }
+  }
+
+  return false;
+}
+
 void waybar::Bar::layerSurfaceHandleConfigure(void* data, struct zwlr_layer_surface_v1* surface,
                                               uint32_t serial, uint32_t width, uint32_t height) {
   auto o = static_cast<waybar::Bar*>(data);