From 7eb2a6b7090c371656dd2df7fd44af6d430b43cb Mon Sep 17 00:00:00 2001
From: Genesis <tofupedia.fr@gmail.com>
Date: Tue, 2 Feb 2021 21:58:26 +0100
Subject: [PATCH] Add a configuration entry to disable auto_back_and_forth on
 Sway workspaces

---
 include/modules/sway/workspaces.hpp |  2 +-
 man/waybar-sway-workspaces.5.scd    | 12 ++++++++----
 src/modules/sway/workspaces.cpp     | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp
index 92ec0516..c6443836 100644
--- a/include/modules/sway/workspaces.hpp
+++ b/include/modules/sway/workspaces.hpp
@@ -20,7 +20,7 @@ class Workspaces : public AModule, public sigc::trackable {
   auto update() -> void;
 
  private:
-  static inline const std::string workspace_switch_cmd_ = "workspace --no-auto-back-and-forth \"{}\"";
+  static inline const std::string workspace_switch_cmd_ = "workspace {} \"{}\"";
 
   static int convertWorkspaceNameToNum(std::string name);
 
diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd
index 5e516892..f2808b90 100644
--- a/man/waybar-sway-workspaces.5.scd
+++ b/man/waybar-sway-workspaces.5.scd
@@ -66,12 +66,16 @@ Addressed by *sway/workspaces*
     Lists workspaces that should always be shown, even when non existent
 
 *on-update*: ++
-	typeof: string ++
-	Command to execute when the module is updated.
+    typeof: string ++
+    Command to execute when the module is updated.
 
 *numeric-first*: ++
-	typeof: bool ++
-	Whether to put workspaces starting with numbers before workspaces that do not start with a number.
+    typeof: bool ++
+    Whether to put workspaces starting with numbers before workspaces that do not start with a number.
+
+*disable-auto-back-and-forth*: ++
+    typeof: bool ++
+    Whether to disable *workspace_auto_back_and_forth* when clicking on workspaces. If this is set to *true*, clicking on a workspace you are already on won't do anything, even if *workspace_auto_back_and_forth* is enabled in the Sway configuration.
 
 # FORMAT REPLACEMENTS
 
diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index d0c24632..43dcf33c 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -257,11 +257,19 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) {
           ipc_.sendCmd(
               IPC_COMMAND,
               fmt::format(workspace_switch_cmd_ + "; move workspace to output \"{}\"; " + workspace_switch_cmd_,
+                          "--no-auto-back-and-forth",
                           node["name"].asString(),
                           node["target_output"].asString(),
+                          "--no-auto-back-and-forth",
                           node["name"].asString()));
         } else {
-          ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, node["name"].asString()));
+          ipc_.sendCmd(
+              IPC_COMMAND,
+              fmt::format("workspace {} \"{}\"",
+                          config_["disable-auto-back-and-forth"].asBool()
+                            ? "--no-auto-back-and-forth"
+                            : "",
+                          node["name"].asString()));
         }
       } catch (const std::exception &e) {
         spdlog::error("Workspaces: {}", e.what());
@@ -322,7 +330,9 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
     }
   }
   try {
-    ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, name));
+    ipc_.sendCmd(
+        IPC_COMMAND,
+        fmt::format(workspace_switch_cmd_, "--no-auto-back-and-forth", name));
   } catch (const std::exception &e) {
     spdlog::error("Workspaces: {}", e.what());
   }