Now we report back on events using Json.

rec · Dec 28, 2014 · 5138544 · 5138544
1 parent d80051b
commit 5138544
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/code/cpp/echomesh/component/LightingWindow.cpp b/code/cpp/echomesh/component/LightingWindow.cpp
@@ -1,5 +1,6 @@
 #include "echomesh/color/FColorList.h"
 #include "echomesh/component/LightingWindow.h"
+#include "echomesh/util/EchomeshApplication.h"
 #include "echomesh/util/Quit.h"
 #include "echomesh/util/RunOnMessageThread.h"
 
@@ -44,16 +45,27 @@ LightingWindow* makeLightingWindow() {
     return window.release();
 }
 
+static string stringBounds(LightingWindow const& window) {
+    auto bounds = window.getScreenBounds();
+    return "{\"x\":" + std::to_string(bounds.getX()) +
+            ",\"y\":" + std::to_string(bounds.getY()) +
+            ",\"width\":" + std::to_string(bounds.getWidth()) +
+            ",\"height\":" + std::to_string(bounds.getHeight()) +
+            "}";
+}
+
 void LightingWindow::closeButtonPressed() {
-    // LOG(INFO) << "closing!!";
+    callEchomesh("{\"event\":\"closeButtonPressed\"}");
 }
 
 void LightingWindow::moved() {
-    // LOG(INFO) << "Moved!";
+    callEchomesh("{\"event\":\"moved\",\"bounds\":" +
+                 stringBounds(*this) + "}");
 }
 
 void LightingWindow::resized() {
-    // LOG(INFO) << "Resized!!";
+    callEchomesh("{\"event\":\"resized\",\"bounds\":" +
+                 stringBounds(*this) + "}");
 }
 
 static void deleteWindow(LightingWindow* window) {

diff --git a/code/cpp/echomesh/util/EchomeshApplication.cpp b/code/cpp/echomesh/util/EchomeshApplication.cpp
@@ -41,6 +41,11 @@ juce::JUCEApplicationBase* juce_CreateApplication() {
 
 }  // namespace
 
+void callEchomesh(string const& s) {
+    if (CALLBACK and USER_DATA)
+        CALLBACK(USER_DATA, s.c_str());
+}
+
 void startApplication(StringCaller cb, void* userData) {
     {
         ScopedLock l(LOCK);

diff --git a/code/cpp/echomesh/util/EchomeshApplication.h b/code/cpp/echomesh/util/EchomeshApplication.h
@@ -5,6 +5,7 @@
 namespace echomesh {
 
 void startApplication(StringCaller, void*);
+void callEchomesh(string const&);
 bool isStarted();
 
 string timestamp();

diff --git a/code/python/echomesh/Instance.py b/code/python/echomesh/Instance.py
@@ -100,6 +100,8 @@ def main(self):
     def callback(self, data):
         if data == 'start':
             self.after_server_starts()
+        else:
+            print(data)
 
     def after_server_starts(self):
         if cechomesh.LOADED: