Add a way to append config to server layout

2 files changed, 18 insertions, 0 deletions

diff --git a/tests/common/xorg-conf.cpp b/tests/common/xorg-conf.cpp
index aa1359c..5fb716c 100644
--- a/tests/common/xorg-conf.cpp
+++ b/tests/common/xorg-conf.cpp
@@ -69,6 +69,8 @@ void XOrgConfig::WriteConfig(const std::string &path) {
             conffile << "    Screen 0 \"" << default_device << " screen\" 0 0\n";
         for (it = input_devices.begin(); it != input_devices.end(); it++)
             conffile << "    InputDevice \"" << *it << "\"\n";
+        for (it = server_layout_opts.begin(); it != server_layout_opts.end(); ++it)
+            conffile << *it << "\n";
         conffile << "EndSection\n";
     }
 
@@ -105,6 +107,11 @@ void XOrgConfig::AddDefaultScreenWithDriver(const std::string &driver,
     sections.push_back(section.str());
 }
 
+void XOrgConfig::AddServerLayoutOption(const std::string& option)
+{
+    server_layout_opts.push_back(option);
+}
+
 void XOrgConfig::AddInputSection(const std::string &driver,
                                  const std::string &identifier,
                                  const std::string &options,
diff --git a/tests/common/xorg-conf.h b/tests/common/xorg-conf.h
index d6e8836..6e8ed67 100644
--- a/tests/common/xorg-conf.h
+++ b/tests/common/xorg-conf.h
@@ -87,6 +87,16 @@ public:
     virtual void RemoveConfig();
 
     /**
+     * Add an option to the server layout.
+     * Options may be specified by the caller and must be a single string.
+     * It is recommened that multiple options are separated by line-breaks
+     * to improve the readability of the config file.
+     *
+     * @param option Option in the form "<option name> <values>"
+     */
+    void AddServerLayoutOption(const std::string& option);
+
+    /**
      * Add a Section InputDevice to the config file. This section is
      * optionally referenced from the ServerLayout written by this section,
      * and in the form of:
@@ -178,6 +188,7 @@ protected:
     std::string config_file;
     std::vector<std::string> sections;
     std::vector<std::string> input_devices;
+    std::vector<std::string> server_layout_opts;
     std::string default_device;
     bool auto_add_devices;
 };