framebuffer-spy: Cleanup API, add xovi-message-broker bindings

Author: asivery

framebuffer-spy/framebuffer-spy-rm2.xovi

@@ -1,8 +1,13 @@
-version     0.3.0
+version     0.2.0
 
-export      getFramebufferAddress
 export      getFramebufferConfig
 export      refreshFramebuffer
+export      getConfigString
+with
+    xovi-message-broker$simpleSignal = "framebuffer-spy$getConfigString"
+    xovi-message-broker$version = 1
+end
+
 import?     _ZN6QImageC1EPhiiiNS_6FormatEPFvPvES2_
 override    _ZN6QImageC1EPhiiiNS_6FormatEPFvPvES2_
 with

framebuffer-spy/framebuffer-spy-rmpp.xovi

@@ -1,8 +1,12 @@
-version     0.3.0
+version     0.2.0
 
-export      getFramebufferAddress
 export      getFramebufferConfig
 export      refreshFramebuffer
+export      getConfigString
+with
+    xovi-message-broker$simpleSignal = "framebuffer-spy$getConfigString"
+    xovi-message-broker$version = 1
+end
 import?     _ZN6QImageC1EPhiixNS_6FormatEPFvPvES2_
 override    _ZN6QImageC1EPhiixNS_6FormatEPFvPvES2_
 

framebuffer-spy/framebuffer-spy.h

@@ -5,6 +5,7 @@
 #define FBSPY_TYPE_RGBA 2
 
 struct FramebufferConfig {
+    void *framebufferAddress;
     int width, height, type, bpl;
     bool requiresReload;
 };

framebuffer-spy/src/main.c

@@ -10,16 +10,20 @@
 #include "../xovi.h"
 #include "../framebuffer-spy.h"
 
-static void *framebufferData = NULL;
 static struct FramebufferConfig config;
+static const char *framebufferConfigString = "NULL";
+
 static int sizeMap;
 
-void setFramebufferAddress(void *data) {
-    fprintf(stderr, "Found framebuffer! Address is %p\n", data);
-    framebufferData = data;
-    char temp[50];
-    snprintf(temp, sizeof(temp), "%p", framebufferData);
-    setenv("FRAMEBUFFER_SPY_EXTENSION_FBADDR", temp, 1);
+static void prepareConfigString() {
+    framebufferConfigString = malloc(1024);
+    snprintf((char *) framebufferConfigString, 1024,
+            "%p,%d,%d,%d,%d,%d",
+            config.framebufferAddress,
+            config.width, config.height,
+            config.type, config.bpl,
+            config.requiresReload);
+    fprintf(stderr, "Found framebuffer! Config string is %s\n", framebufferConfigString);
 }
 
 #ifdef __aarch64__
@@ -31,13 +35,14 @@ void override$_ZN6QImageC1EPhiiiNS_6FormatEPFvPvES2_(void *that, void *data, int
     bool rmppmCondition = x == 960 && y == 1696 && bpl == 3840 && f == 4;
     bool rmppCondition = x == 1620 && y == 2160 && bpl == 6528 && f == 4;
     bool rm2Condition = x == 1404 && y == 1872 && ((bpl == 2808 && f == 7) || (bpl == 5616 && f == 4));
-    if((rmppmCondition || rmppCondition || rm2Condition) && framebufferData == NULL) {
-        setFramebufferAddress(data);
+    if((rmppmCondition || rmppCondition || rm2Condition) && config.framebufferAddress == NULL) {
         config.width = x;
         config.height = y;
         config.type = f == 4 ? FBSPY_TYPE_RGBA : FBSPY_TYPE_RGB565;
         config.bpl = bpl;
         config.requiresReload = false;
+        config.framebufferAddress = data;
+        prepareConfigString();
     }
 #ifdef __aarch64__
     $_ZN6QImageC1EPhiixNS_6FormatEPFvPvES2_(that, data, x, y, bpl, f, a, b);
@@ -47,19 +52,19 @@ void override$_ZN6QImageC1EPhiiiNS_6FormatEPFvPvES2_(void *that, void *data, int
 }
 
 // export
-void *getFramebufferAddress(){
-    return framebufferData;
+struct FramebufferConfig getFramebufferConfig() {
+    return config;
 }
 
 // export
-struct FramebufferConfig getFramebufferConfig() {
-    return config;
+char *getConfigString() {
+    return strdup(framebufferConfigString);
 }
 
 // export
 void refreshFramebuffer() {
     if(config.requiresReload) {
-        msync(framebufferData, sizeMap, MS_SYNC);
+        msync(config.framebufferAddress, sizeMap, MS_SYNC);
     }
 }
 
@@ -69,19 +74,20 @@ static void prepareRM1() {
         sizeMap = 1872 * 1408 * 2;
         fprintf(stderr, "Framebuffer detected as a device file (fd=%d, size=%u) - mmaping...\n", fd, sizeMap);
         void *data = mmap(NULL, sizeMap, PROT_READ, MAP_SHARED, fd, 0);
-        setFramebufferAddress(data);
-        setenv("FRAMEBUFFER_SPY_REQUIRE_MSYNC", "1", 1);
         config.width = 1408;
         config.height = 1872;
         config.type = FBSPY_TYPE_RGB565;
         config.bpl = config.width * 2;
         config.requiresReload = true;
+        config.framebufferAddress = data;
+        prepareConfigString();
     }
 }
 
 void _xovi_construct() {
     // Check if this is an rM1:
     char *data = malloc(1024);
+    config.framebufferAddress = NULL;
     int devFD = open("/sys/devices/soc0/machine", O_RDONLY);
     if(devFD > -1) {
         int r = read(devFD, data, 1023);