Add --resolutions and --mapping for manual setup

3 files changed, 64 insertions, 6 deletions

diff --git a/src/main.cpp b/src/main.cpp
index eac930b..76ea2cd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,6 +11,7 @@
 
 namespace {
 bool _testMode, _autoSetup, _showGui, _backgroundMode, _wakeup, _center, _dumpScreens;
+QString _resList, _outputMapping;
 }
 
 namespace CommandLine
@@ -69,8 +70,10 @@ int main(int argc, char *argv[])
 	if (CommandLine::center()) {
 		ScreenSetup::inst()->setCenteredClone();
 	} else if (CommandLine::autoSetup()) {
-        ScreenMode mode;
-        ScreenSetup::inst()->setDefaultMode(mode);
+		ScreenMode mode;
+		ScreenSetup::inst()->setDefaultMode(mode);
+	} else if (!_resList.isEmpty()) {
+		ScreenSetup::inst()->setResolutionsFromString(_resList, _outputMapping);
 	} else {
 		ScreenSetup::inst()->getCurrentMode();
 	}
@@ -122,6 +125,16 @@ static void parseCommandLine(const QCoreApplication &a)
     QCommandLineOption oDumpScreens(QStringList() << "d" << "dump",
                             QCoreApplication::translate("main", "Dump all non-overlapping screens."));
     parser.addOption(oDumpScreens);
+	 // Pre-configured setup
+	 QCommandLineOption oResList("resolutions",
+	                         QCoreApplication::translate("main", "Space separated list of resolutions to apply to outputs."
+	                                                             " Outputs will be assigned in alphabetical order, if no additional"
+	                                                             " output mapping is given."), "WxH [WxH ...]");
+	parser.addOption(oResList);
+	QCommandLineOption oMapping("mapping",
+	                            QCoreApplication::translate("main", "Map resolutions (from --resolutions) to output names."
+	                                                                " The list of resolutions is zero-based.", "<index>=<output> [...]"));
+	parser.addOption(oMapping);
 	// PARSE
     parser.process(a);
     _testMode = parser.isSet(oTest);
@@ -131,6 +144,8 @@ static void parseCommandLine(const QCoreApplication &a)
 	_wakeup = parser.isSet(oWakeup);
 	_center = parser.isSet(oCenter);
     _dumpScreens = parser.isSet(oDumpScreens);
+	 _resList = parser.value(oResList);
+	 _outputMapping = parser.value(oMapping);
 }
 
 QTextStream& qStdOut()
diff --git a/src/xx.cpp b/src/xx.cpp
index 21d444d..6e6286e 100644
--- a/src/xx.cpp
+++ b/src/xx.cpp
@@ -6,6 +6,7 @@
 #include <QSocketNotifier>
 #include <QThread>
 #include <QProcess>
+#include <QRegularExpression>
 
 /*
  * This clusterfuck exists because there are name clashes between X11/Xrandr headers
@@ -325,6 +326,47 @@ bool ScreenSetup::hasScreenWithoutEdid()
 	return false;
 }
 
+ConfigBackup ScreenSetup::setResolutionsFromString(const QString &resolutions, const QString &mapping)
+{
+	auto resListStr = resolutions.split(QRegularExpression(QLatin1String("\\s+")), QString::SkipEmptyParts);
+	QList<QPair<QSize, QList<QString>>> config;
+	QRegularExpression re(QLatin1String("^(\\d+)x(\\d+)$"));
+	for (auto s : resListStr) {
+		auto m = re.match(s);
+		if (m.hasMatch()) {
+			config.append(qMakePair(QSize(m.captured(1).toInt(), m.captured(2).toInt()), QList<QString>()));
+			qDebug() << "Adding resolution" << s;
+		}
+	}
+	auto outputListStr = mapping.split(QRegularExpression(QLatin1String("\\s+")), QString::SkipEmptyParts);
+	if (outputListStr.isEmpty()) {
+		int i = 0;
+		for (auto *o : a->_outputMap) {
+			int index = i % config.size();
+			auto x = config.at(index).second;
+			x.append(o->outputName);
+			config.replace(index, qMakePair(config.at(index).first, x));
+			qDebug() << "Resolution" << config.at(index).first << "is now" << config.at(index).second;
+			++i;
+		}
+	} else {
+		QRegularExpression re(QLatin1String("^(.+)=(\\d+)$"));
+		for (auto s : outputListStr) {
+			auto m = re.match(s);
+			if (m.hasMatch()) {
+				int index = m.captured(2).toInt();
+				if (index >= 0 && index < config.size()) {
+					auto x = config.at(index).second;
+					x.append(m.captured(1));
+					config.replace(index, qMakePair(config.at(index).first, x));
+				}
+			}
+		}
+	}
+	qDebug() << config;
+	return setCustom(config);
+}
+
 ConfigBackup ScreenSetup::setDefaultMode(ScreenMode &mode)
 {
     ConfigBackup retval;
diff --git a/src/xx.h b/src/xx.h
index ce522d8..c3e80e7 100644
--- a/src/xx.h
+++ b/src/xx.h
@@ -68,11 +68,12 @@ public:
 	void         initModes();
 	ScreenMode   getCurrentMode();
 	bool         hasScreenWithoutEdid();
+	ConfigBackup setResolutionsFromString(const QString &resolutions, const QString &mapping);
     ConfigBackup setDefaultMode(ScreenMode &mode);
-    bool         createMode(unsigned int resX, unsigned int resY, float refresh, QString name);
-    ConfigBackup setCenteredClone();
-    ConfigBackup setClone(const QSize &resolution);
-    ConfigBackup setCustom(const QList<QPair<QSize, QList<QString>>> &list);
+	bool         createMode(unsigned int resX, unsigned int resY, float refresh, QString name);
+	ConfigBackup setCenteredClone();
+	ConfigBackup setClone(const QSize &resolution);
+	ConfigBackup setCustom(const QList<QPair<QSize, QList<QString>>> &list);
 	ResolutionVector getCommonModes() const;
 	int getOutputCount() const;
 	int queryCurrentOutputCount() const;