From d018adcf912ec174f4de3fe527b31c952eefd93c Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Sun, 20 Mar 2022 20:03:51 +0100
Subject: [PATCH] Move current cursor value to bar class

It doesn't really belong to bar_settings
---
 include/components/bar.hpp   | 5 +++++
 include/components/types.hpp | 5 -----
 src/components/bar.cpp       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index 76df44c4..dc7a09e1 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -99,6 +99,11 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
 
   bar_settings m_opts{};
 
+  /**
+   * Name of currently active cursor
+   */
+  string m_cursor{};
+
   string m_lastinput{};
   bool m_dblclicks{false};
 
diff --git a/include/components/types.hpp b/include/components/types.hpp
index 0264e246..8457bf99 100644
--- a/include/components/types.hpp
+++ b/include/components/types.hpp
@@ -211,11 +211,6 @@ struct bar_settings {
 
   int double_click_interval{400};
 
-  /**
-   * Name of currently active cursor
-   */
-  string cursor{};
-
   /**
    * Name of cursor to use for clickable areas
    */
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 9709ef9d..b2efa93c 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -918,11 +918,11 @@ bool bar::on(const signals::ui::dim_window& sig) {
 #if WITH_XCURSOR
 void bar::change_cursor(const string& name) {
   // This is already the same cursor, no need to update
-  if (m_opts.cursor == name) {
+  if (m_cursor == name) {
     return;
   }
+  m_cursor = name;
 
-  m_opts.cursor = name;
   if (!cursor_util::set_cursor(m_connection, m_connection.screen(), m_opts.window, name)) {
     m_log.warn("Failed to create cursor context for cursor name '%s'", name);
   }