From fbd957bf3370aecf5043569f42879947e5e441c8 Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Fri, 11 Nov 2016 10:55:37 -0800
Subject: [PATCH] feat(bspwm): added scrolling

---
 .gitignore                |  1 +
 include/modules/bspwm.hpp |  5 ++++-
 src/modules/bspwm.cpp     | 41 +++++++++++++++++++++++++--------------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f01fad86..67154654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@ tags
 *.bak
 *.pyc
 *.tmp
+*.swp
 include/config.hpp
 .tags
diff --git a/include/modules/bspwm.hpp b/include/modules/bspwm.hpp
index fbf3bde4..53545500 100644
--- a/include/modules/bspwm.hpp
+++ b/include/modules/bspwm.hpp
@@ -55,7 +55,10 @@ namespace modules {
     static constexpr auto TAG_LABEL_MONITOR = "<label-monitor>";
     static constexpr auto TAG_LABEL_STATE = "<label-state>";
     static constexpr auto TAG_LABEL_MODE = "<label-mode>";
-    static constexpr auto EVENT_CLICK = "bwm";
+    static constexpr auto EVENT_PREFIX = "bwm";
+    static constexpr auto EVENT_CLICK = "bwmf";
+    static constexpr auto EVENT_SCROLL_UP = "bwmn";
+    static constexpr auto EVENT_SCROLL_DOWN = "bwmp";
 
     bspwm_util::connection_t m_subscriber;
 
diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index 16d5f295..4c7c0e4d 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -289,6 +289,8 @@ namespace modules {
       int workspace_n = 0;
 
       for (auto&& ws : m_monitors[m_index]->workspaces) {
+        builder->cmd(mousebtn::SCROLL_DOWN, EVENT_SCROLL_DOWN);
+        builder->cmd(mousebtn::SCROLL_UP, EVENT_SCROLL_UP);
         if (ws.second.get()) {
           string event{EVENT_CLICK};
           event += to_string(m_index);
@@ -319,28 +321,37 @@ namespace modules {
   }  // }}}
 
   bool bspwm_module::handle_event(string cmd) {  // {{{
-    if (cmd.find(EVENT_CLICK) != 0) {
+    if (cmd.find(EVENT_PREFIX) != 0) {
       return false;
     }
 
     try {
-      cmd.erase(0, strlen(EVENT_CLICK));
-
-      size_t separator = string_util::find_nth(cmd, 0, "+", 1);
-      size_t monitor_n = std::atoi(cmd.substr(0, separator).c_str());
-      string workspace_n = cmd.substr(separator + 1);
-
-      if (monitor_n < m_monitors.size()) {
+      auto send_command = [this](string payload_cmd, string log_info) {
         auto ipc = bspwm_util::make_connection();
-        auto payload = bspwm_util::make_payload(
-            "desktop -f " + m_monitors[monitor_n]->name + ":^" + workspace_n);
-
-        m_log.info("%s: Sending desktop focus command to ipc handler", name());
-
+        auto payload = bspwm_util::make_payload(payload_cmd);
+        m_log.info("%s: %s", name(), log_info);
         ipc->send(payload->data, payload->len, 0);
         ipc->disconnect();
-      } else {
-        m_log.err("%s: Invalid monitor index in command: %s", name(), cmd);
+      };
+      if (cmd.compare(0, strlen(EVENT_CLICK), EVENT_CLICK) == 0) {
+        cmd.erase(0, strlen(EVENT_CLICK));
+
+        size_t separator = string_util::find_nth(cmd, 0, "+", 1);
+        size_t monitor_n = std::atoi(cmd.substr(0, separator).c_str());
+        string workspace_n = cmd.substr(separator + 1);
+
+        if (monitor_n < m_monitors.size()) {
+          send_command("desktop -f " + m_monitors[monitor_n]->name + ":^" + workspace_n,
+            "Sending desktop focus command to ipc handler");
+        } else {
+          m_log.err("%s: Invalid monitor index in command: %s", name(), cmd);
+        }
+      }
+      else if (cmd.compare(0, strlen(EVENT_SCROLL_UP), EVENT_SCROLL_UP) == 0) {
+        send_command("desktop -f next", "Sending desktop next command to ipc handler");
+      }
+      else if (cmd.compare(0, strlen(EVENT_SCROLL_DOWN), EVENT_SCROLL_DOWN) == 0) {
+        send_command("desktop -f prev", "Sending desktop prev command to ipc handler");
       }
     } catch (const system_error& err) {
       m_log.err("%s: %s", name(), err.what());