Make the Xorg server arguments configurable

bjacquot · plfiorini · commit 77f1a5d5b220 · 2015-08-20T19:20:55.000+02:00
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
@@ -54,6 +54,7 @@ namespace SDDM {
         // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
         Section(XDisplay,
             Entry(ServerPath,          QString,     _S("/usr/bin/X"),                           _S("X server path"));
+            Entry(ServerArguments,     QString,     _S(""),                                     _S("X server arguments"));
             Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Xephyr path"));
             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Xauth path"));
             Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Session description directory"));
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
@@ -154,7 +154,7 @@ namespace SDDM {
             }
 
             // start display server
-            QStringList args;
+            QStringList args = mainConfig.XDisplay.ServerArguments.get().split(" ", QString::SkipEmptyParts);
             args << "-auth" << m_authPath
                  << "-nolisten" << "tcp"
                  << "-background" << "none"

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ namespace SDDM {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`// start display server`
`157`		`- QStringList args;`
	`157`	`+ QStringList args = mainConfig.XDisplay.ServerArguments.get().split(" ", QString::SkipEmptyParts);`
`158`	`158`	`args << "-auth" << m_authPath`
`159`	`159`	`<< "-nolisten" << "tcp"`
`160`	`160`	`<< "-background" << "none"`