Don't hook QImage constructor outside of xochitl

This would replace the FB of apps using QT twice, causing artefacts on the display. Also adds regression integration tests. Closes #44
timower · May 25, 2024 · fd1e6bd · fd1e6bd
1 parent f2e8823
commit fd1e6bd
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 11 deletions.
diff --git a/libs/rm2fb/Client.cpp b/libs/rm2fb/Client.cpp
@@ -12,10 +12,10 @@
 #include <cstring>
 #include <unistd.h>
 
-namespace {
-
 bool inXochitl = false;
 
+namespace {
+
 const unistdpp::Result<ControlSocket>&
 getControlSocket() {
   static auto socket = []() -> unistdpp::Result<ControlSocket> {

diff --git a/libs/rm2fb/ImageHook.cpp b/libs/rm2fb/ImageHook.cpp
@@ -3,6 +3,9 @@
 #include <dlfcn.h>
 #include <iostream>
 
+// TODO: clean
+extern bool inXochitl;
+
 extern "C" {
 
 void
@@ -15,8 +18,9 @@ _ZN6QImageC1EiiNS_6FormatE(void* that, int x, int y, int f) {
     void*, uint8_t*, int32_t, int32_t, int32_t, int, void (*)(void*), void*))
     dlsym(RTLD_NEXT, "_ZN6QImageC1EPhiiiNS_6FormatEPFvPvES2_");
 
-  if (const auto& fb = SharedFB::getInstance();
-      x == fb_width && y == fb_height && first_alloc && fb.has_value()) {
+  if (const auto& fb = SharedFB::getInstance(); inXochitl && x == fb_width &&
+                                                y == fb_height && first_alloc &&
+                                                fb.has_value()) {
     std::cerr << "REPLACING THE IMAGE with shared memory\n";
     first_alloc = false;
 

diff --git a/libs/rm2fb/Server.cpp b/libs/rm2fb/Server.cpp
@@ -21,6 +21,8 @@
 
 using namespace unistdpp;
 
+bool inXochitl = true;
+
 namespace {
 constexpr auto tcp_port = 8888;
 

diff --git a/test/integration/assets/calculator.png b/test/integration/assets/calculator.png
diff --git a/test/integration/assets/calculator_3.png b/test/integration/assets/calculator_3.png
diff --git a/test/integration/assets/startup.png b/test/integration/assets/startup.png
diff --git a/test/integration/test.sh b/test/integration/test.sh
@@ -47,6 +47,10 @@ tap_at() {
   "$TEST_BINARY" 127.0.0.1 8888 touch "$1" "$2"
 }
 
+press_power() {
+  "$TEST_BINARY" 127.0.0.1 8888 power
+}
+
 image=$(docker run --name rm-docker --rm -d -p 2222:22 -p 8888:8888 "$DOCKER_IMAGE")
 trap cleanup EXIT
 
@@ -61,7 +65,7 @@ scp -P 2222 "$IPKS_PATH"/*.ipk root@localhost:
 do_ssh systemctl restart systemd-timesyncd
 do_ssh opkg update
 
-do_ssh opkg install ./*.ipk || true # TODO: xochitl doesn't configure for 3.5+
+do_ssh opkg install ./*.ipk calculator || true # TODO: xochitl doesn't configure for 3.5+
 
 # Start rocket, which should trigger the rm2fb socket and start the service.
 do_ssh systemctl start rocket
@@ -71,25 +75,41 @@ sleep 2
 check_screenshot "startup.png"
 
 # tilem
-tap_at 538 1050
+tap_at 666 1050
 sleep 2
 check_screenshot "tilem.png"
 tap_at 840 962
 sleep 2
 check_screenshot "startup.png"
 
 # Yaft
-tap_at 860 1042
+tap_at 986 1042
 sleep 3
 check_screenshot "yaft.png"
 tap_at 76 1832
 sleep 1
-tap_at 324, 1704
+tap_at 324 1704
 sleep 2
 check_screenshot "startup.png"
 
+# Calculator
+tap_at 484 1054
+sleep 3
+check_screenshot "calculator.png"
+tap_at 826 1440
+sleep 1
+check_screenshot "calculator_3.png"
+
+press_power
+sleep 1
+tap_at 702 718 # Stop sleeping
+sleep 1
+tap_at 824 1124 # Kill calculator
+sleep 1
+check_screenshot "startup.png"
+
 # Xochitl
-tap_at 710 1086
+tap_at 832 1086
 sleep 60
 
 check_screenshot \