From ebe1998b19a87c5b1941242e003a939b65543a11 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Mon, 5 Dec 2016 14:02:16 +0100
Subject: [PATCH] fix(bspwm): Change event strings

---
 examples/config.cmake     | 20 ++++----------------
 include/modules/bspwm.hpp |  8 ++++----
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/examples/config.cmake b/examples/config.cmake
index 2bfe4ce0..7d9adef5 100644
--- a/examples/config.cmake
+++ b/examples/config.cmake
@@ -63,23 +63,11 @@ tray-padding = 2
 
 ;override-redirect = true
 
-; Cycle bspwm desktops when scrolling on the bar (unless caught by module)
-;
-;   NOTE: You should probably disable scrolling for
-;   the bspwm module by setting `enable-scroll = false`
-;   in the module section
-;
-;scroll-up = bspc desktop -f prev.local
-;scroll-down = bspc desktop -f next.local
+;scroll-up = bspwm-desknext
+;scroll-down = bspwm-deskprev
 
-; Cycle i3 workspaces when scrolling on the bar (unless caught by module)
-;
-;   NOTE: You should probably disable scrolling for
-;   the i3 module by setting `enable-scroll = false`
-;   in the module section
-;
-;scroll-up = i3-msg workspace prev_on_output
-;scroll-down = i3-msg workspace next_on_output
+;scroll-up = i3wm-wsnext
+;scroll-down = i3wm-wsprev
 
 
 [module/xwindow]
diff --git a/include/modules/bspwm.hpp b/include/modules/bspwm.hpp
index 1cfe1599..e925f913 100644
--- a/include/modules/bspwm.hpp
+++ b/include/modules/bspwm.hpp
@@ -58,10 +58,10 @@ namespace modules {
     static constexpr auto TAG_LABEL_STATE = "<label-state>";
     static constexpr auto TAG_LABEL_MODE = "<label-mode>";
 
-    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";
+    static constexpr const char* EVENT_PREFIX{"bspwm-desk"};
+    static constexpr const char* EVENT_CLICK{"bspwm-deskfocus"};
+    static constexpr const char* EVENT_SCROLL_UP{"bspwm-desknext"};
+    static constexpr const char* EVENT_SCROLL_DOWN{"bspwm-deskprev"};
 
     bspwm_util::connection_t m_subscriber;