Add optional X-Gdm-XserverArgs key to the GDM desktop files. If this is

2007-05-01  Brian Cameron  <brian.cameron@sun.com>

        * daemon/display.[ch], daemon/server.c, daemon/slave.c,
          daemon/gdm-daemon-config.[ch], docs/C/gdm.xml: Add optional
          X-Gdm-XserverArgs key to the GDM desktop files.  If this is
          set in the desktop file, then GDM will restart the Xserver
          with the additional arguments specified.  This allows
          people to create sessions that require special Xserver
          flags (e.g. for accessibility or to use a session that
          requires special Xserver extensions to be turned on, etc.)
          This implements enhancement request #326771.  Patch by Ron
          Yorston <rmy@tigress.co.uk>.  I had to rework the patch
          quite a bit to get it to compile against the latest code.
          Also added a test so that any such extra arguments are
          *not* used when using Xnest since this "restarting"
          feature does not work with Xnest.
        * daemon/gdm.c: Minor cleanup.

svn path=/trunk/; revision=4882

3 files changed, 66 insertions, 12 deletions

diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index f7d94d8b..f5944966 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -1540,6 +1540,16 @@ PostSession/
       <filename>Hidden=true</filename> in that file.
     </para>
 
+    <para>
+      GDM uses the optional key <filename>X-Gdm-XserverArgs</filename> in
+      session files to specify additional arguments to be passed to the
+      X server.  For example, the entry
+      <filename>X-Gdm-XserverArgs=-depth 16</filename> will start the
+      X server with a color depth of 16 bits.  Any such additional arguments
+      are ignored when using a Nested display (when GDM is launched in a
+      window).
+    </para>
+
     <sect2 id="scriptdirs">
       <title>The Script Directories</title>
       
diff --git a/docs/es/gdm.xml b/docs/es/gdm.xml
index 646983df..fb75773e 100644
--- a/docs/es/gdm.xml
+++ b/docs/es/gdm.xml
@@ -773,6 +773,14 @@ PostSession/
 
     <para>Puede desactivarse una sesión (si fue instalada en <filename>&lt;share&gt;xsessions/</filename>) añadiendo un <filename>.desktop</filename> nombrado idénticamente a uno de los directorios anteriores en la ruta (como <filename>&lt;etc&gt;/X11/sessions</filename>) y usando <filename>Hidden=true</filename> en ese archivo.</para>
 
+    <para>
+      GDM uses the optional key <filename>X-Gdm-XserverArgs</filename> in
+      session files to specify additional arguments to be passed to the
+      X server.  For example, the entry
+      <filename>X-Gdm-XserverArgs=-depth 16</filename> will start the
+      X server with a color depth of 16 bits.
+    </para>
+
     <sect2 id="scriptdirs">
       <title>Los directorio de scripts</title>
       
@@ -4293,8 +4301,23 @@ homogeneous="bool"&gt;
         </variablelist>
 
         <para>
-		Item nodes can have a "background" property, set to "true"
-		or "false" (not setting this property is equivalent to "false"), as follow :
+          By default, the GDM login screen will disappear after authentication.
+          This can result in flicker between the login screen and the session.
+          The "background" property allows users to specify what 
+          elements of the theme are the background image.  When used, this
+          will cause GDM to remove all non-background items from the display
+          and render the remaining "background" items to the root
+          window.  This can be used to create a smooth transition between the
+          login screen and the session.  For example, if the GDM theme and the
+          session use the same background, then this will make the background
+          apear seamless.
+        </para>
+          
+        <para>
+          Item nodes may specify a "background" property which can be
+          set to "true" or "false" (not setting this
+          property is equivalent to "false"), as follows:
+        </para>
 
 <screen>
 &lt;item type="rect" background="true"&gt;
@@ -4303,11 +4326,10 @@ homogeneous="bool"&gt;
 &lt;/item&gt;
 </screen>
 
-		When this property is set on item nodes, background is applied to root window when greeter
-		exits after login, reducing screen flickering during login process. If no item node have "background"
-		property set, background is not modified when greeter exits.
+	<para>
+          If no item node has "background" property set, then the
+          background is not modified when greeter exits.
 	</para>
-
       </sect3>
 
       <sect3 id="positionnodes">
diff --git a/docs/uk/gdm.xml b/docs/uk/gdm.xml
index b8961124..6cca5148 100644
--- a/docs/uk/gdm.xml
+++ b/docs/uk/gdm.xml
@@ -1211,6 +1211,14 @@ PostSession/
 
     <para>Сеанси можна вимкнути (якщо вони встановлені у <filename>&lt;share&gt;/xsessions/</filename>), якщо додати ідентичні за назвою <filename>.desktop</filename>-файли до одного раніше згаданих каталогів, (наприклад <filename>&lt;etc&gt;/X11/sessions</filename>) та вказати <filename>Hidden=true</filename> у цьому файлі.</para>
 
+    <para>
+      GDM uses the optional key <filename>X-Gdm-XserverArgs</filename> in
+      session files to specify additional arguments to be passed to the
+      X server.  For example, the entry
+      <filename>X-Gdm-XserverArgs=-depth 16</filename> will start the
+      X server with a color depth of 16 bits.
+    </para>
+
     <sect2 id="scriptdirs">
       <title>Каталоги сценаріїв</title>
       
@@ -4996,8 +5004,23 @@ homogeneous="bool"&gt;
         </variablelist>
 
         <para>
-		Item nodes can have a "background" property, set to "true"
-		or "false" (not setting this property is equivalent to "false"), as follow :
+          By default, the GDM login screen will disappear after authentication.
+          This can result in flicker between the login screen and the session.
+          The "background" property allows users to specify what 
+          elements of the theme are the background image.  When used, this
+          will cause GDM to remove all non-background items from the display
+          and render the remaining "background" items to the root
+          window.  This can be used to create a smooth transition between the
+          login screen and the session.  For example, if the GDM theme and the
+          session use the same background, then this will make the background
+          apear seamless.
+        </para>
+          
+        <para>
+          Item nodes may specify a "background" property which can be
+          set to "true" or "false" (not setting this
+          property is equivalent to "false"), as follows:
+        </para>
 
 <screen>
 &lt;item type="rect" background="true"&gt;
@@ -5006,11 +5029,10 @@ homogeneous="bool"&gt;
 &lt;/item&gt;
 </screen>
 
-		When this property is set on item nodes, background is applied to root window when greeter
-		exits after login, reducing screen flickering during login process. If no item node have "background"
-		property set, background is not modified when greeter exits.
+	<para>
+          If no item node has "background" property set, then the
+          background is not modified when greeter exits.
 	</para>
-
       </sect3>
 
       <sect3 id="positionnodes">