From f4406783e2324284e57a3c49046b109b9ce097ee Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Mon, 9 Jan 2017 18:49:22 +0100
Subject: [PATCH] fix(signals): Use pointer to value

Only pass pointers to emitted signal value since the signal receivers
will be called on the same thread as the signal emitter.

Refs #302
---
 include/events/signal.hpp     | 30 +++++-------------------------
 src/components/bar.cpp        |  2 +-
 src/components/controller.cpp |  2 +-
 src/components/parser.cpp     |  2 +-
 src/components/renderer.cpp   |  2 +-
 src/x11/tray_manager.cpp      |  2 +-
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/include/events/signal.hpp b/include/events/signal.hpp
index cbc4b2f4..64ad28dd 100644
--- a/include/events/signal.hpp
+++ b/include/events/signal.hpp
@@ -41,38 +41,18 @@ namespace signals {
     class value_signal : public base_signal<Derived> {
      public:
       using base_type = value_signal<Derived, ValueType>;
-      using value_type = ValueType;
 
-      template <size_t Size = sizeof(ValueType)>
-      explicit value_signal(void* data) : m_data(data), m_size(Size) {}
+      explicit value_signal(void* data) : m_ptr(data) {}
+      explicit value_signal(ValueType&& data) : m_ptr(&data) {}
 
-      template <size_t Size = sizeof(ValueType)>
-      explicit value_signal(ValueType data) : m_size(Size) {
-        m_data = new char[Size];
-        m_alloced = true;
-        memcpy(m_data, static_cast<void*>(&data), Size);
-      }
+      virtual ~value_signal() {}
 
-      virtual ~value_signal() {
-        if (m_alloced) {
-          delete[] static_cast<char*>(m_data);
-        }
-      }
-
-      void* data() const {
-        return m_data;
-      }
-      size_t size() const {
-        return m_size;
-      }
       inline ValueType cast() const {
-        return *static_cast<ValueType*>(m_data);
+        return *static_cast<ValueType*>(m_ptr);
       }
 
      private:
-      void* m_data;
-      size_t m_size;
-      bool m_alloced{false};
+      void* m_ptr;
     };
   }
 
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index a323e88e..e0ed44d3 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -514,7 +514,7 @@ void bar::handle(const evt::leave_notify&) {
   if (!m_opts.dimmed) {
     m_taskqueue->defer_unique("window-dim", 3s, [&](size_t) {
       m_opts.dimmed = true;
-      m_sig.emit(dim_window{m_opts.dimvalue});
+      m_sig.emit(dim_window{double(m_opts.dimvalue)});
     });
   }
 }
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index dcf56e83..fa4034bb 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -222,7 +222,7 @@ bool controller::enqueue(string&& input_data) {
   } else if (chrono::system_clock::now() - m_swallow_input < m_lastinput) {
     m_log.trace("controller: Swallowing input event (throttled)");
   } else {
-    m_inputdata = input_data;
+    m_inputdata = forward<string>(input_data);
     return enqueue(make_input_evt());
   }
   return false;
diff --git a/src/components/parser.cpp b/src/components/parser.cpp
index 04993cff..562140e8 100644
--- a/src/components/parser.cpp
+++ b/src/components/parser.cpp
@@ -184,7 +184,7 @@ size_t parser::text(string&& data) {
       }
 
       pkt.length = len;
-      m_sig.emit(write_text_string{static_cast<void*>(&pkt)});
+      m_sig.emit(write_text_string{move(pkt)});
     }
 
     if (pos > 0) {
diff --git a/src/components/renderer.cpp b/src/components/renderer.cpp
index d906a9d4..ceeccdd8 100644
--- a/src/components/renderer.cpp
+++ b/src/components/renderer.cpp
@@ -707,7 +707,7 @@ bool renderer::on(const write_text_unicode& evt) {
 }
 
 bool renderer::on(const write_text_string& evt) {
-  auto pkt = *static_cast<const parser::packet*>(evt.data());
+  auto pkt = evt.cast();
   draw_textstring(pkt.data, pkt.length);
   return true;
 }
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 277d91b3..1bc7014e 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -1097,7 +1097,7 @@ void tray_manager::handle(const evt::map_notify& evt) {
     if (clientcount > m_opts.configured_slots) {
       reconfigure();
     }
-    m_sig.emit(signals::ui_tray::mapped_clients{clientcount});
+    m_sig.emit(signals::ui_tray::mapped_clients{move(clientcount)});
   }
 }