Added offscreen CLI argument

darwinbeing · Jan 26, 2024 · 3cf84db · 3cf84db
1 parent 6082b67
commit 3cf84db
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/main.cpp b/main.cpp
@@ -107,6 +107,7 @@ static void showHelp()
     qDebug() << "--packFirmware [fileIn:fileOut] : Pack firmware-file for compatibility with the bootloader. ";
     qDebug() << "--packLisp [fileIn:fileOut] : Pack lisp-file and the included imports.";
     qDebug() << "--bridgeAppData : Send app data (such as data from send-data in lisp) to stdout.";
+    qDebug() << "--offscreen : Use offscreen QPA so that X is not required for the CLI-mode.";
 }
 
 #ifdef Q_OS_LINUX
@@ -310,6 +311,7 @@ int main(int argc, char *argv[])
     QString lispPackIn = "";
     QString lispPackOut = "";
     bool bridgeAppData = false;
+    bool offscreen = false;
 
     // Arguments can be hard-coded in a build like this:
 //    qmlWindowSize = QSize(400, 800);
@@ -670,6 +672,11 @@ int main(int argc, char *argv[])
             found = true;
         }
 
+        if (str == "--offscreen") {
+            offscreen = true;
+            found = true;
+        }
+
         if (!found) {
             if (dash) {
                 qCritical() << "At least one of the flags is invalid:" << str;
@@ -969,7 +976,9 @@ int main(int argc, char *argv[])
     if (isMcConf || isAppConf || isCustomConf || !lispPath.isEmpty() ||
             eraseLisp || !firmwarePath.isEmpty() || uploadBootloaderBuiltin ||
             !fileForSdIn.isEmpty() || bridgeAppData) {
-        qputenv("QT_QPA_PLATFORM", "offscreen");
+        if (offscreen) {
+            qputenv("QT_QPA_PLATFORM", "offscreen");
+        }
         app = new QCoreApplication(argc, argv);
         vesc = new VescInterface;
         vesc->fwConfig()->loadParamsXml("://res/config/fw.xml");
@@ -1328,7 +1337,9 @@ int main(int argc, char *argv[])
             }
         });
     } else if (useTcp) {
-        qputenv("QT_QPA_PLATFORM", "offscreen");
+        if (offscreen) {
+            qputenv("QT_QPA_PLATFORM", "offscreen");
+        }
         app = new QCoreApplication(argc, argv);
         vesc = new VescInterface;
         vesc->fwConfig()->loadParamsXml("://res/config/fw.xml");
@@ -1351,7 +1362,9 @@ int main(int argc, char *argv[])
             }
         });
     } else if (isTcpHub) {
-        qputenv("QT_QPA_PLATFORM", "offscreen");
+        if (offscreen) {
+            qputenv("QT_QPA_PLATFORM", "offscreen");
+        }
         app = new QCoreApplication(argc, argv);
         tcpHub = new TcpHub;
         if (tcpHub->start(tcpPort)) {