Retry with lower resolution if auto-setup fails

1 files changed, 47 insertions, 24 deletions

diff --git a/src/xx.cpp b/src/xx.cpp
index d3cd1ee..570f79d 100644
--- a/src/xx.cpp
+++ b/src/xx.cpp
@@ -399,31 +399,54 @@ ConfigBackup ScreenSetup::setDefaultMode(ScreenMode &mode)
         mode = ScreenMode::Advanced; // Dunno lol
         return retval;
     }
-    QSize screenSize = getTotalSizeHorz(outputSizes);
-    QStringList cmd;
-    retval = createCrtcBackup();
-
-	qDebug() << "Virtual screen size:" << screenSize << "with" << outputSizes.size() << "different screens.";
-
-	int offset = 0;
-    for (int i = 0; i < outputSizes.size(); ++i) {
-		const QSize &size = outputSizes.at(i);
-		unsigned int w = 0;
-		if (i < projectors.size()) {
-			   auto *mode = a->setOutputResolution(cmd, projectors.at(i), offset, 0, size);
-				if (mode != nullptr && mode->width > w) {
-					w = mode->width;
-				}
-		}
-		if (i < screens.size()) {
-			   auto *mode = a->setOutputResolution(cmd, screens.at(i), offset, 0, size);
-				if (mode != nullptr && mode->width > w) {
-					w = mode->width;
-				}
-		}
-		offset += w;
+    for (;;) {
+        QSize screenSize = getTotalSizeHorz(outputSizes);
+        QStringList cmd;
+        retval = createCrtcBackup();
+
+        qDebug() << "Virtual screen size:" << screenSize << "with" << outputSizes.size() << "different screens.";
+
+        int offset = 0;
+        for (int i = 0; i < outputSizes.size(); ++i) {
+            const QSize &size = outputSizes.at(i);
+            unsigned int w = 0;
+            if (i < projectors.size()) {
+                   auto *mode = a->setOutputResolution(cmd, projectors.at(i), offset, 0, size);
+                    if (mode != nullptr && mode->width > w) {
+                        w = mode->width;
+                    }
+            }
+            if (i < screens.size()) {
+                   auto *mode = a->setOutputResolution(cmd, screens.at(i), offset, 0, size);
+                    if (mode != nullptr && mode->width > w) {
+                        w = mode->width;
+                    }
+            }
+            offset += w;
+        }
+        retval._ok = runXrandr(cmd);
+        if (retval._ok)
+            break;
+        // If xrandr failed, try again while capping the resolution of any screen to FullHD
+        bool keepGoing = false;
+        for (QSize &geo : outputSizes) {
+            if (geo.width() > 1920) {
+                keepGoing = true;
+                geo.setWidth(1920);
+            }
+            if (geo.height() > 1200) {
+                keepGoing = true;
+                geo.setHeight(1080);
+            }
+        }
+        // If we didn't clamp resolutions, but have more than one output group, remove last and retry
+        if (!keepGoing && outputSizes.size() > 1) {
+            keepGoing = true;
+            outputSizes.removeLast();
+        }
+        if (!keepGoing)
+            break; // No more options
     }
-    retval._ok = runXrandr(cmd);
 	updateScreenResources(); // Re-Read
     if (outputSizes.size() == 1) {
         // One output size, at least 2 outputs in total -- clone mode